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.69 by root, Thu May 25 23:06:05 2006 UTC vs.
Revision 1.76 by root, Mon May 29 21:20:15 2006 UTC

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29
30use CFClient::OpenGL;
31
32our %GL_EXT;
33our $GL_VERSION;
34
35our $GL_NPOT;
36our $GL_DEBUG = 1;
37
38sub gl_init {
39 $GL_VERSION = gl_version * 1;
40 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
41
42 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
43 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
44
45 glDisable GL_COLOR_MATERIAL;
46 glShadeModel GL_FLAT;
47 glDisable GL_DITHER;
48 glDisable GL_DEPTH_TEST;
49 glDepthMask 0;
50 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
51
52 CFClient::Texture::restore_state ();
53}
54
55sub gl_check {
56 return unless $GL_DEBUG;
57
58 if (my $error = glGetError) {
59 my ($format, @args) = @_;
60 Carp::cluck sprintf "opengl error %x while $format", $error, @args;
61 }
62}
63 29
64sub find_rcfile($) { 30sub find_rcfile($) {
65 my $path; 31 my $path;
66 32
67 for (grep !ref, @INC) { 33 for (grep !ref, @INC) {
… …
102 } 68 }
103 69
104 close CFG; 70 close CFG;
105} 71}
106 72
107mkdir "$Crossfire::VARDIR/pclient", 0777; 73mkdir "$Crossfire::VARDIR/cfplus", 0777;
108 74
75{
76 use strict;
77
109our $DB_ENV = new BerkeleyDB::Env 78 our $DB_ENV = new BerkeleyDB::Env
110 -Home => "$Crossfire::VARDIR/pclient", 79 -Home => "$Crossfire::VARDIR/cfplus",
111 -Cachesize => 1_000_000, 80 -Cachesize => 1_000_000,
112 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 81 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
113# -ErrPrefix => "DATABASE", 82# -ErrPrefix => "DATABASE",
114 -Verbose => 1, 83 -Verbose => 1,
115 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 84 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
85 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC,
116 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 86 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
87}
117 88
118sub db_table($) { 89sub db_table($) {
119 my ($table) = @_; 90 my ($table) = @_;
120 91
121 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 92 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
122 93
123 new CFClient::Database 94 new CFClient::Database
124 -Env => $DB_ENV, 95 -Env => $DB_ENV,
125 -Filename => $table, 96 -Filename => $table,
126# -Filename => "database", 97# -Filename => "database",
127# -Subname => $table, 98# -Subname => $table,
128 -Property => DB_CHKSUM, 99 -Property => DB_CHKSUM,
129 -Flags => DB_CREATE | DB_UPGRADE, 100 -Flags => DB_CREATE | DB_UPGRADE,
130 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 101 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
131} 102}
132 103
133sub pod_to_pango($) { 104sub pod_to_pango($) {
134 my ($pom) = @_; 105 my ($pom) = @_;
135 106
… …
224 $db->db_put ($key => $data) 195 $db->db_put ($key => $data)
225} 196}
226 197
227package CFClient::Item; 198package CFClient::Item;
228 199
200use strict;
201use Crossfire::Protocol::Constants;
202
229sub desc_string { 203sub desc_string {
230 my ($self) = @_; 204 my ($self) = @_;
231 205
232 my $desc = 206 my $desc =
233 $self->{nrof} < 2 207 $self->{nrof} < 2
234 ? $self->{name} 208 ? $self->{name}
235 : "$self->{nrof} × $self->{name_pl}"; 209 : "$self->{nrof} × $self->{name_pl}";
236 210
237 $self->{flags} & Crossfire::Protocol::F_OPEN 211 $self->{flags} & F_OPEN
238 and $desc .= " (open)"; 212 and $desc .= " (open)";
239 $self->{flags} & Crossfire::Protocol::F_APPLIED 213 $self->{flags} & F_APPLIED
240 and $desc .= " (applied)"; 214 and $desc .= " (applied)";
241 $self->{flags} & Crossfire::Protocol::F_UNPAID 215 $self->{flags} & F_UNPAID
242 and $desc .= " (unpaid)"; 216 and $desc .= " (unpaid)";
243 $self->{flags} & Crossfire::Protocol::F_MAGIC 217 $self->{flags} & F_MAGIC
244 and $desc .= " (magic)"; 218 and $desc .= " (magic)";
245 $self->{flags} & Crossfire::Protocol::F_CURSED 219 $self->{flags} & F_CURSED
246 and $desc .= " (cursed)"; 220 and $desc .= " (cursed)";
247 $self->{flags} & Crossfire::Protocol::F_DAMNED 221 $self->{flags} & F_DAMNED
248 and $desc .= " (damned)"; 222 and $desc .= " (damned)";
249 $self->{flags} & Crossfire::Protocol::F_LOCKED 223 $self->{flags} & F_LOCKED
250 and $desc .= " *"; 224 and $desc .= " *";
251 225
252 $desc 226 $desc
253} 227}
254 228
… …
282 my @menu_items = ( 256 my @menu_items = (
283 ["examine", sub { $::CONN->send ("examine $self->{tag}") }], 257 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
284 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 258 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
285 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 259 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
286 ( 260 (
287 $self->{flags} & Crossfire::Protocol::F_LOCKED 261 $self->{flags} & F_LOCKED
288 ? ( 262 ? (
289 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 263 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
290 ) 264 )
291 : ( 265 : (
292 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 266 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
… …
311 $self->{face_widget} ||= new CFClient::UI::Face 285 $self->{face_widget} ||= new CFClient::UI::Face
312 can_events => 1, 286 can_events => 1,
313 can_hover => 1, 287 can_hover => 1,
314 anim => $self->{anim}, 288 anim => $self->{anim},
315 animspeed => $self->{animspeed}, # TODO# must be set at creation time 289 animspeed => $self->{animspeed}, # TODO# must be set at creation time
316 connect_button_down => $button_cb, 290 on_button_down => $button_cb,
317 ; 291 ;
318 $self->{face_widget}{face} = $self->{face}; 292 $self->{face_widget}{face} = $self->{face};
319 $self->{face_widget}{anim} = $self->{anim}; 293 $self->{face_widget}{anim} = $self->{anim};
320 $self->{face_widget}{animspeed} = $self->{animspeed}; 294 $self->{face_widget}{animspeed} = $self->{animspeed};
321 $self->{face_widget}->set_tooltip ( 295 $self->{face_widget}->set_tooltip (
… …
328 $self->{desc_widget} ||= new CFClient::UI::Label 302 $self->{desc_widget} ||= new CFClient::UI::Label
329 can_events => 1, 303 can_events => 1,
330 can_hover => 1, 304 can_hover => 1,
331 ellipsise => 2, 305 ellipsise => 2,
332 align => -1, 306 align => -1,
333 connect_button_down => $button_cb, 307 on_button_down => $button_cb,
334 ; 308 ;
335 my $desc = CFClient::Item::desc_string $self; 309 my $desc = CFClient::Item::desc_string $self;
336 $self->{desc_widget}->set_text ($desc); 310 $self->{desc_widget}->set_text ($desc);
337 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 311 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
338 312
339 $self->{weight_widget} ||= new CFClient::UI::Label 313 $self->{weight_widget} ||= new CFClient::UI::Label
340 can_events => 1, 314 can_events => 1,
341 can_hover => 1, 315 can_hover => 1,
342 ellipsise => 0, 316 ellipsise => 0,
343 align => 0, 317 align => 0,
344 connect_button_down => $button_cb, 318 on_button_down => $button_cb,
345 ; 319 ;
346 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 320 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
347 321
348 $self->{weight_widget}->set_tooltip ( 322 $self->{weight_widget}->set_tooltip (
349 "<b>Weight</b>.\n" 323 "<b>Weight</b>.\n"
… …
351 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 325 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
352 . "\n\n$tooltip_std" 326 . "\n\n$tooltip_std"
353 ); 327 );
354} 328}
355 329
356package CFClient::Texture; 330package CFClient::Recorder;
357 331
358use strict; 332our $RECORD_WINDOW;
359 333
360use Scalar::Util; 334my $CMDBOX;
335my $CURRENT_CMDS;
336my $REC_BTN;
361 337
362use CFClient::OpenGL; 338my @ALLOWED_MODIFIER_KEYS = (
339 (CFClient::SDLK_LSHIFT) => "LSHIFT",
340 (CFClient::SDLK_LCTRL ) => "LCTRL",
341 (CFClient::SDLK_LALT ) => "LALT",
342 (CFClient::SDLK_LMETA ) => "LMETA",
363 343
364my %TEXTURES; 344 (CFClient::SDLK_RSHIFT) => "RSHIFT",
345 (CFClient::SDLK_RCTRL ) => "RCTRL",
346 (CFClient::SDLK_RALT ) => "RALT",
347 (CFClient::SDLK_RMETA ) => "RMETA",
348);
365 349
366sub new { 350my %ALLOWED_MODIFIERS = (
351 (CFClient::KMOD_LSHIFT) => "LSHIFT",
352 (CFClient::KMOD_LCTRL ) => "LCTRL",
353 (CFClient::KMOD_LALT ) => "LALT",
354 (CFClient::KMOD_LMETA ) => "LMETA",
355
356 (CFClient::KMOD_RSHIFT) => "RSHIFT",
357 (CFClient::KMOD_RCTRL ) => "RCTRL",
358 (CFClient::KMOD_RALT ) => "RALT",
359 (CFClient::KMOD_RMETA ) => "RMETA",
360);
361
362my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
363my @DIRECT_BIND_KEYS = (
364 CFClient::SDLK_F1,
365 CFClient::SDLK_F2,
366 CFClient::SDLK_F3,
367 CFClient::SDLK_F4,
368 CFClient::SDLK_F5,
369 CFClient::SDLK_F6,
370 CFClient::SDLK_F7,
371 CFClient::SDLK_F8,
372 CFClient::SDLK_F9,
373 CFClient::SDLK_F10,
374 CFClient::SDLK_F11,
375 CFClient::SDLK_F12,
376 CFClient::SDLK_F13,
377 CFClient::SDLK_F14,
378 CFClient::SDLK_F15,
379);
380
381# this binding dialog asks for a key-combo to be pressed
382# and if successful it binds the modifier+symbol to the
383# supplied actions in $cmd.
384# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
385sub open_binding_dialog {
367 my ($class, %data) = @_; 386 my ($cmd) = @_;
368 387
369 my $self = bless { 388 my $w = new CFClient::UI::FancyFrame
370 internalformat => GL_RGBA, 389 title => "Bind Action";
371 format => GL_RGBA,
372 type => GL_UNSIGNED_BYTE,
373 %data,
374 }, $class;
375 390
376 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 391 $w->add (my $vb = new CFClient::UI::VBox);
377 392 $vb->add (new CFClient::UI::Label
378 $self->upload; 393 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
379 394 ."You can only bind 0-9 and F1-F15 without modifiers."
380 $self
381}
382
383sub new_from_image {
384 my ($class, $image, %arg) = @_;
385
386 $class->new (image => $image, %arg)
387}
388
389sub new_from_file {
390 my ($class, $path, %arg) = @_;
391
392 open my $fh, "<:raw", $path
393 or die "$path: $!";
394
395 local $/;
396 $class->new_from_image (<$fh>, %arg)
397}
398
399#sub new_from_surface {
400# my ($class, $surface) = @_;
401#
402# $surface->rgba;
403#
404# $class->new (
405# data => $surface->pixels,
406# w => $surface->width,
407# h => $surface->height,
408# )
409#}
410
411sub new_from_layout {
412 my ($class, $layout, %arg) = @_;
413
414 my ($w, $h, $data, $format, $internalformat) = $layout->render;
415
416 $class->new (
417 w => $w,
418 h => $h,
419 data => $data,
420 format => $format,
421 internalformat => $format,
422 type => GL_UNSIGNED_BYTE,
423 %arg,
424 ) 395 );
425} 396 $vb->add (my $entry = new CFClient::UI::Entry
397 text => "",
398 on_key_down => sub {
399 my ($entry, $ev) = @_;
426 400
427sub new_from_opengl { 401 my $mod = $ev->{mod};
428 my ($class, $w, $h, $cb) = @_; 402 my $sym = $ev->{sym};
429 403
430 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) 404 # XXX: This seems a little bit hackisch to me, but i have to ignore them
431} 405 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
406 return;
407 }
432 408
433sub topot { 409 if ($mod == CFClient::KMOD_NONE
434 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 410 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
435} 411 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
412 {
413 $::STATUSBOX->add (
414 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
415 ." directly without modifier! It would damage the completer handling."
416 );
417 return;
418 }
436 419
437sub upload { 420 $entry->focus_out;
421
422 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
423 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
424
425 $w->destroy
426 });
427
428 $entry->focus_in;
429 $w->center;
430 $w->show;
431}
432
433sub keycombo_to_name {
434 my ($mod, $sym) = @_;
435
436 my $mods = join '+',
437 map { $ALLOWED_MODIFIERS{$_} }
438 grep { $_ & $mod }
439 keys %ALLOWED_MODIFIERS;
440 $mods .= "+" if $mods ne '';
441
442 return $mods . CFClient::SDL_GetKeyName ($sym);
443}
444
445sub clear_command_list {
446 $CMDBOX->clear () if $CMDBOX;
447}
448
449sub set_command_list {
438 my ($self) = @_; 450 my ($list) = @_;
439 451
440 return unless $GL_VERSION; 452 return unless $CMDBOX;
441 453
442 my $data; 454 $CMDBOX->clear ();
455 $CURRENT_CMDS = $list;
443 456
444 if (exists $self->{data}) { 457 my $idx = 0;
445 $data = $self->{data};
446 458
447 } elsif (exists $self->{render_cb}) { 459 for (@$list) {
448 glViewport 0, 0, $self->{w}, $self->{h}; 460 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
449 glMatrixMode GL_PROJECTION;
450 glLoadIdentity;
451 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
452 glMatrixMode GL_MODELVIEW;
453 glLoadIdentity;
454 $self->{render_cb}->($self, $self->{w}, $self->{h});
455 461
456 } else { 462 my $i = $idx;
457 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 463 $hb->add (new CFClient::UI::Button
458 = CFClient::load_image_inline $self->{image}; 464 text => "delete",
465 tooltip => "Deletes the action from the record",
466 on_activate => sub {
467 $CMDBOX->remove ($hb);
468 $list->[$i] = undef;
469 });
470
471 $hb->add (new CFClient::UI::Label text => $_);
472
473 $idx++
459 } 474 }
475}
460 476
461 my ($tw, $th) = @$self{qw(w h)}; 477# if $show is 1 the recorder will be shown
478sub start {
479 my ($show) = @_;
462 480
463 unless ($tw > 0 && $th > 0) { 481 $RECORD_WINDOW->show if $show;
464 $tw = $th = 1; 482
465 $data = "\x00" x 64; 483 $REC_BTN->set_text ("stop recording");
484 $REC_BTN->{recording} = 1;
485 clear_command_list;
486 $::CONN->start_record;
487}
488
489# if $autobind is 1 the recorder will be automatically
490# jump into the binding query and hide the recorder window
491sub stop {
492 my ($autobind) = @_;
493
494 $REC_BTN->set_text ("start recording");
495 $REC_BTN->{recording} = 0;
496
497 my $rec = $::CONN->stop_record;
498 return unless ref $rec eq 'ARRAY';
499 set_command_list ($rec);
500
501 if ($autobind) {
502 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
503 $RECORD_WINDOW->hide;
466 } 504 }
505}
467 506
468 $self->{minified} = [CFClient::average $tw, $th, $data] 507sub make_window {
469 if $self->{minify}; 508 $RECORD_WINDOW = new CFClient::UI::FancyFrame
509 req_y => 1,
510 req_x => -1,
511 title => "Action Recorder";
470 512
471 unless ($GL_NPOT) { 513 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
472 # TODO: does not work for zero-sized textures 514 $vb->add ($REC_BTN = new CFClient::UI::Button
473 $tw = topot $tw; 515 text => "start recording",
474 $th = topot $th; 516 tooltip => "Start/Stops recording of actions."
517 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
518 ."All subsequent actions after the recording started will be captured."
519 ."The actions are displayed after the record was stopped."
520 ."To bind the action you have to click on the 'Bind' button",
521 on_activate => sub {
522 my ($btn) = @_;
475 523
476 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 524 unless ($btn->{recording}) {
477 my $bpp = (length $data) / ($self->{w} * $self->{h}); 525 start;
478 $data = pack "(a" . ($tw * $bpp) . ")*", 526 } else {
479 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 527 stop;
480 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 528 }
481 } 529 });
482 } 530 $vb->add ($CMDBOX = new CFClient::UI::VBox);
531 $vb->add (new CFClient::UI::Button
532 text => "bind",
533 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
534 on_activate => sub {
535 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
536 });
483 537
484 $self->{s} = $self->{w} / $tw; 538 $RECORD_WINDOW
485 $self->{t} = $self->{h} / $th;
486
487 $self->{name} ||= glGenTexture;
488
489 glBindTexture GL_TEXTURE_2D, $self->{name};
490
491 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
493
494 if ($::FAST) {
495 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
496 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
497 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
498 # alternatively check for 0x8191
499 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
500 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
501 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
502 } else {
503 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
504 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
505 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
506 }
507
508 glGetError;
509
510 if (defined $data) {
511 glTexImage2D GL_TEXTURE_2D, 0,
512 $self->{internalformat},
513 $tw, $th,
514 0,
515 $self->{format},
516 $self->{type},
517 $data;
518 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
519 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
520 } else {
521 glCopyTexImage2D GL_TEXTURE_2D, 0,
522 $self->{internalformat},
523 0, 0,
524 $tw, $th,
525 0;
526 CFClient::gl_check "copying to texture %dx%d if=%x",
527 $tw, $th, $self->{internalformat};
528 }
529
530 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
531}
532
533sub DESTROY {
534 my ($self) = @_;
535
536 delete $TEXTURES{$self+0};
537
538 glDeleteTexture delete $self->{name}
539 if $self->{name};
540}
541
542sub restore_state {
543 $_->upload
544 for values %TEXTURES;
545} 539}
546 540
5471; 5411;
548 542
549=back 543=back

Diff Legend

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