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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.76 by root, Mon May 29 21:20:15 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;	159	our $DB_ENV;
74		160
75	{	161	{
76	use strict;	162	use strict;
77		163
		164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		165	my $recover = $BerkeleyDB::db_version >= 4.4
		166	? eval "DB_REGISTER \| DB_RECOVER"
		167	: 0;
		168
78	our $DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
79	-Home => "$Crossfire::VARDIR/cfplus",	170	-Home => "$Crossfire::VARDIR/cfplus",
80	-Cachesize => 1_000_000,	171	-Cachesize => 1_000_000,
81	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",	172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
82	# -ErrPrefix => "DATABASE",	173	# -ErrPrefix => "DATABASE",
83	-Verbose => 1,	174	-Verbose => 1,
84	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	175	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
85	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE \| DB_TXN_WRITE_NOSYNC,	176	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
86	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";	177	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
87	}	178	}
88		179
89	sub db_table($) {	180	sub db_table($) {
90	my ($table) = @_;	181	my ($table) = @_;
…		…
99	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
100	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
101	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
102	}	193	}
103		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
104	sub pod_to_pango($) {	225	sub pod_to_pango($) {
105	my ($pom) = @_;	226	my ($pom) = @_;
106		227
107	$pom->present ("CFClient::PodToPango")	228	$pom->present ("CFClient::PodToPango")
108	}	229	}
…		…
114	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
115	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
116	]	237	]
117	}	238	}
118		239
119	package CFClient::PodToPango;	240	package CFClient::Layout;
120		241
121	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
122		243	reset_glyph_cache;
123	our $indent = 0;
124
125	*view_seq_code =
126	*view_seq_bold = sub { "<b>$_[1]</b>" };
127	*view_seq_italic = sub { "<i>$_[1]</i>" };
128	*view_seq_space =
129	*view_seq_link =
130	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
131
132	sub view_seq_text {
133	my $text = $_[1];
134	$text =~ s/\s+/ /g;
135	CFClient::UI::Label::escape ($text)
136	}
137
138	sub view_item {
139	("\t" x ($indent / 4))
140	. $_[1]->title->present ($_[0])
141	. "\n"
142	. $_[1]->content->present ($_[0])
143	}
144
145	sub view_verbatim {
146	(join "",
147	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
148	split /\n/, CFClient::UI::Label::escape ($_[1]))
149	. "\n"
150	}
151
152	sub view_textblock {
153	("\t" x ($indent / 2)) . "$_[1]\n\n"
154	}
155
156	sub view_head1 {
157	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158	. $_[1]->content->present ($_[0])
159	};	244	};
160
161	sub view_head2 {
162	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
163	. $_[1]->content->present ($_[0])
164	};
165
166	sub view_head3 {
167	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
168	. $_[1]->content->present ($_[0])
169	};
170
171	sub view_over {
172	local $indent = $indent + $_[1]->indent;
173	$_[1]->content->present ($_[0])
174	}
175
176	package CFClient::Database;
177
178	our @ISA = BerkeleyDB::Btree::;
179
180	sub get($$) {
181	my $data;
182
183	$_[0]->db_get ($_[1], $data) == 0
184	? $data
185	: ()
186	}
187
188	my %DB_SYNC;
189
190	sub put($$$) {
191	my ($db, $key, $data) = @_;
192
193	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
194
195	$db->db_put ($key => $data)
196	}
197		245
198	package CFClient::Item;	246	package CFClient::Item;
199		247
200	use strict;	248	use strict;
201	use Crossfire::Protocol::Constants;	249	use Crossfire::Protocol::Constants;
		250
		251	my $last_enter_count = 1;
202		252
203	sub desc_string {	253	sub desc_string {
204	my ($self) = @_;	254	my ($self) = @_;
205		255
206	my $desc =	256	my $desc =
…		…
232	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	282	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
233		283
234	$weight < 0 ? "?" : $weight * 0.001	284	$weight < 0 ? "?" : $weight * 0.001
235	}	285	}
236		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
237	sub update_widgets {	308	sub update_widgets {
238	my ($self) = @_;	309	my ($self) = @_;
239		310
		311	# necessary to avoid cyclic references
		312	Scalar::Util::weaken $self;
		313
240	my $button_cb = sub {	314	my $button_cb = sub {
241	my (undef, $ev, $x, $y) = @_;	315	my (undef, $ev, $x, $y) = @_;
242		316
		317	my $targ = $::CONN->{player}{tag};
		318
		319	if ($self->{container} == $::CONN->{player}{tag}) {
		320	$targ = $::CONN->{open_container};
		321	}
		322
243	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	323	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
244	my $targ = $::CONN->{player}{tag};
245
246	if ($self->{container} == $::CONN->{player}{tag}) {
247	$targ = $::CONN->{open_container};
248	}
249
250	$::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})
251	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
252	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
253	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
254	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
255	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
…		…
263	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	342	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
264	)	343	)
265	: (	344	: (
266	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	345	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
267	["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	]
268	)	352	)
269	),	353	),
270	);	354	);
271		355
272	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
277		361
278	my $tooltip_std = "<small>"	362	my $tooltip_std = "<small>"
279	. "Left click - examine item\n"	363	. "Left click - examine item\n"
280	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	364	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
281	. "Middle click - apply\n"	365	. "Middle click - apply\n"
		366	. "Shift-Middle click - lock/unlock\n"
282	. "Right click - further options"	367	. "Right click - further options"
283	. "</small>\n";	368	. "</small>\n";
284		369
285	$self->{face_widget} \|\|= new CFClient::UI::Face	370	$self->{face_widget} \|\|= new CFClient::UI::Face
286	can_events => 1,	371	can_events => 1,
…		…
325	. ($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. ")
326	. "\n\n$tooltip_std"	411	. "\n\n$tooltip_std"
327	);	412	);
328	}	413	}
329		414
330	package CFClient::Recorder;
331
332	our $RECORD_WINDOW;
333
334	my $CMDBOX;
335	my $CURRENT_CMDS;
336	my $REC_BTN;
337
338	my @ALLOWED_MODIFIER_KEYS = (
339	(CFClient::SDLK_LSHIFT) => "LSHIFT",
340	(CFClient::SDLK_LCTRL ) => "LCTRL",
341	(CFClient::SDLK_LALT ) => "LALT",
342	(CFClient::SDLK_LMETA ) => "LMETA",
343
344	(CFClient::SDLK_RSHIFT) => "RSHIFT",
345	(CFClient::SDLK_RCTRL ) => "RCTRL",
346	(CFClient::SDLK_RALT ) => "RALT",
347	(CFClient::SDLK_RMETA ) => "RMETA",
348	);
349
350	my %ALLOWED_MODIFIERS = (
351	(CFClient::KMOD_LSHIFT) => "LSHIFT",
352	(CFClient::KMOD_LCTRL ) => "LCTRL",
353	(CFClient::KMOD_LALT ) => "LALT",
354	(CFClient::KMOD_LMETA ) => "LMETA",
355
356	(CFClient::KMOD_RSHIFT) => "RSHIFT",
357	(CFClient::KMOD_RCTRL ) => "RCTRL",
358	(CFClient::KMOD_RALT ) => "RALT",
359	(CFClient::KMOD_RMETA ) => "RMETA",
360	);
361
362	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
363	my @DIRECT_BIND_KEYS = (
364	CFClient::SDLK_F1,
365	CFClient::SDLK_F2,
366	CFClient::SDLK_F3,
367	CFClient::SDLK_F4,
368	CFClient::SDLK_F5,
369	CFClient::SDLK_F6,
370	CFClient::SDLK_F7,
371	CFClient::SDLK_F8,
372	CFClient::SDLK_F9,
373	CFClient::SDLK_F10,
374	CFClient::SDLK_F11,
375	CFClient::SDLK_F12,
376	CFClient::SDLK_F13,
377	CFClient::SDLK_F14,
378	CFClient::SDLK_F15,
379	);
380
381	# this binding dialog asks for a key-combo to be pressed
382	# and if successful it binds the modifier+symbol to the
383	# supplied actions in $cmd.
384	# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
385	sub open_binding_dialog {
386	my ($cmd) = @_;
387
388	my $w = new CFClient::UI::FancyFrame
389	title => "Bind Action";
390
391	$w->add (my $vb = new CFClient::UI::VBox);
392	$vb->add (new CFClient::UI::Label
393	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
394	."You can only bind 0-9 and F1-F15 without modifiers."
395	);
396	$vb->add (my $entry = new CFClient::UI::Entry
397	text => "",
398	on_key_down => sub {
399	my ($entry, $ev) = @_;
400
401	my $mod = $ev->{mod};
402	my $sym = $ev->{sym};
403
404	# XXX: This seems a little bit hackisch to me, but i have to ignore them
405	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
406	return;
407	}
408
409	if ($mod == CFClient::KMOD_NONE
410	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
411	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
412	{
413	$::STATUSBOX->add (
414	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
415	." directly without modifier! It would damage the completer handling."
416	);
417	return;
418	}
419
420	$entry->focus_out;
421
422	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
423	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424
425	$w->destroy
426	});
427
428	$entry->focus_in;
429	$w->center;
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 { $_ & $mod }
439	keys %ALLOWED_MODIFIERS;
440	$mods .= "+" if $mods ne '';
441
442	return $mods . CFClient::SDL_GetKeyName ($sym);
443	}
444
445	sub clear_command_list {
446	$CMDBOX->clear () if $CMDBOX;
447	}
448
449	sub set_command_list {
450	my ($list) = @_;
451
452	return unless $CMDBOX;
453
454	$CMDBOX->clear ();
455	$CURRENT_CMDS = $list;
456
457	my $idx = 0;
458
459	for (@$list) {
460	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
461
462	my $i = $idx;
463	$hb->add (new CFClient::UI::Button
464	text => "delete",
465	tooltip => "Deletes the action from the record",
466	on_activate => sub {
467	$CMDBOX->remove ($hb);
468	$list->[$i] = undef;
469	});
470
471	$hb->add (new CFClient::UI::Label text => $_);
472
473	$idx++
474	}
475	}
476
477	# if $show is 1 the recorder will be shown
478	sub start {
479	my ($show) = @_;
480
481	$RECORD_WINDOW->show if $show;
482
483	$REC_BTN->set_text ("stop recording");
484	$REC_BTN->{recording} = 1;
485	clear_command_list;
486	$::CONN->start_record;
487	}
488
489	# if $autobind is 1 the recorder will be automatically
490	# jump into the binding query and hide the recorder window
491	sub stop {
492	my ($autobind) = @_;
493
494	$REC_BTN->set_text ("start recording");
495	$REC_BTN->{recording} = 0;
496
497	my $rec = $::CONN->stop_record;
498	return unless ref $rec eq 'ARRAY';
499	set_command_list ($rec);
500
501	if ($autobind) {
502	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
503	$RECORD_WINDOW->hide;
504	}
505	}
506
507	sub make_window {
508	$RECORD_WINDOW = new CFClient::UI::FancyFrame
509	req_y => 1,
510	req_x => -1,
511	title => "Action Recorder";
512
513	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
514	$vb->add ($REC_BTN = new CFClient::UI::Button
515	text => "start recording",
516	tooltip => "Start/Stops recording of actions."
517	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
518	."All subsequent actions after the recording started will be captured."
519	."The actions are displayed after the record was stopped."
520	."To bind the action you have to click on the 'Bind' button",
521	on_activate => sub {
522	my ($btn) = @_;
523
524	unless ($btn->{recording}) {
525	start;
526	} else {
527	stop;
528	}
529	});
530	$vb->add ($CMDBOX = new CFClient::UI::VBox);
531	$vb->add (new CFClient::UI::Button
532	text => "bind",
533	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
534	on_activate => sub {
535	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
536	});
537
538	$RECORD_WINDOW
539	}
540
541	1;	415	1;
542		416
543	=back	417	=back
544		418
545	=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.76 by root, Mon May 29 21:20:15 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.76 by root, Mon May 29 21:20:15 2006 UTC vs.
Revision 1.98 by root, Wed Jul 12 17:20:04 2006 UTC