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.82 by root, Wed May 31 07:13:50 2006 UTC vs.
Revision 1.119 by root, Tue Sep 12 20:51:17 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.51';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFPlus", $VERSION;
22} 22}
23 23
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM ();
30use Scalar::Util ();
31use Storable (); # finally
32
33=item guard { BLOCK }
34
35Returns an object that executes the given block as soon as it is destroyed.
36
37=cut
38
39sub guard(&) {
40 bless \(my $cb = $_[0]), "CFPlus::Guard"
41}
42
43sub CFPlus::Guard::DESTROY {
44 ${$_[0]}->()
45}
46
47sub asxml($) {
48 local $_ = $_[0];
49
50 s/&/&/g;
51 s/>/>/g;
52 s/</&lt;/g;
53
54 $_
55}
56
57package CFPlus::Database;
58
59our @ISA = BerkeleyDB::Btree::;
60
61sub get($$) {
62 my $data;
63
64 $_[0]->db_get ($_[1], $data) == 0
65 ? $data
66 : ()
67}
68
69my %DB_SYNC;
70
71sub put($$$) {
72 my ($db, $key, $data) = @_;
73
74 my $hkey = $db + 0;
75 Scalar::Util::weaken $db;
76 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
77 delete $DB_SYNC{$hkey};
78 $db->db_sync if $db;
79 });
80
81 $db->db_put ($key => $data)
82}
83
84package CFPlus;
29 85
30sub find_rcfile($) { 86sub find_rcfile($) {
31 my $path; 87 my $path;
32 88
33 for (grep !ref, @INC) { 89 for (grep !ref, @INC) {
34 $path = "$_/CFClient/resources/$_[0]"; 90 $path = "$_/CFPlus/resources/$_[0]";
35 return $path if -r $path; 91 return $path if -r $path;
36 } 92 }
37 93
38 die "FATAL: can't find required file $_[0]\n"; 94 die "FATAL: can't find required file $_[0]\n";
39} 95}
40 96
97BEGIN {
98 use Crossfire::Protocol::Base ();
99 *to_json = \&Crossfire::Protocol::Base::to_json;
100 *from_json = \&Crossfire::Protocol::Base::from_json;
101}
102
41sub read_cfg { 103sub read_cfg {
42 my ($file) = @_; 104 my ($file) = @_;
43 105
44 open CFG, $file 106 open my $fh, $file
45 or return; 107 or return;
46 108
47 my $CFG;
48
49 local $/; 109 local $/;
50 $CFG = eval <CFG>; 110 my $CFG = <$fh>;
51 111
52 $::CFG = $CFG; 112 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
53 113 require YAML;
54 close CFG; 114 utf8::decode $CFG;
115 $::CFG = YAML::Load ($CFG);
116 } elsif ($CFG =~ /^\{/) {
117 $::CFG = from_json $CFG;
118 } else {
119 $::CFG = eval $CFG; ## todo comaptibility cruft
120 }
55} 121}
56 122
57sub write_cfg { 123sub write_cfg {
58 my ($file) = @_; 124 my ($file) = @_;
59 125
60 open CFG, ">$file" 126 $::CFG->{VERSION} = $::VERSION;
127
128 open my $fh, ">:utf8", $file
61 or return; 129 or return;
62 130 print $fh to_json $::CFG;
63 {
64 require Data::Dumper;
65 local $Data::Dumper::Purity = 1;
66 $::CFG->{VERSION} = $::VERSION;
67 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
68 }
69
70 close CFG;
71} 131}
72
73mkdir "$Crossfire::VARDIR/cfplus", 0777;
74 132
75our $DB_ENV; 133our $DB_ENV;
76 134
77{ 135{
78 use strict; 136 use strict;
79 137
138 mkdir "$Crossfire::VARDIR/cfplus", 0777;
80 my $recover = $BerkeleyDB::db_version >= 4.4 139 my $recover = $BerkeleyDB::db_version >= 4.4
81 ? eval "DB_REGISTER | DB_RECOVER" 140 ? eval "DB_REGISTER | DB_RECOVER"
82 : 0; 141 : 0;
83 warn $recover;
84 142
85 $DB_ENV = new BerkeleyDB::Env 143 $DB_ENV = new BerkeleyDB::Env
86 -Home => "$Crossfire::VARDIR/cfplus", 144 -Home => "$Crossfire::VARDIR/cfplus",
87 -Cachesize => 1_000_000, 145 -Cachesize => 1_000_000,
88 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", 146 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
96sub db_table($) { 154sub db_table($) {
97 my ($table) = @_; 155 my ($table) = @_;
98 156
99 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 157 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
100 158
101 new CFClient::Database 159 new CFPlus::Database
102 -Env => $DB_ENV, 160 -Env => $DB_ENV,
103 -Filename => $table, 161 -Filename => $table,
104# -Filename => "database", 162# -Filename => "database",
105# -Subname => $table, 163# -Subname => $table,
106 -Property => DB_CHKSUM, 164 -Property => DB_CHKSUM,
107 -Flags => DB_CREATE | DB_UPGRADE, 165 -Flags => DB_CREATE | DB_UPGRADE,
108 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 166 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
109} 167}
110 168
111sub pod_to_pango($) { 169package CFPlus::Layout;
112 my ($pom) = @_;
113 170
114 $pom->present ("CFClient::PodToPango") 171$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
115} 172 reset_glyph_cache;
116
117sub pod_to_pango_list($) {
118 my ($pom) = @_;
119
120 [
121 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
122 split /\n/, $pom->present ("CFClient::PodToPango")
123 ]
124}
125
126package CFClient::PodToPango;
127
128use base Pod::POM::View::Text;
129
130our $indent = 0;
131
132*view_seq_code =
133*view_seq_bold = sub { "<b>$_[1]</b>" };
134*view_seq_italic = sub { "<i>$_[1]</i>" };
135*view_seq_space =
136*view_seq_link =
137*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
138
139sub view_seq_text {
140 my $text = $_[1];
141 $text =~ s/\s+/ /g;
142 CFClient::UI::Label::escape ($text)
143}
144
145sub view_item {
146 ("\t" x ($indent / 4))
147 . $_[1]->title->present ($_[0])
148 . "\n"
149 . $_[1]->content->present ($_[0])
150}
151
152sub view_verbatim {
153 (join "",
154 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
155 split /\n/, CFClient::UI::Label::escape ($_[1]))
156 . "\n"
157}
158
159sub view_textblock {
160 ("\t" x ($indent / 2)) . "$_[1]\n\n"
161}
162
163sub view_head1 {
164 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
165 . $_[1]->content->present ($_[0])
166}; 173};
167 174
168sub view_head2 {
169 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
170 . $_[1]->content->present ($_[0])
171};
172
173sub view_head3 {
174 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175 . $_[1]->content->present ($_[0])
176};
177
178sub view_over {
179 local $indent = $indent + $_[1]->indent;
180 $_[1]->content->present ($_[0])
181}
182
183package CFClient::Database;
184
185our @ISA = BerkeleyDB::Btree::;
186
187sub get($$) {
188 my $data;
189
190 $_[0]->db_get ($_[1], $data) == 0
191 ? $data
192 : ()
193}
194
195my %DB_SYNC;
196
197sub put($$$) {
198 my ($db, $key, $data) = @_;
199
200 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
201
202 $db->db_put ($key => $data)
203}
204
205package CFClient::Item; 175package CFPlus::Item;
206 176
207use strict; 177use strict;
208use Crossfire::Protocol::Constants; 178use Crossfire::Protocol::Constants;
179
180my $last_enter_count = 1;
209 181
210sub desc_string { 182sub desc_string {
211 my ($self) = @_; 183 my ($self) = @_;
212 184
213 my $desc = 185 my $desc =
239 my $weight = ($self->{nrof} || 1) * $self->{weight}; 211 my $weight = ($self->{nrof} || 1) * $self->{weight};
240 212
241 $weight < 0 ? "?" : $weight * 0.001 213 $weight < 0 ? "?" : $weight * 0.001
242} 214}
243 215
216sub do_n_dialog {
217 my ($cb) = @_;
218
219 my $w = new CFPlus::UI::Toplevel
220 on_delete => sub { $_[0]->destroy; 1 },
221 has_close_button => 1,
222 ;
223
224 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
225 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
226 $vb->add (my $entry = new CFPlus::UI::Entry
227 text => $last_enter_count,
228 on_activate => sub {
229 my ($entry) = @_;
230 $last_enter_count = $entry->get_text;
231 $cb->($last_enter_count);
232 $w->hide;
233 $w->destroy;
234
235 0
236 },
237 on_escape => sub { $w->destroy; 1 },
238 );
239 $entry->grab_focus;
240 $w->show;
241}
242
244sub update_widgets { 243sub update_widgets {
245 my ($self) = @_; 244 my ($self) = @_;
246 245
246 # necessary to avoid cyclic references
247 Scalar::Util::weaken $self;
248
247 my $button_cb = sub { 249 my $button_cb = sub {
248 my (undef, $ev, $x, $y) = @_; 250 my (undef, $ev, $x, $y) = @_;
249 251
250 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
251 my $targ = $::CONN->{player}{tag}; 252 my $targ = $::CONN->{player}{tag};
252 253
253 if ($self->{container} == $::CONN->{player}{tag}) { 254 if ($self->{container} == $::CONN->{player}{tag}) {
254 $targ = $::CONN->{open_container}; 255 $targ = $::CONN->{open_container};
255 } 256 }
256 257
258 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
257 $::CONN->send ("move $targ $self->{tag} 0") 259 $::CONN->send ("move $targ $self->{tag} 0")
258 if $targ || !($self->{flags} & F_LOCKED); 260 if $targ || !($self->{flags} & F_LOCKED);
261 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
262 $self->{flags} & F_LOCKED
263 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
264 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
259 } elsif ($ev->{button} == 1) { 265 } elsif ($ev->{button} == 1) {
260 $::CONN->send ("examine $self->{tag}"); 266 $::CONN->send ("examine $self->{tag}");
261 } elsif ($ev->{button} == 2) { 267 } elsif ($ev->{button} == 2) {
262 $::CONN->send ("apply $self->{tag}"); 268 $::CONN->send ("apply $self->{tag}");
263 } elsif ($ev->{button} == 3) { 269 } elsif ($ev->{button} == 3) {
270 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
271 if ($self->{container} == $::CONN->{open_container}) {
272 $move_prefix = "take";
273 }
274
264 my @menu_items = ( 275 my @menu_items = (
265 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 276 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
266 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 277 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
278 ["ignite/thaw", # first try of an easier use of flint&steel
279 sub {
280 $::CONN->send ("mark ". pack "N", $self->{tag});
281 $::CONN->send ("command apply flint and steel");
282 }
283 ],
284 ["inscribe", # first try of an easier use of flint&steel
285 sub {
286 &::open_string_query ("Text to inscribe", sub {
287 my ($entry, $txt) = @_;
288 $::CONN->send ("mark ". pack "N", $self->{tag});
289 $::CONN->send ("command use_skill inscription $txt");
290 });
291 }
292 ],
293 ["rename", # first try of an easier use of flint&steel
294 sub {
295 &::open_string_query ("Rename item to:", sub {
296 my ($entry, $txt) = @_;
297 $::CONN->send ("mark ". pack "N", $self->{tag});
298 $::CONN->send ("command rename to <$txt>");
299 }, $self->{name},
300 "If you input no name or erase the current custom name, the custom name will be unset");
301 }
302 ],
267 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 303 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
268 ( 304 (
269 $self->{flags} & F_LOCKED 305 $self->{flags} & F_LOCKED
270 ? ( 306 ? (
271 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 307 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
272 ) 308 )
273 : ( 309 : (
274 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 310 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
275 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 311 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
312 ["$move_prefix &lt;n&gt;",
313 sub {
314 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
315 }
316 ]
276 ) 317 )
277 ), 318 ),
278 ); 319 );
279 320
280 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 321 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
281 } 322 }
282 323
283 1 324 1
284 }; 325 };
285 326
286 my $tooltip_std = "<small>" 327 my $tooltip_std = "<small>"
287 . "Left click - examine item\n" 328 . "Left click - examine item\n"
288 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 329 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
289 . "Middle click - apply\n" 330 . "Middle click - apply\n"
331 . "Shift-Middle click - lock/unlock\n"
290 . "Right click - further options" 332 . "Right click - further options"
291 . "</small>\n"; 333 . "</small>\n";
292 334
335 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
336 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
337 : undef;
338
293 $self->{face_widget} ||= new CFClient::UI::Face 339 $self->{face_widget} ||= new CFPlus::UI::Face
294 can_events => 1, 340 can_events => 1,
295 can_hover => 1, 341 can_hover => 1,
296 anim => $self->{anim}, 342 anim => $self->{anim},
297 animspeed => $self->{animspeed}, # TODO# must be set at creation time 343 animspeed => $self->{animspeed}, # TODO# must be set at creation time
298 on_button_down => $button_cb, 344 on_button_down => $button_cb,
299 ; 345 ;
346 $self->{face_widget}{bg} = $bg;
300 $self->{face_widget}{face} = $self->{face}; 347 $self->{face_widget}{face} = $self->{face};
301 $self->{face_widget}{anim} = $self->{anim}; 348 $self->{face_widget}{anim} = $self->{anim};
302 $self->{face_widget}{animspeed} = $self->{animspeed}; 349 $self->{face_widget}{animspeed} = $self->{animspeed};
303 $self->{face_widget}->set_tooltip ( 350 $self->{face_widget}->set_tooltip (
304 "<b>Face/Animation.</b>\n" 351 "<b>Face/Animation.</b>\n"
305 . "Item uses face #$self->{face}. " 352 . "Item uses face #$self->{face}. "
306 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 353 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
307 . "\n\n$tooltip_std" 354 . "\n\n$tooltip_std"
308 ); 355 );
309 356
310 $self->{desc_widget} ||= new CFClient::UI::Label 357 $self->{desc_widget} ||= new CFPlus::UI::Label
311 can_events => 1, 358 can_events => 1,
312 can_hover => 1, 359 can_hover => 1,
313 ellipsise => 2, 360 ellipsise => 2,
314 align => -1, 361 align => -1,
315 on_button_down => $button_cb, 362 on_button_down => $button_cb,
316 ; 363 ;
317 my $desc = CFClient::Item::desc_string $self; 364 my $desc = CFPlus::Item::desc_string $self;
365 $self->{desc_widget}{bg} = $bg;
318 $self->{desc_widget}->set_text ($desc); 366 $self->{desc_widget}->set_text ($desc);
319 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 367 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
320 368
321 $self->{weight_widget} ||= new CFClient::UI::Label 369 $self->{weight_widget} ||= new CFPlus::UI::Label
322 can_events => 1, 370 can_events => 1,
323 can_hover => 1, 371 can_hover => 1,
324 ellipsise => 0, 372 ellipsise => 0,
325 align => 0, 373 align => 0,
326 on_button_down => $button_cb, 374 on_button_down => $button_cb,
327 ; 375 ;
376 $self->{weight_widget}{bg} = $bg;
328 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 377 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
329
330 $self->{weight_widget}->set_tooltip ( 378 $self->{weight_widget}->set_tooltip (
331 "<b>Weight</b>.\n" 379 "<b>Weight</b>.\n"
332 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 380 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
333 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 381 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
334 . "\n\n$tooltip_std" 382 . "\n\n$tooltip_std"
335 ); 383 );
336} 384}
337 385
338package CFClient::Binder;
339
340my @ALLOWED_MODIFIER_KEYS = (
341 (CFClient::SDLK_LSHIFT),
342 (CFClient::SDLK_LCTRL ),
343 (CFClient::SDLK_LALT ),
344 (CFClient::SDLK_LMETA ),
345
346 (CFClient::SDLK_RSHIFT),
347 (CFClient::SDLK_RCTRL ),
348 (CFClient::SDLK_RALT ),
349 (CFClient::SDLK_RMETA ),
350);
351
352my %ALLOWED_MODIFIERS = (
353 (CFClient::KMOD_LSHIFT) => "LSHIFT",
354 (CFClient::KMOD_LCTRL ) => "LCTRL",
355 (CFClient::KMOD_LALT ) => "LALT",
356 (CFClient::KMOD_LMETA ) => "LMETA",
357
358 (CFClient::KMOD_RSHIFT) => "RSHIFT",
359 (CFClient::KMOD_RCTRL ) => "RCTRL",
360 (CFClient::KMOD_RALT ) => "RALT",
361 (CFClient::KMOD_RMETA ) => "RMETA",
362);
363
364my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
365my @DIRECT_BIND_KEYS = (
366 CFClient::SDLK_F1,
367 CFClient::SDLK_F2,
368 CFClient::SDLK_F3,
369 CFClient::SDLK_F4,
370 CFClient::SDLK_F5,
371 CFClient::SDLK_F6,
372 CFClient::SDLK_F7,
373 CFClient::SDLK_F8,
374 CFClient::SDLK_F9,
375 CFClient::SDLK_F10,
376 CFClient::SDLK_F11,
377 CFClient::SDLK_F12,
378 CFClient::SDLK_F13,
379 CFClient::SDLK_F14,
380 CFClient::SDLK_F15,
381);
382
383# this binding dialog asks for a key-combo to be pressed
384# and if successful it calls the $cb with $mod and $sym as args.
385sub open_binding_dialog {
386 my ($cb) = @_;
387
388 my $w = new CFClient::UI::FancyFrame
389 title => "Bind Action",
390 x => "center",
391 y => "center";
392
393 $w->add (my $vb = new CFClient::UI::VBox);
394 $vb->add (new CFClient::UI::Label
395 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
396 ."You can only bind 0-9 and F1-F15 without modifiers."
397 );
398 $vb->add (my $entry = new CFClient::UI::Entry
399 text => "",
400 on_key_down => sub {
401 my ($entry, $ev) = @_;
402
403 my $mod = $ev->{mod};
404 my $sym = $ev->{sym};
405
406 # XXX: This seems a little bit hackisch to me, but i have to ignore them
407 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
408 return;
409 }
410
411 if ($mod == CFClient::KMOD_NONE
412 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
413 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
414 {
415 $::STATUSBOX->add (
416 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
417 ." directly without modifier! It would damage the completer handling."
418 );
419 return;
420 }
421
422 $entry->focus_out;
423
424 $cb->($mod, $sym);
425
426 $w->destroy
427 });
428
429 $entry->focus_in;
430 $w->show;
431}
432
433sub keycombo_to_name {
434 my ($mod, $sym) = @_;
435
436 my $mods = join '+',
437 map { $ALLOWED_MODIFIERS{$_} }
438 grep { ($_ + 0) & ($mod + 0) }
439 keys %ALLOWED_MODIFIERS;
440 $mods .= "+" if $mods ne '';
441
442 return $mods . CFClient::SDL_GetKeyName ($sym);
443}
444
4451; 3861;
446 387
447=back 388=back
448 389
449=head1 AUTHOR 390=head1 AUTHOR

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines