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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.79 by root, Tue May 30 02:55:45 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		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")
257	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})
258	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
259	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
260	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
261	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
262	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
…		…
270	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	342	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271	)	343	)
272	: (	344	: (
273	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	345	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274	["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	]
275	)	352	)
276	),	353	),
277	);	354	);
278		355
279	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
284		361
285	my $tooltip_std = "<small>"	362	my $tooltip_std = "<small>"
286	. "Left click - examine item\n"	363	. "Left click - examine item\n"
287	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	364	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288	. "Middle click - apply\n"	365	. "Middle click - apply\n"
		366	. "Shift-Middle click - lock/unlock\n"
289	. "Right click - further options"	367	. "Right click - further options"
290	. "</small>\n";	368	. "</small>\n";
291		369
292	$self->{face_widget} \|\|= new CFClient::UI::Face	370	$self->{face_widget} \|\|= new CFClient::UI::Face
293	can_events => 1,	371	can_events => 1,
…		…
332	. ($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. ")
333	. "\n\n$tooltip_std"	411	. "\n\n$tooltip_std"
334	);	412	);
335	}	413	}
336		414
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
398	$w->add (my $vb = new CFClient::UI::VBox);
399	$vb->add (new CFClient::UI::Label
400	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
401	."You can only bind 0-9 and F1-F15 without modifiers."
402	);
403	$vb->add (my $entry = new CFClient::UI::Entry
404	text => "",
405	on_key_down => sub {
406	my ($entry, $ev) = @_;
407
408	my $mod = $ev->{mod};
409	my $sym = $ev->{sym};
410
411	# XXX: This seems a little bit hackisch to me, but i have to ignore them
412	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
413	return;
414	}
415
416	if ($mod == CFClient::KMOD_NONE
417	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
418	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
419	{
420	$::STATUSBOX->add (
421	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
422	." directly without modifier! It would damage the completer handling."
423	);
424	return;
425	}
426
427	$entry->focus_out;
428
429	$::CFG->{bindings}->{$mod}->{$sym} = $cmd;
430	$::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
431
432	$w->destroy
433	});
434
435	$entry->focus_in;
436	$w->center;
437	$w->show;
438	}
439
440	sub keycombo_to_name {
441	my ($mod, $sym) = @_;
442
443	my $mods = join '+',
444	map { $ALLOWED_MODIFIERS{$_} }
445	grep { $_ & $mod }
446	keys %ALLOWED_MODIFIERS;
447	$mods .= "+" if $mods ne '';
448
449	return $mods . CFClient::SDL_GetKeyName ($sym);
450	}
451
452	sub clear_command_list {
453	$CMDBOX->clear () if $CMDBOX;
454	}
455
456	sub set_command_list {
457	my ($list) = @_;
458
459	return unless $CMDBOX;
460
461	$CMDBOX->clear ();
462	$CURRENT_CMDS = $list;
463
464	my $idx = 0;
465
466	for (@$list) {
467	$CMDBOX->add (my $hb = new CFClient::UI::HBox);
468
469	my $i = $idx;
470	$hb->add (new CFClient::UI::Button
471	text => "delete",
472	tooltip => "Deletes the action from the record",
473	on_activate => sub {
474	$CMDBOX->remove ($hb);
475	$list->[$i] = undef;
476	});
477
478	$hb->add (new CFClient::UI::Label text => $_);
479
480	$idx++
481	}
482	}
483
484	# if $show is 1 the recorder will be shown
485	sub start {
486	my ($show) = @_;
487
488	$RECORD_WINDOW->show if $show;
489
490	$REC_BTN->set_text ("stop recording");
491	$REC_BTN->{recording} = 1;
492	clear_command_list;
493	$::CONN->start_record;
494	}
495
496	# if $autobind is 1 the recorder will be automatically
497	# jump into the binding query and hide the recorder window
498	sub stop {
499	my ($autobind) = @_;
500
501	$REC_BTN->set_text ("start recording");
502	$REC_BTN->{recording} = 0;
503
504	my $rec = $::CONN->stop_record;
505	return unless ref $rec eq 'ARRAY';
506	set_command_list ($rec);
507
508	if ($autobind) {
509	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
510	$RECORD_WINDOW->hide;
511	}
512	}
513
514	sub make_window {
515	$RECORD_WINDOW = new CFClient::UI::FancyFrame
516	req_y => 1,
517	req_x => -1,
518	title => "Action Recorder";
519
520	$RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
521	$vb->add ($REC_BTN = new CFClient::UI::Button
522	text => "start recording",
523	tooltip => "Start/Stops recording of actions."
524	."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
525	."All subsequent actions after the recording started will be captured."
526	."The actions are displayed after the record was stopped."
527	."To bind the action you have to click on the 'Bind' button",
528	on_activate => sub {
529	my ($btn) = @_;
530
531	unless ($btn->{recording}) {
532	start;
533	} else {
534	stop;
535	}
536	});
537	$vb->add ($CMDBOX = new CFClient::UI::VBox);
538	$vb->add (new CFClient::UI::Button
539	text => "bind",
540	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
541	on_activate => sub {
542	open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
543	});
544
545	$RECORD_WINDOW
546	}
547
548	1;	415	1;
549		416
550	=back	417	=back
551		418
552	=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.79 by root, Tue May 30 02:55:45 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.79 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.98 by root, Wed Jul 12 17:20:04 2006 UTC