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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC vs.
Revision 1.96 by root, Sun Jul 2 18:52: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		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;
126
127	use base Pod::POM::View::Text;
128
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	};
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
204	package CFClient::Item;	240	package CFClient::Item;
205		241
206	use strict;	242	use strict;
207	use Crossfire::Protocol::Constants;	243	use Crossfire::Protocol::Constants;
		244
		245	my $last_enter_count = 1;
208		246
209	sub desc_string {	247	sub desc_string {
210	my ($self) = @_;	248	my ($self) = @_;
211		249
212	my $desc =	250	my $desc =
…		…
238	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	276	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
239		277
240	$weight < 0 ? "?" : $weight * 0.001	278	$weight < 0 ? "?" : $weight * 0.001
241	}	279	}
242		280
		281	sub do_n_dialog {
		282	my ($cb) = @_;
		283
		284	my $w = new CFClient::UI::FancyFrame;
		285	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		286	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		287	$vb->add (my $entry = new CFClient::UI::Entry
		288	text => $last_enter_count,
		289	on_activate => sub {
		290	my ($entry) = @_;
		291	$last_enter_count = $entry->get_text;
		292	$cb->($last_enter_count);
		293	$w->hide;
		294	$w = undef;
		295	}
		296	);
		297	$entry->grab_focus;
		298	$w->show;
		299
		300	}
		301
243	sub update_widgets {	302	sub update_widgets {
244	my ($self) = @_;	303	my ($self) = @_;
245		304
		305	# necessary to avoid cyclic references
		306	Scalar::Util::weaken $self;
		307
246	my $button_cb = sub {	308	my $button_cb = sub {
247	my (undef, $ev, $x, $y) = @_;	309	my (undef, $ev, $x, $y) = @_;
248		310
		311	my $targ = $::CONN->{player}{tag};
		312
		313	if ($self->{container} == $::CONN->{player}{tag}) {
		314	$targ = $::CONN->{open_container};
		315	}
		316
249	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	317	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")	318	$::CONN->send ("move $targ $self->{tag} 0")
257	if $targ \|\| !($self->{flags} & F_LOCKED);	319	if $targ \|\| !($self->{flags} & F_LOCKED);
		320	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		321	$self->{flags} & F_LOCKED
		322	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		323	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
258	} elsif ($ev->{button} == 1) {	324	} elsif ($ev->{button} == 1) {
259	$::CONN->send ("examine $self->{tag}");	325	$::CONN->send ("examine $self->{tag}");
260	} elsif ($ev->{button} == 2) {	326	} elsif ($ev->{button} == 2) {
261	$::CONN->send ("apply $self->{tag}");	327	$::CONN->send ("apply $self->{tag}");
262	} elsif ($ev->{button} == 3) {	328	} elsif ($ev->{button} == 3) {
…		…
270	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	336	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271	)	337	)
272	: (	338	: (
273	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	339	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	340	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		341	["move n",
		342	sub {
		343	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		344	}
		345	]
275	)	346	)
276	),	347	),
277	);	348	);
278		349
279	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	350	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
284		355
285	my $tooltip_std = "<small>"	356	my $tooltip_std = "<small>"
286	. "Left click - examine item\n"	357	. "Left click - examine item\n"
287	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	358	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288	. "Middle click - apply\n"	359	. "Middle click - apply\n"
		360	. "Shift-Middle click - lock/unlock\n"
289	. "Right click - further options"	361	. "Right click - further options"
290	. "</small>\n";	362	. "</small>\n";
291		363
292	$self->{face_widget} \|\|= new CFClient::UI::Face	364	$self->{face_widget} \|\|= new CFClient::UI::Face
293	can_events => 1,	365	can_events => 1,
…		…
332	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	404	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333	. "\n\n$tooltip_std"	405	. "\n\n$tooltip_std"
334	);	406	);
335	}	407	}
336		408
337	package CFClient::Recorder;
338
339	our $RECORD_WINDOW;
340
341	my $CMDBOX;
342	my $CURRENT_CMDS;
343	my $REC_BTN;
344
345	my @ALLOWED_MODIFIER_KEYS = (
346	(CFClient::SDLK_LSHIFT) => "LSHIFT",
347	(CFClient::SDLK_LCTRL ) => "LCTRL",
348	(CFClient::SDLK_LALT ) => "LALT",
349	(CFClient::SDLK_LMETA ) => "LMETA",
350
351	(CFClient::SDLK_RSHIFT) => "RSHIFT",
352	(CFClient::SDLK_RCTRL ) => "RCTRL",
353	(CFClient::SDLK_RALT ) => "RALT",
354	(CFClient::SDLK_RMETA ) => "RMETA",
355	);
356
357	my %ALLOWED_MODIFIERS = (
358	(CFClient::KMOD_LSHIFT) => "LSHIFT",
359	(CFClient::KMOD_LCTRL ) => "LCTRL",
360	(CFClient::KMOD_LALT ) => "LALT",
361	(CFClient::KMOD_LMETA ) => "LMETA",
362
363	(CFClient::KMOD_RSHIFT) => "RSHIFT",
364	(CFClient::KMOD_RCTRL ) => "RCTRL",
365	(CFClient::KMOD_RALT ) => "RALT",
366	(CFClient::KMOD_RMETA ) => "RMETA",
367	);
368
369	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
370	my @DIRECT_BIND_KEYS = (
371	CFClient::SDLK_F1,
372	CFClient::SDLK_F2,
373	CFClient::SDLK_F3,
374	CFClient::SDLK_F4,
375	CFClient::SDLK_F5,
376	CFClient::SDLK_F6,
377	CFClient::SDLK_F7,
378	CFClient::SDLK_F8,
379	CFClient::SDLK_F9,
380	CFClient::SDLK_F10,
381	CFClient::SDLK_F11,
382	CFClient::SDLK_F12,
383	CFClient::SDLK_F13,
384	CFClient::SDLK_F14,
385	CFClient::SDLK_F15,
386	);
387
388	# this binding dialog asks for a key-combo to be pressed
389	# and if successful it binds the modifier+symbol to the
390	# supplied actions in $cmd.
391	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392	sub open_binding_dialog {
393	my ($cmd) = @_;
394
395	my $w = new CFClient::UI::FancyFrame
396	title => "Bind Action",
397	x => "center",
398	y => "center";
399
400	$w->add (my $vb = new CFClient::UI::VBox);
401	$vb->add (new CFClient::UI::Label
402	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
403	."You can only bind 0-9 and F1-F15 without modifiers."
404	);
405	$vb->add (my $entry = new CFClient::UI::Entry
406	text => "",
407	on_key_down => sub {
408	my ($entry, $ev) = @_;
409
410	my $mod = $ev->{mod};
411	my $sym = $ev->{sym};
412
413	# XXX: This seems a little bit hackisch to me, but i have to ignore them
414	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
415	return;
416	}
417
418	if ($mod == CFClient::KMOD_NONE
419	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
420	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
421	{
422	$::STATUSBOX->add (
423	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
424	." directly without modifier! It would damage the completer handling."
425	);
426	return;
427	}
428
429	$entry->focus_out;
430
431	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
432	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
433
434	$w->destroy
435	});
436
437	$entry->focus_in;
438	$w->show;
439	}
440
441	sub keycombo_to_name {
442	my ($mod, $sym) = @_;
443
444	my $mods = join '+',
445	map { $ALLOWED_MODIFIERS{$_} }
446	grep { $_ & $mod }
447	keys %ALLOWED_MODIFIERS;
448	$mods .= "+" if $mods ne '';
449
450	return $mods . CFClient::SDL_GetKeyName ($sym);
451	}
452
453	sub clear_command_list {
454	$CMDBOX->clear () if $CMDBOX;
455	}
456
457	sub set_command_list {
458	my ($list) = @_;
459
460	return unless $CMDBOX;
461
462	$CMDBOX->clear ();
463	$CURRENT_CMDS = $list;
464
465	my $idx = 0;
466
467	for (@$list) {
468	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
469
470	my $i = $idx;
471	$hb->add (new CFClient::UI::Button
472	text => "delete",
473	tooltip => "Deletes the action from the record",
474	on_activate => sub {
475	$CMDBOX->remove ($hb);
476	$list->[$i] = undef;
477	});
478
479	$hb->add (new CFClient::UI::Label text => $_);
480
481	$idx++
482	}
483	}
484
485	# if $show is 1 the recorder will be shown
486	sub start {
487	my ($show) = @_;
488
489	$RECORD_WINDOW->show if $show;
490
491	$REC_BTN->set_text ("stop recording");
492	$REC_BTN->{recording} = 1;
493	clear_command_list;
494	$::CONN->start_record;
495	}
496
497	# if $autobind is 1 the recorder will be automatically
498	# jump into the binding query and hide the recorder window
499	sub stop {
500	my ($autobind) = @_;
501
502	$REC_BTN->set_text ("start recording");
503	$REC_BTN->{recording} = 0;
504
505	my $rec = $::CONN->stop_record;
506	return unless ref $rec eq 'ARRAY';
507	set_command_list ($rec);
508
509	if ($autobind) {
510	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
511	$RECORD_WINDOW->hide;
512	}
513	}
514
515	sub make_window {
516	$RECORD_WINDOW = new CFClient::UI::FancyFrame
517	req_y => 1,
518	req_x => -1,
519	title => "Action Recorder";
520
521	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
522	$vb->add ($REC_BTN = new CFClient::UI::Button
523	text => "start recording",
524	tooltip => "Start/Stops recording of actions."
525	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
526	."All subsequent actions after the recording started will be captured."
527	."The actions are displayed after the record was stopped."
528	."To bind the action you have to click on the 'Bind' button",
529	on_activate => sub {
530	my ($btn) = @_;
531
532	unless ($btn->{recording}) {
533	start;
534	} else {
535	stop;
536	}
537	});
538	$vb->add ($CMDBOX = new CFClient::UI::VBox);
539	$vb->add (new CFClient::UI::Button
540	text => "bind",
541	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
542	on_activate => sub {
543	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
544	});
545
546	$RECORD_WINDOW
547	}
548
549	1;	409	1;
550		410
551	=back	411	=back
552		412
553	=head1 AUTHOR	413	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC vs. Revision 1.96 by root, Sun Jul 2 18:52:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.80 by elmex, Tue May 30 08:12:50 2006 UTC vs.
Revision 1.96 by root, Sun Jul 2 18:52:04 2006 UTC