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.46 by root, Mon Apr 24 10:19:39 2006 UTC vs.
Revision 1.91 by root, Wed Jun 7 06:28:28 2006 UTC

19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use utf8;
25
24use Carp (); 26use Carp ();
25use AnyEvent; 27use AnyEvent ();
26use BerkeleyDB; 28use BerkeleyDB;
27use CFClient::OpenGL; 29use Pod::POM ();
30use Storable (); # finally
28 31
29our %GL_EXT; 32package CFClient::PodToPango;
30our $GL_VERSION;
31 33
32our $GL_NPOT; 34use base Pod::POM::View::Text;
33 35
34sub gl_init { 36our $VERSION = 1; # bump if resultant formatting changes
35 $GL_VERSION = gl_version * 1;
36 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37 37
38 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 38our $indent = 0;
39 39
40 glEnable GL_TEXTURE_2D; 40*view_seq_code =
41 glEnable GL_COLOR_MATERIAL; 41*view_seq_bold = sub { "<b>$_[1]</b>" };
42 glShadeModel GL_FLAT; 42*view_seq_italic = sub { "<i>$_[1]</i>" };
43 glDisable GL_DEPTH_TEST; 43*view_seq_space =
44 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 44*view_seq_link =
45*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
45 46
46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 47sub view_seq_text {
47 48 my $text = $_[1];
48 CFClient::Texture::restore_state (); 49 $text =~ s/\s+/ /g;
50 CFClient::UI::Label::escape ($text)
49} 51}
52
53sub view_item {
54 ("\t" x ($indent / 4))
55 . $_[1]->title->present ($_[0])
56 . "\n\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;
50 114
51sub find_rcfile($) { 115sub find_rcfile($) {
52 my $path; 116 my $path;
53 117
54 for (grep !ref, @INC) { 118 for (grep !ref, @INC) {
89 } 153 }
90 154
91 close CFG; 155 close CFG;
92} 156}
93 157
158our $DB_ENV;
159
160{
161 use strict;
162
94mkdir "$Crossfire::VARDIR/pclient", 0777; 163 mkdir "$Crossfire::VARDIR/cfplus", 0777;
164 my $recover = $BerkeleyDB::db_version >= 4.4
165 ? eval "DB_REGISTER | DB_RECOVER"
166 : 0;
95 167
96our $DB_ENV = new BerkeleyDB::Env 168 $DB_ENV = new BerkeleyDB::Env
97 -Home => "$Crossfire::VARDIR/pclient", 169 -Home => "$Crossfire::VARDIR/cfplus",
98 -Cachesize => 1_000_000, 170 -Cachesize => 1_000_000,
99 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 171 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
100# -ErrPrefix => "DATABASE", 172# -ErrPrefix => "DATABASE",
101 -Verbose => 1, 173 -Verbose => 1,
102 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 174 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
175 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
103 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 176 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
177}
104 178
105sub db_table($) { 179sub db_table($) {
106 my ($table) = @_; 180 my ($table) = @_;
107 181
108 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 182 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
109 183
110 new CFClient::Database 184 new CFClient::Database
111 -Env => $DB_ENV, 185 -Env => $DB_ENV,
112 -Filename => $table, 186 -Filename => $table,
113# -Filename => "database", 187# -Filename => "database",
114# -Subname => $table, 188# -Subname => $table,
189 -Property => DB_CHKSUM,
115 -Flags => DB_CREATE | DB_UPGRADE, 190 -Flags => DB_CREATE | DB_UPGRADE,
116 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 191 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
117} 192}
118 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
224sub pod_to_pango($) {
225 my ($pom) = @_;
226
227 $pom->present ("CFClient::PodToPango")
228}
229
230sub pod_to_pango_list($) {
231 my ($pom) = @_;
232
233 [
234 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
235 split /\n/, $pom->present ("CFClient::PodToPango")
236 ]
237}
238
119package CFClient::Database; 239package CFClient::Item;
120
121our @ISA = BerkeleyDB::Btree::;
122
123sub get($$) {
124 my $data;
125
126 $_[0]->db_get ($_[1], $data) == 0
127 ? $data
128 : ()
129}
130
131my %DB_SYNC;
132
133sub put($$$) {
134 my ($db, $key, $data) = @_;
135
136 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
137
138 $db->db_put ($key => $data)
139}
140
141package CFClient::Texture;
142 240
143use strict; 241use strict;
242use Crossfire::Protocol::Constants;
144 243
145use Scalar::Util; 244my $last_enter_count = 1;
146 245
147use CFClient::OpenGL; 246sub desc_string {
148
149my %TEXTURES;
150
151sub new {
152 my ($class, %data) = @_;
153
154 my $self = bless {
155 internalformat => GL_RGBA,
156 format => GL_RGBA,
157 type => GL_UNSIGNED_BYTE,
158 %data,
159 }, $class;
160
161 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
162
163 $self->upload;
164
165 $self
166}
167
168sub new_from_image {
169 my ($class, $image, %arg) = @_;
170
171 $class->new (image => $image, %arg)
172}
173
174sub new_from_file {
175 my ($class, $path, %arg) = @_;
176
177 open my $fh, "<:raw", $path
178 or die "$path: $!";
179
180 local $/;
181 $class->new_from_image (<$fh>, %arg)
182}
183
184#sub new_from_surface {
185# my ($class, $surface) = @_;
186#
187# $surface->rgba;
188#
189# $class->new (
190# data => $surface->pixels,
191# w => $surface->width,
192# h => $surface->height,
193# )
194#}
195
196sub new_from_layout {
197 my ($class, $layout, %arg) = @_;
198
199 my ($w, $h, $data) = $layout->render;
200
201 $class->new (
202 w => $w,
203 h => $h,
204 data => $data,
205 format => GL_ALPHA,
206 internalformat => GL_ALPHA,
207 type => GL_UNSIGNED_BYTE,
208 %arg,
209 )
210}
211
212sub new_from_opengl {
213 my ($class, $w, $h, $cb) = @_;
214
215 $class->new (w => $w, h => $h, render_cb => $cb)
216}
217
218sub topot {
219 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
220}
221
222sub upload {
223 my ($self) = @_; 247 my ($self) = @_;
224 248
225 return unless $GL_VERSION; 249 my $desc =
250 $self->{nrof} < 2
251 ? $self->{name}
252 : "$self->{nrof} × $self->{name_pl}";
226 253
227 my $data; 254 $self->{flags} & F_OPEN
255 and $desc .= " (open)";
256 $self->{flags} & F_APPLIED
257 and $desc .= " (applied)";
258 $self->{flags} & F_UNPAID
259 and $desc .= " (unpaid)";
260 $self->{flags} & F_MAGIC
261 and $desc .= " (magic)";
262 $self->{flags} & F_CURSED
263 and $desc .= " (cursed)";
264 $self->{flags} & F_DAMNED
265 and $desc .= " (damned)";
266 $self->{flags} & F_LOCKED
267 and $desc .= " *";
228 268
229 if (exists $self->{data}) { 269 $desc
230 $data = $self->{data}; 270}
231 271
232 } elsif (exists $self->{render_cb}) { 272sub weight_string {
233 glViewport 0, 0, $self->{w}, $self->{h}; 273 my ($self) = @_;
234 glMatrixMode GL_PROJECTION;
235 glLoadIdentity;
236 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
237 glMatrixMode GL_MODELVIEW;
238 glLoadIdentity;
239 $self->{render_cb}->($self, $self->{w}, $self->{h});
240 274
241 } else { 275 my $weight = ($self->{nrof} || 1) * $self->{weight};
242 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
243 = CFClient::load_image_inline $self->{image};
244 }
245 276
246 my ($tw, $th) = @$self{qw(w h)}; 277 $weight < 0 ? "?" : $weight * 0.001
278}
247 279
248 unless ($tw && $th) { 280sub do_n_dialog {
249 $tw = $th = 1; 281 my ($cb) = @_;
250 $data = "\x00" x 64;
251 }
252 282
253 $self->{minified} = [CFClient::average $tw, $th, $data] 283 my $w = new CFClient::UI::FancyFrame;
254 if $self->{minify}; 284 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
255 285 $vb->add (new CFClient::UI::Label text => "Enter item count:");
256 unless ($GL_NPOT) { 286 $vb->add (my $entry = new CFClient::UI::Entry
257 # TODO: does not work for zero-sized textures 287 text => $last_enter_count,
258 $tw = topot $tw; 288 on_activate => sub {
259 $th = topot $th; 289 my ($entry) = @_;
260 290 $last_enter_count = $entry->get_text;
261 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 291 $cb->($last_enter_count);
262 my $bpp = (length $data) / ($self->{w} * $self->{h}); 292 $w->hide;
263 $data = pack "(a" . ($tw * $bpp) . ")*", 293 $w = undef;
264 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
265 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
266 } 294 }
295 );
296 $entry->focus_in;
297 $w->show;
298
299}
300
301sub update_widgets {
302 my ($self) = @_;
303
304 my $button_cb = sub {
305 my (undef, $ev, $x, $y) = @_;
306
307 my $targ = $::CONN->{player}{tag};
308
309 if ($self->{container} == $::CONN->{player}{tag}) {
310 $targ = $::CONN->{open_container};
311 }
312
313 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
314 $::CONN->send ("move $targ $self->{tag} 0")
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})
320 } elsif ($ev->{button} == 1) {
321 $::CONN->send ("examine $self->{tag}");
322 } elsif ($ev->{button} == 2) {
323 $::CONN->send ("apply $self->{tag}");
324 } elsif ($ev->{button} == 3) {
325 my @menu_items = (
326 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
327 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
328 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
329 (
330 $self->{flags} & F_LOCKED
331 ? (
332 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
333 )
334 : (
335 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
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 ]
342 )
343 ),
344 );
345
346 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
347 }
348
349 1
267 } 350 };
268 351
269 $self->{s} = $self->{w} / $tw; 352 my $tooltip_std = "<small>"
270 $self->{t} = $self->{h} / $th; 353 . "Left click - examine item\n"
354 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
355 . "Middle click - apply\n"
356 . "Shift-Middle click - lock/unlock\n"
357 . "Right click - further options"
358 . "</small>\n";
271 359
272 $self->{name} ||= glGenTexture; 360 $self->{face_widget} ||= new CFClient::UI::Face
273 361 can_events => 1,
274 glBindTexture GL_TEXTURE_2D, $self->{name}; 362 can_hover => 1,
275 363 anim => $self->{anim},
276 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 364 animspeed => $self->{animspeed}, # TODO# must be set at creation time
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 365 on_button_down => $button_cb,
278
279 if ($::FAST) {
280 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
282 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
283 # alternatively check for 0x8191
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
287 } else {
288 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
290 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
291 } 366 ;
367 $self->{face_widget}{face} = $self->{face};
368 $self->{face_widget}{anim} = $self->{anim};
369 $self->{face_widget}{animspeed} = $self->{animspeed};
370 $self->{face_widget}->set_tooltip (
371 "<b>Face/Animation.</b>\n"
372 . "Item uses face #$self->{face}. "
373 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
374 . "\n\n$tooltip_std"
375 );
292 376
293 glGetError; 377 $self->{desc_widget} ||= new CFClient::UI::Label
378 can_events => 1,
379 can_hover => 1,
380 ellipsise => 2,
381 align => -1,
382 on_button_down => $button_cb,
383 ;
384 my $desc = CFClient::Item::desc_string $self;
385 $self->{desc_widget}->set_text ($desc);
386 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
294 387
295 if (defined $data) { 388 $self->{weight_widget} ||= new CFClient::UI::Label
296 glTexImage2D GL_TEXTURE_2D, 0, 389 can_events => 1,
297 $self->{internalformat}, 390 can_hover => 1,
298 $tw, $th, # need to pad texture first 391 ellipsise => 0,
299 0, 392 align => 0,
300 $self->{format}, 393 on_button_down => $button_cb,
301 $self->{type}, 394 ;
302 $data; 395 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
303 if (my $error = glGetError) { 396
304 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x", 397 $self->{weight_widget}->set_tooltip (
305 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 398 "<b>Weight</b>.\n"
399 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
400 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
401 . "\n\n$tooltip_std"
402 );
403}
404
405package CFClient::Binder;
406
407my @ALLOWED_MODIFIER_KEYS = (
408 CFClient::SDLK_LSHIFT,
409 CFClient::SDLK_LCTRL ,
410 CFClient::SDLK_LALT ,
411 CFClient::SDLK_LMETA ,
412
413 CFClient::SDLK_RSHIFT,
414 CFClient::SDLK_RCTRL ,
415 CFClient::SDLK_RALT ,
416 CFClient::SDLK_RMETA ,
417);
418
419my %ALLOWED_MODIFIERS = (
420 CFClient::KMOD_LSHIFT => "LSHIFT",
421 CFClient::KMOD_LCTRL => "LCTRL",
422 CFClient::KMOD_LALT => "LALT",
423 CFClient::KMOD_LMETA => "LMETA",
424
425 CFClient::KMOD_RSHIFT => "RSHIFT",
426 CFClient::KMOD_RCTRL => "RCTRL",
427 CFClient::KMOD_RALT => "RALT",
428 CFClient::KMOD_RMETA => "RMETA",
429);
430
431my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
432my @DIRECT_BIND_KEYS = (
433 CFClient::SDLK_F1,
434 CFClient::SDLK_F2,
435 CFClient::SDLK_F3,
436 CFClient::SDLK_F4,
437 CFClient::SDLK_F5,
438 CFClient::SDLK_F6,
439 CFClient::SDLK_F7,
440 CFClient::SDLK_F8,
441 CFClient::SDLK_F9,
442 CFClient::SDLK_F10,
443 CFClient::SDLK_F11,
444 CFClient::SDLK_F12,
445 CFClient::SDLK_F13,
446 CFClient::SDLK_F14,
447 CFClient::SDLK_F15,
448);
449
450# this binding dialog asks for a key-combo to be pressed
451# and if successful it calls the $cb with $mod and $sym as args.
452sub open_binding_dialog {
453 my ($cb) = @_;
454
455 my $w = new CFClient::UI::FancyFrame
456 title => "Bind Action",
457 x => "center",
458 y => "center";
459
460 $w->add (my $vb = new CFClient::UI::VBox);
461 $vb->add (new CFClient::UI::Label
462 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
463 ."You can only bind 0-9 and F1-F15 without modifiers."
464 );
465 $vb->add (my $entry = new CFClient::UI::Entry
466 text => "",
467 on_key_down => sub {
468 my ($entry, $ev) = @_;
469
470 my $mod = $ev->{mod};
471 my $sym = $ev->{sym};
472
473 # XXX: This seems a little bit hackisch to me, but i have to ignore them
474 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
475 return;
476 }
477
478 if ($mod == CFClient::KMOD_NONE
479 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
480 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
481 {
482 $::STATUSBOX->add (
483 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
484 ." directly without modifier! It would damage the completer handling."
485 );
486 return;
487 }
488
489 $entry->focus_out;
490
491 $cb->($mod, $sym);
492
493 $w->destroy
306 } 494 });
307 } else {
308 glCopyTexImage2D GL_TEXTURE_2D, 0,
309 $self->{internalformat},
310 0, 0,
311 $tw, $th,
312 0;
313 if (my $error = glGetError) {
314 Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
315 $error, $tw, $th, $self->{internalformat};
316 }
317 }
318}
319 495
320sub DESTROY { 496 $entry->focus_in;
321 my ($self) = @_; 497 $w->show;
322
323 delete $TEXTURES{$self+0};
324
325 glDeleteTexture delete $self->{name}
326 if $self->{name};
327} 498}
328 499
329sub restore_state{ 500sub keycombo_to_name {
330 $_->upload 501 my ($mod, $sym) = @_;
331 for values %TEXTURES; 502
332}; 503 my $mods = join '+',
504 map { $ALLOWED_MODIFIERS{$_} }
505 grep { ($_ + 0) & ($mod + 0) }
506 keys %ALLOWED_MODIFIERS;
507 $mods .= "+" if $mods ne '';
508
509 return $mods . CFClient::SDL_GetKeyName ($sym);
510}
333 511
3341; 5121;
335 513
336=back 514=back
337 515

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines