[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.80 by elmex, Tue May 30 08:12:50 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,
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
…		…
237		251
238	if ($self->{container} == $::CONN->{player}{tag}) {	252	if ($self->{container} == $::CONN->{player}{tag}) {
239	$targ = $::CONN->{open_container};	253	$targ = $::CONN->{open_container};
240	}	254	}
241		255
242	$::CONN->send ("move $targ $self->{tag} 0");	256	$::CONN->send ("move $targ $self->{tag} 0")
		257	if $targ \|\| !($self->{flags} & F_LOCKED);
243	} elsif ($ev->{button} == 1) {	258	} elsif ($ev->{button} == 1) {
244	$::CONN->send ("examine $self->{tag}");	259	$::CONN->send ("examine $self->{tag}");
245	} elsif ($ev->{button} == 2) {	260	} elsif ($ev->{button} == 2) {
246	$::CONN->send ("apply $self->{tag}");	261	$::CONN->send ("apply $self->{tag}");
247	} elsif ($ev->{button} == 3) {	262	} elsif ($ev->{button} == 3) {
248	my @menu_items = (	263	my @menu_items = (
249	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	264	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
250	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	265	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
251	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	266	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
252	(	267	(
253	$self->{flags} & Crossfire::Protocol::F_LOCKED	268	$self->{flags} & F_LOCKED
254	? (	269	? (
255	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	270	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
256	)	271	)
257	: (	272	: (
258	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	273	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
…		…
277	$self->{face_widget} \|\|= new CFClient::UI::Face	292	$self->{face_widget} \|\|= new CFClient::UI::Face
278	can_events => 1,	293	can_events => 1,
279	can_hover => 1,	294	can_hover => 1,
280	anim => $self->{anim},	295	anim => $self->{anim},
281	animspeed => $self->{animspeed}, # TODO# must be set at creation time	296	animspeed => $self->{animspeed}, # TODO# must be set at creation time
282	connect_button_down => $button_cb,	297	on_button_down => $button_cb,
283	;	298	;
284	$self->{face_widget}{face} = $self->{face};	299	$self->{face_widget}{face} = $self->{face};
285	$self->{face_widget}{anim} = $self->{anim};	300	$self->{face_widget}{anim} = $self->{anim};
286	$self->{face_widget}{animspeed} = $self->{animspeed};	301	$self->{face_widget}{animspeed} = $self->{animspeed};
287	$self->{face_widget}->set_tooltip (	302	$self->{face_widget}->set_tooltip (
…		…
294	$self->{desc_widget} \|\|= new CFClient::UI::Label	309	$self->{desc_widget} \|\|= new CFClient::UI::Label
295	can_events => 1,	310	can_events => 1,
296	can_hover => 1,	311	can_hover => 1,
297	ellipsise => 2,	312	ellipsise => 2,
298	align => -1,	313	align => -1,
299	connect_button_down => $button_cb,	314	on_button_down => $button_cb,
300	;	315	;
301	my $desc = CFClient::Item::desc_string $self;	316	my $desc = CFClient::Item::desc_string $self;
302	$self->{desc_widget}->set_text ($desc);	317	$self->{desc_widget}->set_text ($desc);
303	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");	318	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
304		319
305	$self->{weight_widget} \|\|= new CFClient::UI::Label	320	$self->{weight_widget} \|\|= new CFClient::UI::Label
306	can_events => 1,	321	can_events => 1,
307	can_hover => 1,	322	can_hover => 1,
308	ellipsise => 0,	323	ellipsise => 0,
309	align => 0,	324	align => 0,
310	connect_button_down => $button_cb,	325	on_button_down => $button_cb,
311	;	326	;
312	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);	327	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
313		328
314	$self->{weight_widget}->set_tooltip (	329	$self->{weight_widget}->set_tooltip (
315	"<b>Weight</b>.\n"	330	"<b>Weight</b>.\n"
…		…
317	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	332	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
318	. "\n\n$tooltip_std"	333	. "\n\n$tooltip_std"
319	);	334	);
320	}	335	}
321		336
		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
322	1;	549	1;
323		550
324	=back	551	=back
325		552
326	=head1 AUTHOR	553	=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.80 by elmex, Tue May 30 08:12:50 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.80 by elmex, Tue May 30 08:12:50 2006 UTC