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.58 by root, Tue May 23 00:26:17 2006 UTC vs.
Revision 1.95 by root, Sun Jul 2 13:57:57 2006 UTC

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

Diff Legend

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