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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.78 by root, Mon May 29 22:02:06 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")
		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})
257	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
258	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
259	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
260	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
261	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
262	my @menu_items = (	335	my @menu_items = (
263	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	336	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
264	["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	],
265	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	344	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
266	(	345	(
267	$self->{flags} & F_LOCKED	346	$self->{flags} & F_LOCKED
268	? (	347	? (
269	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	348	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
270	)	349	)
271	: (	350	: (
272	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	351	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
273	["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	]
274	)	358	)
275	),	359	),
276	);	360	);
277		361
278	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	362	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
283		367
284	my $tooltip_std = "<small>"	368	my $tooltip_std = "<small>"
285	. "Left click - examine item\n"	369	. "Left click - examine item\n"
286	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	370	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
287	. "Middle click - apply\n"	371	. "Middle click - apply\n"
		372	. "Shift-Middle click - lock/unlock\n"
288	. "Right click - further options"	373	. "Right click - further options"
289	. "</small>\n";	374	. "</small>\n";
290		375
291	$self->{face_widget} \|\|= new CFClient::UI::Face	376	$self->{face_widget} \|\|= new CFClient::UI::Face
292	can_events => 1,	377	can_events => 1,
…		…
331	. ($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. ")
332	. "\n\n$tooltip_std"	417	. "\n\n$tooltip_std"
333	);	418	);
334	}	419	}
335		420
336	package CFClient::Recorder;
337
338	our $RECORD_WINDOW;
339
340	my $CMDBOX;
341	my $CURRENT_CMDS;
342	my $REC_BTN;
343
344	my @ALLOWED_MODIFIER_KEYS = (
345	(CFClient::SDLK_LSHIFT) => "LSHIFT",
346	(CFClient::SDLK_LCTRL ) => "LCTRL",
347	(CFClient::SDLK_LALT ) => "LALT",
348	(CFClient::SDLK_LMETA ) => "LMETA",
349
350	(CFClient::SDLK_RSHIFT) => "RSHIFT",
351	(CFClient::SDLK_RCTRL ) => "RCTRL",
352	(CFClient::SDLK_RALT ) => "RALT",
353	(CFClient::SDLK_RMETA ) => "RMETA",
354	);
355
356	my %ALLOWED_MODIFIERS = (
357	(CFClient::KMOD_LSHIFT) => "LSHIFT",
358	(CFClient::KMOD_LCTRL ) => "LCTRL",
359	(CFClient::KMOD_LALT ) => "LALT",
360	(CFClient::KMOD_LMETA ) => "LMETA",
361
362	(CFClient::KMOD_RSHIFT) => "RSHIFT",
363	(CFClient::KMOD_RCTRL ) => "RCTRL",
364	(CFClient::KMOD_RALT ) => "RALT",
365	(CFClient::KMOD_RMETA ) => "RMETA",
366	);
367
368	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
369	my @DIRECT_BIND_KEYS = (
370	CFClient::SDLK_F1,
371	CFClient::SDLK_F2,
372	CFClient::SDLK_F3,
373	CFClient::SDLK_F4,
374	CFClient::SDLK_F5,
375	CFClient::SDLK_F6,
376	CFClient::SDLK_F7,
377	CFClient::SDLK_F8,
378	CFClient::SDLK_F9,
379	CFClient::SDLK_F10,
380	CFClient::SDLK_F11,
381	CFClient::SDLK_F12,
382	CFClient::SDLK_F13,
383	CFClient::SDLK_F14,
384	CFClient::SDLK_F15,
385	);
386
387	# this binding dialog asks for a key-combo to be pressed
388	# and if successful it binds the modifier+symbol to the
389	# supplied actions in $cmd.
390	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
391	sub open_binding_dialog {
392	my ($cmd) = @_;
393
394	my $w = new CFClient::UI::FancyFrame
395	title => "Bind Action";
396
397	$w->add (my $vb = new CFClient::UI::VBox);
398	$vb->add (new CFClient::UI::Label
399	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
400	."You can only bind 0-9 and F1-F15 without modifiers."
401	);
402	$vb->add (my $entry = new CFClient::UI::Entry
403	text => "",
404	on_key_down => sub {
405	my ($entry, $ev) = @_;
406
407	my $mod = $ev->{mod};
408	my $sym = $ev->{sym};
409
410	# XXX: This seems a little bit hackisch to me, but i have to ignore them
411	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
412	return;
413	}
414
415	if ($mod == CFClient::KMOD_NONE
416	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
417	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
418	{
419	$::STATUSBOX->add (
420	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
421	." directly without modifier! It would damage the completer handling."
422	);
423	return;
424	}
425
426	$entry->focus_out;
427
428	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
429	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
430
431	$w->destroy
432	});
433
434	$entry->focus_in;
435	$w->center;
436	$w->show;
437	}
438
439	sub keycombo_to_name {
440	my ($mod, $sym) = @_;
441
442	my $mods = join '+',
443	map { $ALLOWED_MODIFIERS{$_} }
444	grep { $_ & $mod }
445	keys %ALLOWED_MODIFIERS;
446	$mods .= "+" if $mods ne '';
447
448	return $mods . CFClient::SDL_GetKeyName ($sym);
449	}
450
451	sub clear_command_list {
452	$CMDBOX->clear () if $CMDBOX;
453	}
454
455	sub set_command_list {
456	my ($list) = @_;
457
458	return unless $CMDBOX;
459
460	$CMDBOX->clear ();
461	$CURRENT_CMDS = $list;
462
463	my $idx = 0;
464
465	for (@$list) {
466	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
467
468	my $i = $idx;
469	$hb->add (new CFClient::UI::Button
470	text => "delete",
471	tooltip => "Deletes the action from the record",
472	on_activate => sub {
473	$CMDBOX->remove ($hb);
474	$list->[$i] = undef;
475	});
476
477	$hb->add (new CFClient::UI::Label text => $_);
478
479	$idx++
480	}
481	}
482
483	# if $show is 1 the recorder will be shown
484	sub start {
485	my ($show) = @_;
486
487	$RECORD_WINDOW->show if $show;
488
489	$REC_BTN->set_text ("stop recording");
490	$REC_BTN->{recording} = 1;
491	clear_command_list;
492	$::CONN->start_record;
493	}
494
495	# if $autobind is 1 the recorder will be automatically
496	# jump into the binding query and hide the recorder window
497	sub stop {
498	my ($autobind) = @_;
499
500	$REC_BTN->set_text ("start recording");
501	$REC_BTN->{recording} = 0;
502
503	my $rec = $::CONN->stop_record;
504	return unless ref $rec eq 'ARRAY';
505	set_command_list ($rec);
506
507	if ($autobind) {
508	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
509	$RECORD_WINDOW->hide;
510	}
511	}
512
513	sub make_window {
514	$RECORD_WINDOW = new CFClient::UI::FancyFrame
515	req_y => 1,
516	req_x => -1,
517	title => "Action Recorder";
518
519	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
520	$vb->add ($REC_BTN = new CFClient::UI::Button
521	text => "start recording",
522	tooltip => "Start/Stops recording of actions."
523	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
524	."All subsequent actions after the recording started will be captured."
525	."The actions are displayed after the record was stopped."
526	."To bind the action you have to click on the 'Bind' button",
527	on_activate => sub {
528	my ($btn) = @_;
529
530	unless ($btn->{recording}) {
531	start;
532	} else {
533	stop;
534	}
535	});
536	$vb->add ($CMDBOX = new CFClient::UI::VBox);
537	$vb->add (new CFClient::UI::Button
538	text => "bind",
539	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
540	on_activate => sub {
541	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
542	});
543
544	$RECORD_WINDOW
545	}
546
547	1;	421	1;
548		422
549	=back	423	=back
550		424
551	=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.78 by root, Mon May 29 22:02:06 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.78 by root, Mon May 29 22:02:06 2006 UTC vs.
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC