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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC

…		…
68	}	68	}
69		69
70	close CFG;	70	close CFG;
71	}	71	}
72		72
73	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
74		74
		75	our $DB_ENV;
		76
		77	{
		78	use strict;
		79
		80	my $recover = $BerkeleyDB::db_version >= 4.4
		81	? eval "DB_REGISTER \| DB_RECOVER"
		82	: 0;
		83
75	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
76	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
77	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
80	-Verbose => 1,	89	-Verbose => 1,
81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	90	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		91	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE \| DB_TXN_WRITE_NOSYNC,
82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	92	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		93	}
83		94
84	sub db_table($) {	95	sub db_table($) {
85	my ($table) = @_;	96	my ($table) = @_;
86		97
87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88		99
89	new CFClient::Database	100	new CFClient::Database
90	-Env => $DB_ENV,	101	-Env => $DB_ENV,
91	-Filename => $table,	102	-Filename => $table,
92	# -Filename => "database",	103	# -Filename => "database",
93	# -Subname => $table,	104	# -Subname => $table,
94	-Property => DB_CHKSUM,	105	-Property => DB_CHKSUM,
95	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
97	}	108	}
98		109
99	sub pod_to_pango($) {	110	sub pod_to_pango($) {
100	my ($pom) = @_;	111	my ($pom) = @_;
101		112
…		…
190	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
191	}	202	}
192		203
193	package CFClient::Item;	204	package CFClient::Item;
194		205
		206	use strict;
		207	use Crossfire::Protocol::Constants;
		208
195	sub desc_string {	209	sub desc_string {
196	my ($self) = @_;	210	my ($self) = @_;
197		211
198	my $desc =	212	my $desc =
199	$self->{nrof} < 2	213	$self->{nrof} < 2
200	? $self->{name}	214	? $self->{name}
201	: "$self->{nrof} × $self->{name_pl}";	215	: "$self->{nrof} × $self->{name_pl}";
202		216
203	$self->{flags} & Crossfire::Protocol::F_OPEN	217	$self->{flags} & F_OPEN
204	and $desc .= " (open)";	218	and $desc .= " (open)";
205	$self->{flags} & Crossfire::Protocol::F_APPLIED	219	$self->{flags} & F_APPLIED
206	and $desc .= " (applied)";	220	and $desc .= " (applied)";
207	$self->{flags} & Crossfire::Protocol::F_UNPAID	221	$self->{flags} & F_UNPAID
208	and $desc .= " (unpaid)";	222	and $desc .= " (unpaid)";
209	$self->{flags} & Crossfire::Protocol::F_MAGIC	223	$self->{flags} & F_MAGIC
210	and $desc .= " (magic)";	224	and $desc .= " (magic)";
211	$self->{flags} & Crossfire::Protocol::F_CURSED	225	$self->{flags} & F_CURSED
212	and $desc .= " (cursed)";	226	and $desc .= " (cursed)";
213	$self->{flags} & Crossfire::Protocol::F_DAMNED	227	$self->{flags} & F_DAMNED
214	and $desc .= " (damned)";	228	and $desc .= " (damned)";
215	$self->{flags} & Crossfire::Protocol::F_LOCKED	229	$self->{flags} & F_LOCKED
216	and $desc .= " *";	230	and $desc .= " *";
217		231
218	$desc	232	$desc
219	}	233	}
220		234
…		…
248	my @menu_items = (	262	my @menu_items = (
249	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	263	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
250	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	264	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
251	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	265	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
252	(	266	(
253	$self->{flags} & Crossfire::Protocol::F_LOCKED	267	$self->{flags} & F_LOCKED
254	? (	268	? (
255	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	269	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
256	)	270	)
257	: (	271	: (
258	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	272	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
…		…
277	$self->{face_widget} \|\|= new CFClient::UI::Face	291	$self->{face_widget} \|\|= new CFClient::UI::Face
278	can_events => 1,	292	can_events => 1,
279	can_hover => 1,	293	can_hover => 1,
280	anim => $self->{anim},	294	anim => $self->{anim},
281	animspeed => $self->{animspeed}, # TODO# must be set at creation time	295	animspeed => $self->{animspeed}, # TODO# must be set at creation time
282	connect_button_down => $button_cb,	296	on_button_down => $button_cb,
283	;	297	;
284	$self->{face_widget}{face} = $self->{face};	298	$self->{face_widget}{face} = $self->{face};
285	$self->{face_widget}{anim} = $self->{anim};	299	$self->{face_widget}{anim} = $self->{anim};
286	$self->{face_widget}{animspeed} = $self->{animspeed};	300	$self->{face_widget}{animspeed} = $self->{animspeed};
287	$self->{face_widget}->set_tooltip (	301	$self->{face_widget}->set_tooltip (
…		…
294	$self->{desc_widget} \|\|= new CFClient::UI::Label	308	$self->{desc_widget} \|\|= new CFClient::UI::Label
295	can_events => 1,	309	can_events => 1,
296	can_hover => 1,	310	can_hover => 1,
297	ellipsise => 2,	311	ellipsise => 2,
298	align => -1,	312	align => -1,
299	connect_button_down => $button_cb,	313	on_button_down => $button_cb,
300	;	314	;
301	my $desc = CFClient::Item::desc_string $self;	315	my $desc = CFClient::Item::desc_string $self;
302	$self->{desc_widget}->set_text ($desc);	316	$self->{desc_widget}->set_text ($desc);
303	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	317	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
304		318
305	$self->{weight_widget} \|\|= new CFClient::UI::Label	319	$self->{weight_widget} \|\|= new CFClient::UI::Label
306	can_events => 1,	320	can_events => 1,
307	can_hover => 1,	321	can_hover => 1,
308	ellipsise => 0,	322	ellipsise => 0,
309	align => 0,	323	align => 0,
310	connect_button_down => $button_cb,	324	on_button_down => $button_cb,
311	;	325	;
312	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	326	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
313		327
314	$self->{weight_widget}->set_tooltip (	328	$self->{weight_widget}->set_tooltip (
315	"<b>Weight</b>.\n"	329	"<b>Weight</b>.\n"
…		…
317	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	331	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
318	. "\n\n$tooltip_std"	332	. "\n\n$tooltip_std"
319	);	333	);
320	}	334	}
321		335
		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
322	1;	547	1;
323		548
324	=back	549	=back
325		550
326	=head1 AUTHOR	551	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs. Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.70 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.77 by root, Mon May 29 21:54:15 2006 UTC