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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines