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.91 by root, Wed Jun 7 06:28:28 2006 UTC vs.
Revision 1.215 by root, Wed Jan 18 13:42:19 2012 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3DC - undocumented utility garbage for our deliantra client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use DC;
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 DC;
16
17use Carp ();
18
19our $VERSION;
16 20
17BEGIN { 21BEGIN {
18 $VERSION = '0.1'; 22 $VERSION = '3.0';
19 23
20 use XSLoader; 24 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
22} 26}
23 27
24use utf8; 28use utf8;
29use strict qw(vars subs);
25 30
26use Carp (); 31use Socket ();
27use AnyEvent (); 32use AnyEvent ();
28use BerkeleyDB; 33use AnyEvent::Util ();
29use Pod::POM (); 34use Pod::POM ();
35use File::Path ();
30use Storable (); # finally 36use Storable (); # finally
37use Fcntl ();
38use JSON::XS qw(encode_json decode_json);
39use Guard qw(guard);
31 40
32package CFClient::PodToPango; 41# modules to support other DC::* packages
42use List::Util ();
43use IO::AIO ();
44use Coro::AIO ();
45use AnyEvent::AIO ();
33 46
34use base Pod::POM::View::Text; 47use Deliantra::Protocol::Constants ();
35 48
36our $VERSION = 1; # bump if resultant formatting changes 49=item shorten $string[, $maxlength]
37 50
38our $indent = 0; 51=cut
39 52
40*view_seq_code = 53sub shorten($;$) {
41*view_seq_bold = sub { "<b>$_[1]</b>" }; 54 my ($str, $len) = @_;
42*view_seq_italic = sub { "<i>$_[1]</i>" }; 55 substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
43*view_seq_space = 56 $str
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} 57}
52 58
53sub view_item { 59sub asxml($) {
54 ("\t" x ($indent / 4)) 60 local $_ = $_[0];
55 . $_[1]->title->present ($_[0])
56 . "\n\n"
57 . $_[1]->content->present ($_[0])
58}
59 61
60sub view_verbatim { 62 s/&/&amp;/g;
61 (join "", 63 s/>/&gt;/g;
62 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n", 64 s/</&lt;/g;
63 split /\n/, CFClient::UI::Label::escape ($_[1]))
64 . "\n"
65}
66 65
67sub view_textblock { 66 $_
68 ("\t" x ($indent / 2)) . "$_[1]\n\n"
69} 67}
70 68
71sub view_head1 { 69sub background(&;&) {
72 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 70 my ($bg, $cb) = @_;
73 . $_[1]->content->present ($_[0])
74};
75 71
76sub view_head2 { 72 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
77 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 73 or die "unable to create background socketpair: $!";
78 . $_[1]->content->present ($_[0])
79};
80 74
81sub view_head3 { 75 my $pid = fork;
82 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
83 . $_[1]->content->present ($_[0])
84};
85 76
86sub view_over { 77 if (defined $pid && !$pid) {
87 local $indent = $indent + $_[1]->indent; 78 local $SIG{__DIE__};
88 $_[1]->content->present ($_[0])
89}
90 79
91package CFClient::Database; 80 open STDOUT, ">&", $fh_w;
81 open STDERR, ">&", $fh_w;
82 close $fh_r;
83 close $fh_w;
92 84
93our @ISA = BerkeleyDB::Btree::; 85 $| = 1;
94 86
95sub get($$) { 87 eval { $bg->() };
96 my $data;
97 88
98 $_[0]->db_get ($_[1], $data) == 0 89 if ($@) {
99 ? $data 90 my $msg = $@;
100 : () 91 $msg =~ s/\n+/\n/;
101} 92 warn "FATAL: $msg";
93 DC::_exit 1;
94 }
102 95
103my %DB_SYNC; 96 # win32 is fucked up, of course. exit will clean stuff up,
97 # which destroys our database etc. _exit will exit ALL
98 # forked processes, because of the dreaded fork emulation.
99 DC::_exit 0;
100 }
104 101
105sub put($$$) { 102 close $fh_w;
106 my ($db, $key, $data) = @_;
107 103
108 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 104 my $buffer;
109 105
110 $db->db_put ($key => $data) 106 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
111} 107 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
108 undef $w;
109 $cb->();
110 return;
111 }
112 112
113package CFClient; 113 while ($buffer =~ s/^(.*)\n//) {
114 my $line = $1;
115 $line =~ s/\s+$//;
116 utf8::decode $line;
117 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
118 $cb->(JSON::XS->new->allow_nonref->decode ($1));
119 } else {
120 ::message ({
121 markup => "background($pid): " . DC::asxml $line,
122 });
123 }
124 }
125 });
126}
127
128sub background_msg {
129 my ($msg) = @_;
130
131 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
132 $msg =~ s/\n//g;
133 utf8::encode $msg;
134 print $msg, "\n";
135}
136
137package DC;
138
139our $RC_THEME;
140our %THEME;
141our @RC_PATH;
142our $RC_BASE;
143
144for (grep !ref, @INC) {
145 $RC_BASE = "$_/Deliantra/Client/private/resources";
146 last if -d $RC_BASE;
147}
114 148
115sub find_rcfile($) { 149sub find_rcfile($) {
116 my $path; 150 my $path;
117 151
118 for (grep !ref, @INC) { 152 for (@RC_PATH, "") {
119 $path = "$_/CFClient/resources/$_[0]"; 153 $path = "$RC_BASE/$_/$_[0]";
120 return $path if -r $path; 154 return $path if -e $path;
121 } 155 }
122 156
123 die "FATAL: can't find required file $_[0]\n"; 157 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
124} 158}
125 159
126sub read_cfg { 160sub load_json($) {
127 my ($file) = @_; 161 my ($file) = @_;
128 162
129 open CFG, $file 163 open my $fh, $file
130 or return; 164 or return;
131 165
132 my $CFG;
133
134 local $/; 166 local $/;
135 $CFG = eval <CFG>; 167 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
136
137 $::CFG = $CFG;
138
139 close CFG;
140} 168}
141 169
170sub set_theme($) {
171 return if $RC_THEME eq $_[0];
172 $RC_THEME = $_[0];
173
174 # kind of hacky, find the main theme file, then load all theme files and merge them
175
176 %THEME = ();
177 @RC_PATH = "theme-$RC_THEME";
178
179 my $theme = load_json find_rcfile "theme.json"
180 or die "FATAL: theme resource file not found";
181
182 @RC_PATH = @{ $theme->{path} } if $theme->{path};
183
184 for (@RC_PATH, "") {
185 my $theme = load_json "$RC_BASE/$_/theme.json"
186 or next;
187
188 %THEME = ( %$theme, %THEME );
189 }
190}
191
142sub write_cfg { 192sub read_cfg($) {
143 my ($file) = @_; 193 my ($file) = @_;
144 194
145 open CFG, ">$file" 195 $::CFG = (load_json $file) || (load_json "$file.bak");
196}
197
198sub write_cfg($) {
199 my $file = "$Deliantra::VARDIR/client.cf";
200
201 $::CFG->{VERSION} = $::VERSION;
202 $::CFG->{layout} = DC::UI::get_layout ();
203
204 open my $fh, ">:utf8", "$file~"
146 or return; 205 or return;
147 206 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
148 {
149 require Data::Dumper;
150 local $Data::Dumper::Purity = 1;
151 $::CFG->{VERSION} = $::VERSION;
152 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
153 }
154
155 close CFG; 207 close $fh;
156}
157 208
158our $DB_ENV; 209 rename $file, "$file.bak";
159 210 rename "$file~", $file;
160{
161 use strict;
162
163 mkdir "$Crossfire::VARDIR/cfplus", 0777;
164 my $recover = $BerkeleyDB::db_version >= 4.4
165 ? eval "DB_REGISTER | DB_RECOVER"
166 : 0;
167
168 $DB_ENV = new BerkeleyDB::Env
169 -Home => "$Crossfire::VARDIR/cfplus",
170 -Cachesize => 1_000_000,
171 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
172# -ErrPrefix => "DATABASE",
173 -Verbose => 1,
174 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
175 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
176 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
177} 211}
178 212
179sub db_table($) { 213sub load_cfg() {
180 my ($table) = @_; 214 if (-e "$Deliantra::VARDIR/client.cf") {
181 215 DC::read_cfg "$Deliantra::VARDIR/client.cf";
182 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 216 } else {
183 217 $::CFG = {};
184 new CFClient::Database
185 -Env => $DB_ENV,
186 -Filename => $table,
187# -Filename => "database",
188# -Subname => $table,
189 -Property => DB_CHKSUM,
190 -Flags => DB_CREATE | DB_UPGRADE,
191 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
192}
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 }; 218 }
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} 219}
223 220
224sub pod_to_pango($) { 221sub save_cfg() {
225 my ($pom) = @_; 222 write_cfg "$Deliantra::VARDIR/client.cf";
226
227 $pom->present ("CFClient::PodToPango")
228} 223}
229 224
230sub pod_to_pango_list($) { 225sub upgrade_cfg() {
231 my ($pom) = @_; 226 my %DEF_CFG = (
232 227 config_autosave => 1,
233 [ 228 sdl_mode => undef,
234 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], 229 fullscreen => 1,
235 split /\n/, $pom->present ("CFClient::PodToPango") 230 fast => 0,
236 ] 231 force_opengl11 => undef,
237} 232 disable_alpha => 0,
238 233 smooth_movement => 1,
239package CFClient::Item; 234 smooth_transitions => 1,
240 235 texture_compression => 1,
241use strict; 236 map_scale => 1,
242use Crossfire::Protocol::Constants; 237 fow_enable => 1,
243 238 fow_intensity => 0,
244my $last_enter_count = 1; 239 fow_texture => 0,
245 240 map_smoothing => 1,
246sub desc_string { 241 gui_fontsize => 1,
247 my ($self) = @_; 242 log_fontsize => 0.7,
248 243 gauge_fontsize => 1,
249 my $desc = 244 gauge_size => 0.35,
250 $self->{nrof} < 2 245 stat_fontsize => 0.7,
251 ? $self->{name} 246 mapsize => 100,
252 : "$self->{nrof} × $self->{name_pl}"; 247 audio_enable => 1,
253 248 audio_hw_channels => 0,
254 $self->{flags} & F_OPEN 249 audio_hw_frequency => 0,
255 and $desc .= " (open)"; 250 audio_hw_chunksize => 0,
256 $self->{flags} & F_APPLIED 251 audio_mix_channels => 8,
257 and $desc .= " (applied)"; 252 effects_enable => 1,
258 $self->{flags} & F_UNPAID 253 effects_volume => 1,
259 and $desc .= " (unpaid)"; 254 bgm_enable => 1,
260 $self->{flags} & F_MAGIC 255 bgm_volume => 0.5,
261 and $desc .= " (magic)"; 256 output_rate => "",
262 $self->{flags} & F_CURSED 257 pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
263 and $desc .= " (cursed)"; 258 | Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
264 $self->{flags} & F_DAMNED 259 | Deliantra::Protocol::Constants::PICKUP_VALUABLES,
265 and $desc .= " (damned)"; 260 inv_sort => "mtime",
266 $self->{flags} & F_LOCKED 261 default => "profile", # default profile
267 and $desc .= " *"; 262 show_tips => 1,
268 263 logview_max_par => 1000,
269 $desc 264 shift_fire_stop => 0,
270} 265 uitheme => "wood",
271 266 map_shift_x => -24, # arbitrary
272sub weight_string { 267 map_shift_y => +24, # arbitrary
273 my ($self) = @_; 268 #db_schema => 0,
274
275 my $weight = ($self->{nrof} || 1) * $self->{weight};
276
277 $weight < 0 ? "?" : $weight * 0.001
278}
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 ); 269 );
296 $entry->focus_in;
297 $w->show;
298 270
299} 271 while (my ($k, $v) = each %DEF_CFG) {
300 272 $::CFG->{$k} = $v unless exists $::CFG->{$k};
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
350 }; 273 }
274}
351 275
352 my $tooltip_std = "<small>" 276sub http_proxy {
353 . "Left click - examine item\n" 277 my @proxy = win32_proxy_info;
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";
359 278
360 $self->{face_widget} ||= new CFClient::UI::Face 279 if (@proxy) {
361 can_events => 1, 280 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
362 can_hover => 1, 281 } elsif (exists $ENV{http_proxy}) {
363 anim => $self->{anim}, 282 $ENV{http_proxy}
364 animspeed => $self->{animspeed}, # TODO# must be set at creation time 283 } else {
365 on_button_down => $button_cb, 284 ()
285 }
286}
287
288sub set_proxy {
289 my $proxy = http_proxy
290 or return;
291
292 $ENV{http_proxy} = $proxy;
293}
294
295sub lwp_useragent {
296 require LWP::UserAgent;
366 ; 297
367 $self->{face_widget}{face} = $self->{face}; 298 DC::set_proxy;
368 $self->{face_widget}{anim} = $self->{anim}; 299
369 $self->{face_widget}{animspeed} = $self->{animspeed}; 300 my $ua = LWP::UserAgent->new (
370 $self->{face_widget}->set_tooltip ( 301 agent => "deliantra $VERSION",
371 "<b>Face/Animation.</b>\n" 302 keep_alive => 1,
372 . "Item uses face #$self->{face}. " 303 env_proxy => 1,
373 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 304 timeout => 30,
374 . "\n\n$tooltip_std"
375 ); 305 );
376
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");
387
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} 306}
404 307
405package CFClient::Binder; 308sub lwp_check($) {
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) = @_; 309 my ($res) = @_;
454 310
455 my $w = new CFClient::UI::FancyFrame 311 $res->is_error
456 title => "Bind Action", 312 and die $res->status_line;
457 x => "center",
458 y => "center";
459 313
460 $w->add (my $vb = new CFClient::UI::VBox); 314 $res
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
494 });
495
496 $entry->focus_in;
497 $w->show;
498} 315}
499 316
500sub keycombo_to_name { 317sub fh_nonblocking($$) {
501 my ($mod, $sym) = @_; 318 my ($fh, $nb) = @_;
502 319
503 my $mods = join '+', 320 if ($^O eq "MSWin32") {
504 map { $ALLOWED_MODIFIERS{$_} } 321 $nb = (! ! $nb) + 0;
505 grep { ($_ + 0) & ($mod + 0) } 322 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
506 keys %ALLOWED_MODIFIERS; 323 } else {
507 $mods .= "+" if $mods ne ''; 324 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
508 325 }
509 return $mods . CFClient::SDL_GetKeyName ($sym);
510} 326}
327
328package DC::Layout;
329
330$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
331 glyph_cache_restore;
332};
333
334$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
335 glyph_cache_backup;
336};
511 337
5121; 3381;
513 339
514=back 340=back
515 341

Diff Legend

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