ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.79 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.89 by root, Mon Jun 5 21:10:03 2006 UTC

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM ();
30use Storable (); # finally
31
32package CFClient::PodToPango;
33
34use base Pod::POM::View::Text;
35
36our $VERSION = 1; # bump if resultant formatting changes
37
38our $indent = 0;
39
40*view_seq_code =
41*view_seq_bold = sub { "<b>$_[1]</b>" };
42*view_seq_italic = sub { "<i>$_[1]</i>" };
43*view_seq_space =
44*view_seq_link =
45*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
46
47sub view_seq_text {
48 my $text = $_[1];
49 $text =~ s/\s+/ /g;
50 CFClient::UI::Label::escape ($text)
51}
52
53sub view_item {
54 ("\t" x ($indent / 4))
55 . $_[1]->title->present ($_[0])
56 . "\n"
57 . $_[1]->content->present ($_[0])
58}
59
60sub view_verbatim {
61 (join "",
62 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
63 split /\n/, CFClient::UI::Label::escape ($_[1]))
64 . "\n"
65}
66
67sub view_textblock {
68 ("\t" x ($indent / 2)) . "$_[1]\n\n"
69}
70
71sub view_head1 {
72 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
73 . $_[1]->content->present ($_[0])
74};
75
76sub view_head2 {
77 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
78 . $_[1]->content->present ($_[0])
79};
80
81sub view_head3 {
82 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
83 . $_[1]->content->present ($_[0])
84};
85
86sub view_over {
87 local $indent = $indent + $_[1]->indent;
88 $_[1]->content->present ($_[0])
89}
90
91package CFClient::Database;
92
93our @ISA = BerkeleyDB::Btree::;
94
95sub get($$) {
96 my $data;
97
98 $_[0]->db_get ($_[1], $data) == 0
99 ? $data
100 : ()
101}
102
103my %DB_SYNC;
104
105sub put($$$) {
106 my ($db, $key, $data) = @_;
107
108 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
109
110 $db->db_put ($key => $data)
111}
112
113package CFClient;
29 114
30sub find_rcfile($) { 115sub find_rcfile($) {
31 my $path; 116 my $path;
32 117
33 for (grep !ref, @INC) { 118 for (grep !ref, @INC) {
… …
68 } 153 }
69 154
70 close CFG; 155 close CFG;
71} 156}
72 157
73mkdir "$Crossfire::VARDIR/cfplus", 0777;
74
75our $DB_ENV; 158our $DB_ENV;
76 159
77{ 160{
78 use strict; 161 use strict;
79 162
163 mkdir "$Crossfire::VARDIR/cfplus", 0777;
80 my $recover = $BerkeleyDB::db_version >= 4.4 164 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER" 165 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0; 166 : 0;
83 167
84 $DB_ENV = new BerkeleyDB::Env 168 $DB_ENV = new BerkeleyDB::Env
… …
105 -Property => DB_CHKSUM, 189 -Property => DB_CHKSUM,
106 -Flags => DB_CREATE | DB_UPGRADE, 190 -Flags => DB_CREATE | DB_UPGRADE,
107 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 191 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
108} 192}
109 193
194my $pod_cache = db_table "pod_cache";
195
196sub load_pod($$$$) {
197 my ($path, $filtertype, $filterversion, $filtercb) = @_;
198
199 stat $path
200 or die "$path: $!";
201
202 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
203
204 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
205
206 return $pom if $chash eq $phash;
207
208 my $pod = do {
209 local $/;
210 open my $pod, "<:utf8", $_[0]
211 or die "$_[0]: $!";
212 <$pod>
213 };
214
215 #utf8::downgrade $pod;
216
217 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
218
219 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
220
221 $pom
222}
223
110sub pod_to_pango($) { 224sub pod_to_pango($) {
111 my ($pom) = @_; 225 my ($pom) = @_;
112 226
113 $pom->present ("CFClient::PodToPango") 227 $pom->present ("CFClient::PodToPango")
114} 228}
… …
120 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], 234 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
121 split /\n/, $pom->present ("CFClient::PodToPango") 235 split /\n/, $pom->present ("CFClient::PodToPango")
122 ] 236 ]
123} 237}
124 238
125package CFClient::PodToPango;
126
127use base Pod::POM::View::Text;
128
129our $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
138sub view_seq_text {
139 my $text = $_[1];
140 $text =~ s/\s+/ /g;
141 CFClient::UI::Label::escape ($text)
142}
143
144sub view_item {
145 ("\t" x ($indent / 4))
146 . $_[1]->title->present ($_[0])
147 . "\n"
148 . $_[1]->content->present ($_[0])
149}
150
151sub 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
158sub view_textblock {
159 ("\t" x ($indent / 2)) . "$_[1]\n\n"
160}
161
162sub view_head1 {
163 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
164 . $_[1]->content->present ($_[0])
165};
166
167sub view_head2 {
168 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
169 . $_[1]->content->present ($_[0])
170};
171
172sub view_head3 {
173 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
174 . $_[1]->content->present ($_[0])
175};
176
177sub view_over {
178 local $indent = $indent + $_[1]->indent;
179 $_[1]->content->present ($_[0])
180}
181
182package CFClient::Database;
183
184our @ISA = BerkeleyDB::Btree::;
185
186sub get($$) {
187 my $data;
188
189 $_[0]->db_get ($_[1], $data) == 0
190 ? $data
191 : ()
192}
193
194my %DB_SYNC;
195
196sub 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
204package CFClient::Item; 239package CFClient::Item;
205 240
206use strict; 241use strict;
207use Crossfire::Protocol::Constants; 242use Crossfire::Protocol::Constants;
243
244my $last_enter_count = 1;
208 245
209sub desc_string { 246sub desc_string {
210 my ($self) = @_; 247 my ($self) = @_;
211 248
212 my $desc = 249 my $desc =
… …
238 my $weight = ($self->{nrof} || 1) * $self->{weight}; 275 my $weight = ($self->{nrof} || 1) * $self->{weight};
239 276
240 $weight < 0 ? "?" : $weight * 0.001 277 $weight < 0 ? "?" : $weight * 0.001
241} 278}
242 279
280sub do_n_dialog {
281 my ($cb) = @_;
282
283 my $w = new CFClient::UI::FancyFrame;
284 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
285 $vb->add (new CFClient::UI::Label text => "Enter item count:");
286 $vb->add (my $entry = new CFClient::UI::Entry
287 text => $last_enter_count,
288 on_activate => sub {
289 my ($entry) = @_;
290 $last_enter_count = $entry->get_text;
291 $cb->($last_enter_count);
292 $w->hide;
293 $w = undef;
294 }
295 );
296 $entry->focus_in;
297 $w->show;
298
299}
300
243sub update_widgets { 301sub update_widgets {
244 my ($self) = @_; 302 my ($self) = @_;
245 303
246 my $button_cb = sub { 304 my $button_cb = sub {
247 my (undef, $ev, $x, $y) = @_; 305 my (undef, $ev, $x, $y) = @_;
248 306
307 my $targ = $::CONN->{player}{tag};
308
309 if ($self->{container} == $::CONN->{player}{tag}) {
310 $targ = $::CONN->{open_container};
311 }
312
249 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 313 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") 314 $::CONN->send ("move $targ $self->{tag} 0")
257 if $targ || !($self->{flags} & F_LOCKED); 315 if $targ || !($self->{flags} & F_LOCKED);
316 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
317 $self->{flags} & F_LOCKED
318 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
319 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
258 } elsif ($ev->{button} == 1) { 320 } elsif ($ev->{button} == 1) {
259 $::CONN->send ("examine $self->{tag}"); 321 $::CONN->send ("examine $self->{tag}");
260 } elsif ($ev->{button} == 2) { 322 } elsif ($ev->{button} == 2) {
261 $::CONN->send ("apply $self->{tag}"); 323 $::CONN->send ("apply $self->{tag}");
262 } elsif ($ev->{button} == 3) { 324 } elsif ($ev->{button} == 3) {
… …
270 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 332 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271 ) 333 )
272 : ( 334 : (
273 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 335 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 336 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
337 ["move n",
338 sub {
339 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
340 }
341 ]
275 ) 342 )
276 ), 343 ),
277 ); 344 );
278 345
279 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 346 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
… …
284 351
285 my $tooltip_std = "<small>" 352 my $tooltip_std = "<small>"
286 . "Left click - examine item\n" 353 . "Left click - examine item\n"
287 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 354 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288 . "Middle click - apply\n" 355 . "Middle click - apply\n"
356 . "Shift-Middle click - lock/unlock\n"
289 . "Right click - further options" 357 . "Right click - further options"
290 . "</small>\n"; 358 . "</small>\n";
291 359
292 $self->{face_widget} ||= new CFClient::UI::Face 360 $self->{face_widget} ||= new CFClient::UI::Face
293 can_events => 1, 361 can_events => 1,
… …
332 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 400 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333 . "\n\n$tooltip_std" 401 . "\n\n$tooltip_std"
334 ); 402 );
335} 403}
336 404
337package CFClient::Recorder; 405package CFClient::Binder;
338
339our $RECORD_WINDOW;
340
341my $CMDBOX;
342my $CURRENT_CMDS;
343my $REC_BTN;
344 406
345my @ALLOWED_MODIFIER_KEYS = ( 407my @ALLOWED_MODIFIER_KEYS = (
346 (CFClient::SDLK_LSHIFT) => "LSHIFT", 408 CFClient::SDLK_LSHIFT,
347 (CFClient::SDLK_LCTRL ) => "LCTRL", 409 CFClient::SDLK_LCTRL ,
348 (CFClient::SDLK_LALT ) => "LALT", 410 CFClient::SDLK_LALT ,
349 (CFClient::SDLK_LMETA ) => "LMETA", 411 CFClient::SDLK_LMETA ,
350 412
351 (CFClient::SDLK_RSHIFT) => "RSHIFT", 413 CFClient::SDLK_RSHIFT,
352 (CFClient::SDLK_RCTRL ) => "RCTRL", 414 CFClient::SDLK_RCTRL ,
353 (CFClient::SDLK_RALT ) => "RALT", 415 CFClient::SDLK_RALT ,
354 (CFClient::SDLK_RMETA ) => "RMETA", 416 CFClient::SDLK_RMETA ,
355); 417);
356 418
357my %ALLOWED_MODIFIERS = ( 419my %ALLOWED_MODIFIERS = (
358 (CFClient::KMOD_LSHIFT) => "LSHIFT", 420 CFClient::KMOD_LSHIFT => "LSHIFT",
359 (CFClient::KMOD_LCTRL ) => "LCTRL", 421 CFClient::KMOD_LCTRL => "LCTRL",
360 (CFClient::KMOD_LALT ) => "LALT", 422 CFClient::KMOD_LALT => "LALT",
361 (CFClient::KMOD_LMETA ) => "LMETA", 423 CFClient::KMOD_LMETA => "LMETA",
362 424
363 (CFClient::KMOD_RSHIFT) => "RSHIFT", 425 CFClient::KMOD_RSHIFT => "RSHIFT",
364 (CFClient::KMOD_RCTRL ) => "RCTRL", 426 CFClient::KMOD_RCTRL => "RCTRL",
365 (CFClient::KMOD_RALT ) => "RALT", 427 CFClient::KMOD_RALT => "RALT",
366 (CFClient::KMOD_RMETA ) => "RMETA", 428 CFClient::KMOD_RMETA => "RMETA",
367); 429);
368 430
369my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; 431my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
370my @DIRECT_BIND_KEYS = ( 432my @DIRECT_BIND_KEYS = (
371 CFClient::SDLK_F1, 433 CFClient::SDLK_F1,
… …
384 CFClient::SDLK_F14, 446 CFClient::SDLK_F14,
385 CFClient::SDLK_F15, 447 CFClient::SDLK_F15,
386); 448);
387 449
388# this binding dialog asks for a key-combo to be pressed 450# this binding dialog asks for a key-combo to be pressed
389# and if successful it binds the modifier+symbol to the 451# and if successful it calls the $cb with $mod and $sym as args.
390# supplied actions in $cmd.
391# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
392sub open_binding_dialog { 452sub open_binding_dialog {
393 my ($cmd) = @_; 453 my ($cb) = @_;
394 454
395 my $w = new CFClient::UI::FancyFrame 455 my $w = new CFClient::UI::FancyFrame
396 title => "Bind Action"; 456 title => "Bind Action",
457 x => "center",
458 y => "center";
397 459
398 $w->add (my $vb = new CFClient::UI::VBox); 460 $w->add (my $vb = new CFClient::UI::VBox);
399 $vb->add (new CFClient::UI::Label 461 $vb->add (new CFClient::UI::Label
400 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." 462 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
401 ."You can only bind 0-9 and F1-F15 without modifiers." 463 ."You can only bind 0-9 and F1-F15 without modifiers."
… …
424 return; 486 return;
425 } 487 }
426 488
427 $entry->focus_out; 489 $entry->focus_out;
428 490
429 $::CFG->{bindings}->{$mod}->{$sym} = $cmd; 491 $cb->($mod, $sym);
430 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
431 492
432 $w->destroy 493 $w->destroy
433 }); 494 });
434 495
435 $entry->focus_in; 496 $entry->focus_in;
436 $w->center;
437 $w->show; 497 $w->show;
438} 498}
439 499
440sub keycombo_to_name { 500sub keycombo_to_name {
441 my ($mod, $sym) = @_; 501 my ($mod, $sym) = @_;
442 502
443 my $mods = join '+', 503 my $mods = join '+',
444 map { $ALLOWED_MODIFIERS{$_} } 504 map { $ALLOWED_MODIFIERS{$_} }
445 grep { $_ & $mod } 505 grep { ($_ + 0) & ($mod + 0) }
446 keys %ALLOWED_MODIFIERS; 506 keys %ALLOWED_MODIFIERS;
447 $mods .= "+" if $mods ne ''; 507 $mods .= "+" if $mods ne '';
448 508
449 return $mods . CFClient::SDL_GetKeyName ($sym); 509 return $mods . CFClient::SDL_GetKeyName ($sym);
450} 510}
451 511
452sub clear_command_list { 512package CFClient::Pickup;
453 $CMDBOX->clear () if $CMDBOX; 513# some pickup constants
454} 514sub PU_NOTHING { 0x00000000 }
455 515
456sub set_command_list { 516sub PU_DEBUG { 0x10000000 }
457 my ($list) = @_; 517sub PU_INHIBIT { 0x20000000 }
518sub PU_STOP { 0x40000000 }
519sub PU_NEWMODE { 0x80000000 }
458 520
459 return unless $CMDBOX; 521sub PU_RATIO { 0x0000000F }
460 522
461 $CMDBOX->clear (); 523sub PU_FOOD { 0x00000010 }
462 $CURRENT_CMDS = $list; 524sub PU_DRINK { 0x00000020 }
525sub PU_VALUABLES { 0x00000040 }
526sub PU_BOW { 0x00000080 }
463 527
464 my $idx = 0; 528sub PU_ARROW { 0x00000100 }
529sub PU_HELMET { 0x00000200 }
530sub PU_SHIELD { 0x00000400 }
531sub PU_ARMOUR { 0x00000800 }
465 532
466 for (@$list) { 533sub PU_BOOTS { 0x00001000 }
467 $CMDBOX->add (my $hb = new CFClient::UI::HBox); 534sub PU_GLOVES { 0x00002000 }
535sub PU_CLOAK { 0x00004000 }
536sub PU_KEY { 0x00008000 }
468 537
469 my $i = $idx; 538sub PU_MISSILEWEAPON { 0x00010000 }
470 $hb->add (new CFClient::UI::Button 539sub PU_ALLWEAPON { 0x00020000 }
471 text => "delete", 540sub PU_MAGICAL { 0x00040000 }
472 tooltip => "Deletes the action from the record", 541sub PU_POTION { 0x00080000 }
473 on_activate => sub {
474 $CMDBOX->remove ($hb);
475 $list->[$i] = undef;
476 });
477 542
478 $hb->add (new CFClient::UI::Label text => $_); 543sub PU_SPELLBOOK { 0x00100000 }
544sub PU_SKILLSCROLL { 0x00200000 }
545sub PU_READABLES { 0x00400000 }
546sub PU_MAGIC_DEVICE { 0x00800000 }
479 547
480 $idx++ 548sub PU_NOT_CURSED { 0x01000000 }
481 }
482}
483 549
484# if $show is 1 the recorder will be shown 550sub PU_JEWELS { 0x02000000 }
485sub start {
486 my ($show) = @_;
487 551
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
498sub 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
514sub 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 552
5481; 5531;
549 554
550=back 555=back
551 556

Diff Legend

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