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.93 by root, Sun Jun 18 17:13:10 2006 UTC vs.
Revision 1.108 by root, Sun Jul 30 13:16:44 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.1';
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 (); 29use Pod::POM ();
30use Scalar::Util (); 30use Scalar::Util ();
31use JSON::Syck ();
31use Storable (); # finally 32use Storable (); # finally
32 33
33package CFClient::PodToPango; 34our %STAT_TOOLTIP = (
35 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
36 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
37 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
38 Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",
39 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
40 Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
41 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
34 42
35use base Pod::POM::View::Text; 43 Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
44 Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
45 Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
46 Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
47 Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
48 WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
49);
36 50
37our $VERSION = 1; # bump if resultant formatting changes 51=item guard { BLOCK }
38 52
39our $indent = 0; 53Returns an object that executes the given block as soon as it is destroyed.
40 54
41*view_seq_code = 55=cut
42*view_seq_bold = sub { "<b>$_[1]</b>" };
43*view_seq_italic = sub { "<i>$_[1]</i>" };
44*view_seq_space =
45*view_seq_link =
46*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
47 56
48sub view_seq_text { 57sub guard(&) {
49 my $text = $_[1]; 58 bless \(my $cb = $_[0]), "CFPlus::Guard"
50 $text =~ s/\s+/ /g;
51 CFClient::UI::Label::escape ($text)
52} 59}
53 60
54sub view_item { 61sub CFPlus::Guard::DESTROY {
55 ("\t" x ($indent / 4)) 62 ${$_[0]}->()
56 . $_[1]->title->present ($_[0])
57 . "\n\n"
58 . $_[1]->content->present ($_[0])
59} 63}
60 64
61sub view_verbatim { 65sub asxml($) {
62 (join "", 66 local $_ = $_[0];
63 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
64 split /\n/, CFClient::UI::Label::escape ($_[1]))
65 . "\n"
66}
67 67
68sub view_textblock { 68 s/&/&amp;/g;
69 ("\t" x ($indent / 2)) . "$_[1]\n\n" 69 s/>/&gt;/g;
70} 70 s/</&lt;/g;
71 71
72sub view_head1 { 72 $_
73 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
74 . $_[1]->content->present ($_[0])
75};
76
77sub view_head2 {
78 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
79 . $_[1]->content->present ($_[0])
80};
81
82sub view_head3 {
83 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
84 . $_[1]->content->present ($_[0])
85};
86
87sub view_over {
88 local $indent = $indent + $_[1]->indent;
89 $_[1]->content->present ($_[0])
90} 73}
91 74
92package CFClient::Database; 75package CFPlus::Database;
93 76
94our @ISA = BerkeleyDB::Btree::; 77our @ISA = BerkeleyDB::Btree::;
95 78
96sub get($$) { 79sub get($$) {
97 my $data; 80 my $data;
109 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 92 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
110 93
111 $db->db_put ($key => $data) 94 $db->db_put ($key => $data)
112} 95}
113 96
114package CFClient; 97package CFPlus;
115 98
116sub find_rcfile($) { 99sub find_rcfile($) {
117 my $path; 100 my $path;
118 101
119 for (grep !ref, @INC) { 102 for (grep !ref, @INC) {
120 $path = "$_/CFClient/resources/$_[0]"; 103 $path = "$_/CFPlus/resources/$_[0]";
121 return $path if -r $path; 104 return $path if -r $path;
122 } 105 }
123 106
124 die "FATAL: can't find required file $_[0]\n"; 107 die "FATAL: can't find required file $_[0]\n";
125} 108}
126 109
110$JSON::Syck::ImplicitUnicode = 1;
111
112sub from_json {
113 JSON::Syck::Load $_[0]
114}
115
116sub to_json {
117 JSON::Syck::Dump $_[0]
118}
119
127sub read_cfg { 120sub read_cfg {
128 my ($file) = @_; 121 my ($file) = @_;
129 122
130 open CFG, $file 123 open my $fh, $file
131 or return; 124 or return;
132 125
133 my $CFG;
134
135 local $/; 126 local $/;
136 $CFG = eval <CFG>; 127 my $CFG = <$fh>;
137 128
138 $::CFG = $CFG; 129 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
139 130 require YAML;
140 close CFG; 131 utf8::decode $CFG;
132 $::CFG = YAML::Load ($CFG);
133 } elsif ($CFG =~ /^\{/) {
134 $::CFG = from_json $CFG;
135 } else {
136 $::CFG = eval $CFG; ## todo comaptibility cruft
137 }
141} 138}
142 139
143sub write_cfg { 140sub write_cfg {
144 my ($file) = @_; 141 my ($file) = @_;
145 142
146 open CFG, ">$file" 143 $::CFG->{VERSION} = $::VERSION;
144
145 open my $fh, ">:utf8", $file
147 or return; 146 or return;
148 147 print $fh to_json $::CFG;
149 {
150 require Data::Dumper;
151 local $Data::Dumper::Purity = 1;
152 $::CFG->{VERSION} = $::VERSION;
153 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
154 }
155
156 close CFG;
157} 148}
158 149
159our $DB_ENV; 150our $DB_ENV;
160 151
161{ 152{
180sub db_table($) { 171sub db_table($) {
181 my ($table) = @_; 172 my ($table) = @_;
182 173
183 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 174 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
184 175
185 new CFClient::Database 176 new CFPlus::Database
186 -Env => $DB_ENV, 177 -Env => $DB_ENV,
187 -Filename => $table, 178 -Filename => $table,
188# -Filename => "database", 179# -Filename => "database",
189# -Subname => $table, 180# -Subname => $table,
190 -Property => DB_CHKSUM, 181 -Property => DB_CHKSUM,
191 -Flags => DB_CREATE | DB_UPGRADE, 182 -Flags => DB_CREATE | DB_UPGRADE,
192 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 183 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
193} 184}
194 185
195my $pod_cache = db_table "pod_cache"; 186package CFPlus::Layout;
196 187
197sub load_pod($$$$) { 188$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
198 my ($path, $filtertype, $filterversion, $filtercb) = @_; 189 reset_glyph_cache;
190};
199 191
200 stat $path
201 or die "$path: $!";
202
203 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
204
205 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
206
207 return $pom if $chash eq $phash;
208
209 my $pod = do {
210 local $/;
211 open my $pod, "<:utf8", $_[0]
212 or die "$_[0]: $!";
213 <$pod>
214 };
215
216 #utf8::downgrade $pod;
217
218 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
219
220 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
221
222 $pom
223}
224
225sub pod_to_pango($) {
226 my ($pom) = @_;
227
228 $pom->present ("CFClient::PodToPango")
229}
230
231sub pod_to_pango_list($) {
232 my ($pom) = @_;
233
234 [
235 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
236 split /\n/, $pom->present ("CFClient::PodToPango")
237 ]
238}
239
240package CFClient::Item; 192package CFPlus::Item;
241 193
242use strict; 194use strict;
243use Crossfire::Protocol::Constants; 195use Crossfire::Protocol::Constants;
244 196
245my $last_enter_count = 1; 197my $last_enter_count = 1;
279} 231}
280 232
281sub do_n_dialog { 233sub do_n_dialog {
282 my ($cb) = @_; 234 my ($cb) = @_;
283 235
284 my $w = new CFClient::UI::FancyFrame; 236 my $w = new CFPlus::UI::FancyFrame
237 on_delete => sub { $_[0]->destroy; 1 },
238 has_close_button => 1,
239 ;
240
285 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 241 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
286 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 242 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
287 $vb->add (my $entry = new CFClient::UI::Entry 243 $vb->add (my $entry = new CFPlus::UI::Entry
288 text => $last_enter_count, 244 text => $last_enter_count,
289 on_activate => sub { 245 on_activate => sub {
290 my ($entry) = @_; 246 my ($entry) = @_;
291 $last_enter_count = $entry->get_text; 247 $last_enter_count = $entry->get_text;
292 $cb->($last_enter_count); 248 $cb->($last_enter_count);
293 $w->hide; 249 $w->hide;
294 $w = undef; 250 $w->destroy;
251
252 0
295 } 253 },
254 on_escape => sub { $w->destroy; 1 },
296 ); 255 );
297 $entry->grab_focus; 256 $entry->grab_focus;
298 $w->show; 257 $w->show;
299
300} 258}
301 259
302sub update_widgets { 260sub update_widgets {
303 my ($self) = @_; 261 my ($self) = @_;
304 262
312 270
313 if ($self->{container} == $::CONN->{player}{tag}) { 271 if ($self->{container} == $::CONN->{player}{tag}) {
314 $targ = $::CONN->{open_container}; 272 $targ = $::CONN->{open_container};
315 } 273 }
316 274
317 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 275 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
318 $::CONN->send ("move $targ $self->{tag} 0") 276 $::CONN->send ("move $targ $self->{tag} 0")
319 if $targ || !($self->{flags} & F_LOCKED); 277 if $targ || !($self->{flags} & F_LOCKED);
320 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 278 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
321 $self->{flags} & F_LOCKED 279 $self->{flags} & F_LOCKED
322 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 280 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
323 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 281 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
324 } elsif ($ev->{button} == 1) { 282 } elsif ($ev->{button} == 1) {
325 $::CONN->send ("examine $self->{tag}"); 283 $::CONN->send ("examine $self->{tag}");
326 } elsif ($ev->{button} == 2) { 284 } elsif ($ev->{button} == 2) {
327 $::CONN->send ("apply $self->{tag}"); 285 $::CONN->send ("apply $self->{tag}");
328 } elsif ($ev->{button} == 3) { 286 } elsif ($ev->{button} == 3) {
287 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
288 if ($self->{container} == $::CONN->{open_container}) {
289 $move_prefix = "take";
290 }
291
329 my @menu_items = ( 292 my @menu_items = (
330 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 293 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
331 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 294 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
295 ["ignite/thaw", # first try of an easier use of flint&steel
296 sub {
297 $::CONN->send ("mark ". pack "N", $self->{tag});
298 $::CONN->send ("command apply flint and steel");
299 }
300 ],
332 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 301 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
333 ( 302 (
334 $self->{flags} & F_LOCKED 303 $self->{flags} & F_LOCKED
335 ? ( 304 ? (
336 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 305 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
337 ) 306 )
338 : ( 307 : (
339 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 308 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
340 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], 309 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
341 ["move n", 310 ["$move_prefix &lt;n&gt;",
342 sub { 311 sub {
343 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 312 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
344 } 313 }
345 ] 314 ]
346 ) 315 )
347 ), 316 ),
348 ); 317 );
349 318
350 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 319 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
351 } 320 }
352 321
353 1 322 1
354 }; 323 };
355 324
359 . "Middle click - apply\n" 328 . "Middle click - apply\n"
360 . "Shift-Middle click - lock/unlock\n" 329 . "Shift-Middle click - lock/unlock\n"
361 . "Right click - further options" 330 . "Right click - further options"
362 . "</small>\n"; 331 . "</small>\n";
363 332
333 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
334 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
335 : undef;
336
364 $self->{face_widget} ||= new CFClient::UI::Face 337 $self->{face_widget} ||= new CFPlus::UI::Face
365 can_events => 1, 338 can_events => 1,
366 can_hover => 1, 339 can_hover => 1,
367 anim => $self->{anim}, 340 anim => $self->{anim},
368 animspeed => $self->{animspeed}, # TODO# must be set at creation time 341 animspeed => $self->{animspeed}, # TODO# must be set at creation time
369 on_button_down => $button_cb, 342 on_button_down => $button_cb,
370 ; 343 ;
344 $self->{face_widget}{bg} = $bg;
371 $self->{face_widget}{face} = $self->{face}; 345 $self->{face_widget}{face} = $self->{face};
372 $self->{face_widget}{anim} = $self->{anim}; 346 $self->{face_widget}{anim} = $self->{anim};
373 $self->{face_widget}{animspeed} = $self->{animspeed}; 347 $self->{face_widget}{animspeed} = $self->{animspeed};
374 $self->{face_widget}->set_tooltip ( 348 $self->{face_widget}->set_tooltip (
375 "<b>Face/Animation.</b>\n" 349 "<b>Face/Animation.</b>\n"
376 . "Item uses face #$self->{face}. " 350 . "Item uses face #$self->{face}. "
377 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 351 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
378 . "\n\n$tooltip_std" 352 . "\n\n$tooltip_std"
379 ); 353 );
380 354
381 $self->{desc_widget} ||= new CFClient::UI::Label 355 $self->{desc_widget} ||= new CFPlus::UI::Label
382 can_events => 1, 356 can_events => 1,
383 can_hover => 1, 357 can_hover => 1,
384 ellipsise => 2, 358 ellipsise => 2,
385 align => -1, 359 align => -1,
386 on_button_down => $button_cb, 360 on_button_down => $button_cb,
387 ; 361 ;
388 my $desc = CFClient::Item::desc_string $self; 362 my $desc = CFPlus::Item::desc_string $self;
363 $self->{desc_widget}{bg} = $bg;
389 $self->{desc_widget}->set_text ($desc); 364 $self->{desc_widget}->set_text ($desc);
390 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 365 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
391 366
392 $self->{weight_widget} ||= new CFClient::UI::Label 367 $self->{weight_widget} ||= new CFPlus::UI::Label
393 can_events => 1, 368 can_events => 1,
394 can_hover => 1, 369 can_hover => 1,
395 ellipsise => 0, 370 ellipsise => 0,
396 align => 0, 371 align => 0,
397 on_button_down => $button_cb, 372 on_button_down => $button_cb,
398 ; 373 ;
374 $self->{weight_widget}{bg} = $bg;
399 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 375 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
400
401 $self->{weight_widget}->set_tooltip ( 376 $self->{weight_widget}->set_tooltip (
402 "<b>Weight</b>.\n" 377 "<b>Weight</b>.\n"
403 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 378 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
404 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 379 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
405 . "\n\n$tooltip_std" 380 . "\n\n$tooltip_std"
406 ); 381 );
407} 382}
408 383
409package CFClient::Binder;
410
411my @ALLOWED_MODIFIER_KEYS = (
412 CFClient::SDLK_LSHIFT,
413 CFClient::SDLK_LCTRL ,
414 CFClient::SDLK_LALT ,
415 CFClient::SDLK_LMETA ,
416
417 CFClient::SDLK_RSHIFT,
418 CFClient::SDLK_RCTRL ,
419 CFClient::SDLK_RALT ,
420 CFClient::SDLK_RMETA ,
421);
422
423my %ALLOWED_MODIFIERS = (
424 CFClient::KMOD_LSHIFT => "LSHIFT",
425 CFClient::KMOD_LCTRL => "LCTRL",
426 CFClient::KMOD_LALT => "LALT",
427 CFClient::KMOD_LMETA => "LMETA",
428
429 CFClient::KMOD_RSHIFT => "RSHIFT",
430 CFClient::KMOD_RCTRL => "RCTRL",
431 CFClient::KMOD_RALT => "RALT",
432 CFClient::KMOD_RMETA => "RMETA",
433);
434
435my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
436my @DIRECT_BIND_KEYS = (
437 CFClient::SDLK_F1,
438 CFClient::SDLK_F2,
439 CFClient::SDLK_F3,
440 CFClient::SDLK_F4,
441 CFClient::SDLK_F5,
442 CFClient::SDLK_F6,
443 CFClient::SDLK_F7,
444 CFClient::SDLK_F8,
445 CFClient::SDLK_F9,
446 CFClient::SDLK_F10,
447 CFClient::SDLK_F11,
448 CFClient::SDLK_F12,
449 CFClient::SDLK_F13,
450 CFClient::SDLK_F14,
451 CFClient::SDLK_F15,
452);
453
454# this binding dialog asks for a key-combo to be pressed
455# and if successful it calls the $cb with $mod and $sym as args.
456sub open_binding_dialog {
457 my ($cb) = @_;
458
459 my $w = new CFClient::UI::FancyFrame
460 title => "Bind Action",
461 x => "center",
462 y => "center";
463
464 $w->add (my $vb = new CFClient::UI::VBox);
465 $vb->add (new CFClient::UI::Label
466 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
467 ."You can only bind 0-9 and F1-F15 without modifiers."
468 );
469 $vb->add (my $entry = new CFClient::UI::Entry
470 text => "",
471 on_key_down => sub {
472 my ($entry, $ev) = @_;
473
474 my $mod = $ev->{mod};
475 my $sym = $ev->{sym};
476
477 # XXX: This seems a little bit hackisch to me, but i have to ignore them
478 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
479 return;
480 }
481
482 if ($mod == CFClient::KMOD_NONE
483 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
484 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
485 {
486 $::STATUSBOX->add (
487 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
488 ." directly without modifier! It would damage the completer handling."
489 );
490 return;
491 }
492
493 $entry->grab_focus;
494
495 $cb->($mod, $sym);
496
497 $w->destroy
498 });
499
500 $entry->grab_focus;
501 $w->show;
502}
503
504sub keycombo_to_name {
505 my ($mod, $sym) = @_;
506
507 my $mods = join '+',
508 map { $ALLOWED_MODIFIERS{$_} }
509 grep { ($_ + 0) & ($mod + 0) }
510 keys %ALLOWED_MODIFIERS;
511 $mods .= "+" if $mods ne '';
512
513 return $mods . CFClient::SDL_GetKeyName ($sym);
514}
515
5161; 3841;
517 385
518=back 386=back
519 387
520=head1 AUTHOR 388=head1 AUTHOR

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines