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.51 by root, Sun May 14 20:51:19 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;
33our $GL_DEBUG = 1;
34 35
35sub gl_init { 36our $VERSION = 1; # bump if resultant formatting changes
36 $GL_VERSION = gl_version * 1;
37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38 37
39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 38our $indent = 0;
40 39
41 glDisable GL_COLOR_MATERIAL; 40*view_seq_code =
42 glShadeModel GL_FLAT; 41*view_seq_bold = sub { "<b>$_[1]</b>" };
43 glDisable GL_DITHER; 42*view_seq_italic = sub { "<i>$_[1]</i>" };
44 glDisable GL_DEPTH_TEST; 43*view_seq_space =
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 44*view_seq_link =
45*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
46 46
47 CFClient::Texture::restore_state (); 47sub view_seq_text {
48 my $text = $_[1];
49 $text =~ s/\s+/ /g;
50 CFClient::UI::Label::escape ($text)
48} 51}
49 52
50sub gl_check { 53sub view_item {
51 return unless $GL_DEBUG; 54 ("\t" x ($indent / 4))
52 55 . $_[1]->title->present ($_[0])
53 if (my $error = glGetError) { 56 . "\n\n"
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_; 57 . $_[1]->content->present ($_[0])
55 }
56} 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;
57 114
58sub find_rcfile($) { 115sub find_rcfile($) {
59 my $path; 116 my $path;
60 117
61 for (grep !ref, @INC) { 118 for (grep !ref, @INC) {
… …
96 } 153 }
97 154
98 close CFG; 155 close CFG;
99} 156}
100 157
158our $DB_ENV;
159
160{
161 use strict;
162
101mkdir "$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;
102 167
103our $DB_ENV = new BerkeleyDB::Env 168 $DB_ENV = new BerkeleyDB::Env
104 -Home => "$Crossfire::VARDIR/pclient", 169 -Home => "$Crossfire::VARDIR/cfplus",
105 -Cachesize => 1_000_000, 170 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 171 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
107# -ErrPrefix => "DATABASE", 172# -ErrPrefix => "DATABASE",
108 -Verbose => 1, 173 -Verbose => 1,
109 -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,
110 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}
111 178
112sub db_table($) { 179sub db_table($) {
113 my ($table) = @_; 180 my ($table) = @_;
114 181
115 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 182 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
116 183
117 new CFClient::Database 184 new CFClient::Database
118 -Env => $DB_ENV, 185 -Env => $DB_ENV,
119 -Filename => $table, 186 -Filename => $table,
120# -Filename => "database", 187# -Filename => "database",
121# -Subname => $table, 188# -Subname => $table,
122 -Property => DB_CHKSUM, 189 -Property => DB_CHKSUM,
123 -Flags => DB_CREATE | DB_UPGRADE, 190 -Flags => DB_CREATE | DB_UPGRADE,
124 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 191 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
125} 192}
126 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
127package CFClient::Database; 239package CFClient::Item;
128
129our @ISA = BerkeleyDB::Btree::;
130
131sub get($$) {
132 my $data;
133
134 $_[0]->db_get ($_[1], $data) == 0
135 ? $data
136 : ()
137}
138
139my %DB_SYNC;
140
141sub put($$$) {
142 my ($db, $key, $data) = @_;
143
144 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
145
146 $db->db_put ($key => $data)
147}
148
149package CFClient::Texture;
150 240
151use strict; 241use strict;
242use Crossfire::Protocol::Constants;
152 243
153use Scalar::Util; 244my $last_enter_count = 1;
154 245
155use CFClient::OpenGL; 246sub desc_string {
156
157my %TEXTURES;
158
159sub new {
160 my ($class, %data) = @_;
161
162 my $self = bless {
163 internalformat => GL_RGBA,
164 format => GL_RGBA,
165 type => GL_UNSIGNED_BYTE,
166 %data,
167 }, $class;
168
169 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
170
171 $self->upload;
172
173 $self
174}
175
176sub new_from_image {
177 my ($class, $image, %arg) = @_;
178
179 $class->new (image => $image, %arg)
180}
181
182sub new_from_file {
183 my ($class, $path, %arg) = @_;
184
185 open my $fh, "<:raw", $path
186 or die "$path: $!";
187
188 local $/;
189 $class->new_from_image (<$fh>, %arg)
190}
191
192#sub new_from_surface {
193# my ($class, $surface) = @_;
194#
195# $surface->rgba;
196#
197# $class->new (
198# data => $surface->pixels,
199# w => $surface->width,
200# h => $surface->height,
201# )
202#}
203
204sub new_from_layout {
205 my ($class, $layout, %arg) = @_;
206
207 my ($w, $h, $data, $format, $internalformat) = $layout->render;
208
209 $class->new (
210 w => $w,
211 h => $h,
212 data => $data,
213 format => $format,
214 internalformat => $format,
215 type => GL_UNSIGNED_BYTE,
216 %arg,
217 )
218}
219
220sub new_from_opengl {
221 my ($class, $w, $h, $cb) = @_;
222
223 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
224}
225
226sub topot {
227 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
228}
229
230sub upload {
231 my ($self) = @_; 247 my ($self) = @_;
232 248
233 return unless $GL_VERSION; 249 my $desc =
250 $self->{nrof} < 2
251 ? $self->{name}
252 : "$self->{nrof} × $self->{name_pl}";
234 253
235 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 .= " *";
236 268
237 if (exists $self->{data}) { 269 $desc
238 $data = $self->{data}; 270}
239 271
240 } elsif (exists $self->{render_cb}) { 272sub weight_string {
241 glViewport 0, 0, $self->{w}, $self->{h}; 273 my ($self) = @_;
242 glMatrixMode GL_PROJECTION;
243 glLoadIdentity;
244 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
245 glMatrixMode GL_MODELVIEW;
246 glLoadIdentity;
247 $self->{render_cb}->($self, $self->{w}, $self->{h});
248 274
249 } else { 275 my $weight = ($self->{nrof} || 1) * $self->{weight};
250 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
251 = CFClient::load_image_inline $self->{image};
252 }
253 276
254 my ($tw, $th) = @$self{qw(w h)}; 277 $weight < 0 ? "?" : $weight * 0.001
278}
255 279
256 unless ($tw > 0 && $th > 0) { 280sub do_n_dialog {
257 $tw = $th = 1; 281 my ($cb) = @_;
258 $data = "\x00" x 64;
259 }
260 282
261 $self->{minified} = [CFClient::average $tw, $th, $data] 283 my $w = new CFClient::UI::FancyFrame;
262 if $self->{minify}; 284 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
263 285 $vb->add (new CFClient::UI::Label text => "Enter item count:");
264 unless ($GL_NPOT) { 286 $vb->add (my $entry = new CFClient::UI::Entry
265 # TODO: does not work for zero-sized textures 287 text => $last_enter_count,
266 $tw = topot $tw; 288 on_activate => sub {
267 $th = topot $th; 289 my ($entry) = @_;
268 290 $last_enter_count = $entry->get_text;
269 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 291 $cb->($last_enter_count);
270 my $bpp = (length $data) / ($self->{w} * $self->{h}); 292 $w->hide;
271 $data = pack "(a" . ($tw * $bpp) . ")*", 293 $w = undef;
272 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
273 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
274 } 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
275 } 350 };
276 351
277 $self->{s} = $self->{w} / $tw; 352 my $tooltip_std = "<small>"
278 $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";
279 359
280 $self->{name} ||= glGenTexture; 360 $self->{face_widget} ||= new CFClient::UI::Face
281 361 can_events => 1,
282 glBindTexture GL_TEXTURE_2D, $self->{name}; 362 can_hover => 1,
283 363 anim => $self->{anim},
284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 364 animspeed => $self->{animspeed}, # TODO# must be set at creation time
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 365 on_button_down => $button_cb,
286
287 if ($::FAST) {
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291 # alternatively check for 0x8191
292 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
295 } else {
296 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
298 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
299 } 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 );
300 376
301 glGetError; 377 $self->{desc_widget} ||= new CFClient::UI::Label
302 378 can_events => 1,
303 if (defined $data) { 379 can_hover => 1,
304 glTexImage2D GL_TEXTURE_2D, 0, 380 ellipsise => 2,
305 $self->{internalformat}, 381 align => -1,
306 $tw, $th, # need to pad texture first 382 on_button_down => $button_cb,
307 0,
308 $self->{format},
309 $self->{type},
310 $data;
311 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
312 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
313 } else {
314 glCopyTexImage2D GL_TEXTURE_2D, 0,
315 $self->{internalformat},
316 0, 0,
317 $tw, $th,
318 0;
319 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat};
321 } 383 ;
322} 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");
323 387
324sub DESTROY { 388 $self->{weight_widget} ||= new CFClient::UI::Label
389 can_events => 1,
390 can_hover => 1,
391 ellipsise => 0,
392 align => 0,
393 on_button_down => $button_cb,
394 ;
395 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
396
397 $self->{weight_widget}->set_tooltip (
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 {
325 my ($self) = @_; 453 my ($cb) = @_;
326 454
327 delete $TEXTURES{$self+0}; 455 my $w = new CFClient::UI::FancyFrame
456 title => "Bind Action",
457 x => "center",
458 y => "center";
328 459
329 glDeleteTexture delete $self->{name} 460 $w->add (my $vb = new CFClient::UI::VBox);
330 if $self->{name}; 461 $vb->add (new CFClient::UI::Label
331} 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) = @_;
332 469
333sub restore_state{ 470 my $mod = $ev->{mod};
334 $_->upload 471 my $sym = $ev->{sym};
335 for values %TEXTURES; 472
336}; 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
494 });
495
496 $entry->focus_in;
497 $w->show;
498}
499
500sub keycombo_to_name {
501 my ($mod, $sym) = @_;
502
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}
337 511
3381; 5121;
339 513
340=back 514=back
341 515

Diff Legend

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