ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.116 by root, Sun Apr 16 07:25:30 2006 UTC vs.
Revision 1.135 by root, Tue Apr 18 06:26:55 2006 UTC

… …
8 8
9use SDL; 9use SDL;
10use SDL::App; 10use SDL::App;
11use SDL::Event; 11use SDL::Event;
12use SDL::Surface; 12use SDL::Surface;
13
14use SDL::Mixer;
15use SDL::Sound;
16use SDL::Music;
17
13use SDL::OpenGL; 18use SDL::OpenGL;
14 19
15use Crossfire; 20use Crossfire;
16use Crossfire::Protocol; 21use Crossfire::Protocol;
17 22
… …
49our $BUTTONBAR; 54our $BUTTONBAR;
50our $LOGVIEW; 55our $LOGVIEW;
51our $CONSOLE; 56our $CONSOLE;
52our $METASERVER; 57our $METASERVER;
53 58
59our $GAUGES;
60
54our $SDL_ACTIVE; 61our $SDL_ACTIVE;
55our $SDL_EV; 62our $SDL_EV;
56our %SDL_CB; 63our %SDL_CB;
57 64
65our $SDL_MIXER;
66our @SOUNDS; # event => file mapping
67our %AUDIO_CHUNKS; # audio files
68
58our $ALT_ENTER_MESSAGE; 69our $ALT_ENTER_MESSAGE;
59our $STATUS_LINE; 70our $STATUS_LINE;
60our $DEBUG_STATUS; 71our $DEBUG_STATUS;
61 72
62sub status { 73sub status {
63 $STATUS_LINE->set_text ($_[0]); 74 $STATUS_LINE->set_text ($_[0]);
64 my ($w, $h) = $STATUS_LINE->size_request;
65 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 75 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
66} 76}
67 77
68sub debug { 78sub debug {
69 $DEBUG_STATUS->set_text ($_[0]); 79 $DEBUG_STATUS->set_text ($_[0]);
70 my ($w, $h) = $DEBUG_STATUS->size_request; 80 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72} 81}
73 82
74sub start_game { 83sub start_game {
75 status "logging in..."; 84 status "logging in...";
76 85
… …
146 155
147 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth"); 156 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
148 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 157 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
149 my ($self, $value) = @_; 158 my ($self, $value) = @_;
150 $CFG->{fow_smooth} = $value; 159 $CFG->{fow_smooth} = $value;
160 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
151 }); 161 });
152 162
153 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize"); 163 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
154 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub { 164 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
155 my ($self, $value) = @_; 165 my ($self, $value) = @_;
156 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value); 166 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
157 }); 167 });
158 168
159 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 169 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
160 destroy_screen (); 170 video_shutdown ();
161 init_screen (); 171 video_init ();
162 }); 172 });
163 173
164 $dialog 174 $dialog
165} 175}
166 176
… …
300 310
301sub message_window { 311sub message_window {
302 my $window = new CFClient::UI::FancyFrame 312 my $window = new CFClient::UI::FancyFrame
303 border_bg => [1, 1, 1, 0.5], 313 border_bg => [1, 1, 1, 0.5],
304 bg => [0.3, 0.3, 0.3, 0.8], 314 bg => [0.3, 0.3, 0.3, 0.8],
305 user_w => $::WIDTH/4, 315 user_w => int $::WIDTH / 3,
306 user_h => $::HEIGHT, 316 user_h => int $::HEIGHT / 5,
307 child => (my $vbox = new CFClient::UI::VBox); 317 child => (my $vbox = new CFClient::UI::VBox);
308 318
309 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 319 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
310 expand => 1, 320 expand => 1,
311 fontsize => $::CFG->{log_fontsize}, 321 fontsize => $::CFG->{log_fontsize},
312 ); 322 );
313 323
314 $vbox->add (my $input = new CFClient::UI::LineEntry 324 $vbox->add (my $input = new CFClient::UI::Entry
325 connect_focus_in => sub {
326 my ($input, $prev_focus) = @_;
327
328 delete $input->{refocus_map};
329
330 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
331 $input->{refocus_map} = 1;
332 }
333 delete $input->{auto_activated};
334 },
315 connect_activate => sub { 335 connect_activate => sub {
316 my ($input, $text) = @_; 336 my ($input, $text) = @_;
317 $input->set_text (''); 337 $input->set_text ('');
318 338
319 if ($text =~ /^\/(.*)/) { 339 if ($text =~ /^\/(.*)/) {
320 $::CONN->user_send ("command $1"); 340 $::CONN->user_send ($1);
321 } else { 341 } else {
322 my $say_cmd = $::CFG->{say_command} || 'say'; 342 my $say_cmd = $::CFG->{say_command} || 'say';
323 $::CONN->user_send ("command $say_cmd $text"); 343 $::CONN->user_send ("$say_cmd $text");
344 }
345 if ($input->{refocus_map}) {
346 delete $input->{refocus_map};
347 $MAPWIDGET->focus_in
324 } 348 }
325 }, 349 },
326 connect_escape => sub { 350 connect_escape => sub {
327 $MAPWIDGET->focus_in 351 $MAPWIDGET->focus_in
328 }, 352 },
… …
340 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE 364 #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
341 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO 365 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
342 and die "SDL::Init failed!\n"; 366 and die "SDL::Init failed!\n";
343} 367}
344 368
345sub init_screen { 369sub video_init {
346 sdl_init; 370 sdl_init;
347 371
348 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 372 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
349 $FULLSCREEN = $CFG->{fullscreen}; 373 $FULLSCREEN = $CFG->{fullscreen};
350 $FAST = $CFG->{fast}; 374 $FAST = $CFG->{fast};
… …
390 padding => 0, 414 padding => 0,
391 y => $HEIGHT * 44 / 45 - $FONTSIZE; 415 y => $HEIGHT * 44 / 45 - $FONTSIZE;
392 $CFClient::UI::ROOT->add ($STATUS_LINE); 416 $CFClient::UI::ROOT->add ($STATUS_LINE);
393 417
394 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 418 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
395 padding => 0, 419 padding => 0,
396 y => $HEIGHT * 44 / 45, 420 y => $HEIGHT * 44 / 45,
397 height => $HEIGHT / 45, 421 fontsize => $HEIGHT / 45,
398 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 422 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
399 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE); 423 $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
400 424
401 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget); 425 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
402 $MAPWIDGET->focus_in; 426 $MAPWIDGET->focus_in;
403 $MAPWIDGET->connect (activate_console => sub { 427 $MAPWIDGET->connect (activate_console => sub {
404 my ($mapwidget, $preset) = @_; 428 my ($mapwidget, $preset) = @_;
405 429
406 if ($CONSOLE) { 430 if ($CONSOLE) {
431 $CONSOLE->{input}->{auto_activated} = 1;
407 $CONSOLE->{input}->focus_in; 432 $CONSOLE->{input}->focus_in;
408 433
409 if ($preset && $CONSOLE->{input}->get_text eq '') { 434 if ($preset && $CONSOLE->{input}->get_text eq '') {
410 $CONSOLE->{input}->set_text ($preset); 435 $CONSOLE->{input}->set_text ($preset);
411 } 436 }
… …
421 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 446 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
422 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 447 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
423 status "Configuration Saved"; 448 status "Configuration Saved";
424 }); 449 });
425 450
426 $BUTTONBAR->{children}[0]->emit ("activate"); 451 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
427}
428 452
429sub destroy_screen { 453 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
454 $tgw->add (my $hbox = new CFClient::UI::HBox ());
455
456 $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
457 $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
458 $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
459 $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
460
461 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
462 $CFClient::UI::ROOT->add ($tgw);
463}
464
465sub video_shutdown {
430 $CFClient::UI::ROOT->{children} = []; 466 $CFClient::UI::ROOT->{children} = [];
431 undef $SDL_ACTIVE; 467 undef $SDL_ACTIVE;
432 undef $SDL_EV; 468 undef $SDL_EV;
433 SDL::Quit; 469}
470
471my $bgmusic;#TODO#hack#d#
472
473sub audio_init {
474 if ($CFG->{sound} || 1) {
475 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
476 $SDL_MIXER = new SDL::Mixer;
477 $SDL_MIXER->allocate_channels (8);
478
479 $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
480 $SDL_MIXER->play_music ($bgmusic, 0);
481
482 while (<$fh>) {
483 next if /^\s*#/;
484 next if /^\s*$/;
485
486 my ($file, $volume, $event) = split /\s+/, $_, 3;
487
488 push @SOUNDS, "$volume,$file";
489
490 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
491 my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
492 $chunk->volume ($volume * 128 / 100);
493 $chunk
494 };
495 }
496 } else {
497 status "unable to open sound config: $!";
498 }
499 }
500}
501
502sub audio_shutdown {
503 undef $SDL_MIXER;
504 @SOUNDS = ();
505 %AUDIO_CHUNKS = ();
434} 506}
435 507
436my %animate_object; 508my %animate_object;
437my $animate_timer; 509my $animate_timer;
438 510
… …
487 delete $animate_object{$widget}; 559 delete $animate_object{$widget};
488} 560}
489 561
490@conn::ISA = Crossfire::Protocol::; 562@conn::ISA = Crossfire::Protocol::;
491 563
564sub conn::stats_update {
565 my ($self, $stats) = @_;
566
567 # i love text protocols!!!
568 # FIXME: the stats are somehow weird
569 my $hp = $stats->{1};
570 my $hp_m = $stats->{2};
571 my $sp = $stats->{3};
572 my $sp_m = $stats->{4};
573 my $fo = $stats->{18};
574 my $fo_m = 1000;
575 my $gr = $stats->{23};
576 my $gr_m = $stats->{24};
577
578 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
579 $GAUGES->{hp}->set_value ($hp, $hp_m);
580 $GAUGES->{mana}->set_value ($sp, $sp_m);
581 $GAUGES->{food}->set_value ($fo, $fo_m);
582 $GAUGES->{grace}->set_value ($gr, $gr_m);
583}
584
492sub conn::user_send { 585sub conn::user_send {
493 my ($self, $command) = @_; 586 my ($self, $command) = @_;
494 587
495 $self->send ($command); 588 $self->send_command ($command);
496 status $command; 589 status $command;
590}
591
592sub conn::map_scroll {
593 my ($self, $dx, $dy) = @_;
594
595 $MAP->scroll ($dx, $dy);
497} 596}
498 597
499sub conn::feed_map1a { 598sub conn::feed_map1a {
500 my ($self, $data) = @_; 599 my ($self, $data) = @_;
501 600
502# $self->Crossfire::Protocol::feed_map1a ($data); 601# $self->Crossfire::Protocol::feed_map1a ($data);
503 602
504 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
505 $MAP->map1a_update ($data); 603 $MAP->map1a_update ($data);
506 $MAPWIDGET->update; 604 $MAPWIDGET->update;
507} 605}
508 606
509sub conn::flush_map { 607sub conn::flush_map {
… …
523 621
524sub conn::map_clear { 622sub conn::map_clear {
525 my ($self) = @_; 623 my ($self) = @_;
526 624
527 $self->flush_map; 625 $self->flush_map;
626 delete $self->{neigh};
528 627
529 $MAP->clear; 628 $MAP->clear;
530} 629}
531 630
532sub conn::map_info {
533 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
534 631
535 $self->flush_map; 632sub conn::load_map($$$) {
536 633 my ($self, $hash, $x, $y) = @_;
537 $x = $::MAP->ox - $x;
538 $y = $::MAP->oy - $y;
539
540 $self->{map_info} = [$hash, $x, $y, $w, $h];
541 634
542 if (defined (my $data = $MAPCACHE->get ($hash))) { 635 if (defined (my $data = $MAPCACHE->get ($hash))) {
543 $data = Compress::LZF::decompress $data; 636 $data = Compress::LZF::decompress $data;
544 warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d# 637 warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
545 for my $id ($MAP->set_rect ($x, $y, $data)) { 638 for my $id ($MAP->set_rect ($x, $y, $data)) {
546 my $data = $TILECACHE->get ($id) 639 my $data = $TILECACHE->get ($id)
547 or next; 640 or next;
548 641
549 $self->set_texture ($id => $data); 642 $self->set_texture ($id => $data);
550 } 643 }
551 } 644 }
645}
646
647sub conn::flood_fill {
648 my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
649
650 # the server does not allow map paths > 6
651 return if 6 <= length $path;
652
653 for my $tile (1..4) {
654 next if $self->{neigh}{$hash}[$tile];
655 next unless $flags & (1 << ($tile - 1));
656
657 my $neigh = $self->{neigh}{$hash} ||= [];
658
659 $self->send_mapinfo ("spatial $path$tile", sub {
660 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
661
662 #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
663 return if $mode ne "spatial";
664
665 $x += $MAP->ox;
666 $y += $MAP->oy;
667
668 $self->load_map ($hash, $x, $y)
669 unless $self->{neigh}{$hash}[5]++;#d#
670
671 $neigh->[$tile] = [$x, $y, $w, $h];
672
673 $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
674 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
675 });
676 }
677}
678
679sub conn::map_change {
680 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
681
682 $self->flush_map;
683
684 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
685
686 my $mapmapw = 250;
687 my $mapmaph = 250;
688
689 $self->flood_fill ("", $hash, $flags,
690 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
691 $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
692
693 $x += $ox;
694 $y += $oy;
695
696 $self->{map_info} = [$hash, $x, $y, $w, $h];
697
698 $self->load_map ($hash, $x, $y);
552} 699}
553 700
554sub conn::face_find { 701sub conn::face_find {
555 my ($self, $facenum, $face) = @_; 702 my ($self, $facenum, $face) = @_;
556 703
… …
606 753
607 $tex 754 $tex
608 }; 755 };
609} 756}
610 757
758sub conn::sound_play {
759 my ($self, $x, $y, $soundnum, $type) = @_;
760
761 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
762 or return;
763
764 $SDL_MIXER->play_channel (-1, $chunk);
765 warn "sound $x,$y,$soundnum,$type\n";#d#
766}
767
611sub conn::query { 768sub conn::query {
612 my ($self, $flags, $prompt) = @_; 769 my ($self, $flags, $prompt) = @_;
613 770
614 #TODO 771 #TODO
615 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 772 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
… …
619 my ($self, $color, $text) = @_; 776 my ($self, $color, $text) = @_;
620 777
621 my @color = ( 778 my @color = (
622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 779 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
623 [1.00, 1.00, 1.00], 780 [1.00, 1.00, 1.00],
624 [0.50, 0.50, 1.00], # changed 781 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
625 [1.00, 0.00, 0.00], 782 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 783 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 784 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 785 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 786 [0.18, 0.54, 0.34],
… …
647 refresh; 804 refresh;
648 }, 805 },
649 SDL_KEYDOWN() => sub { 806 SDL_KEYDOWN() => sub {
650 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 807 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
651 # alt-enter 808 # alt-enter
652 destroy_screen; 809 video_shutdown;
653 $CFG->{fullscreen} = !$CFG->{fullscreen}; 810 $CFG->{fullscreen} = !$CFG->{fullscreen};
654 init_screen; 811 video_init;
655 } else { 812 } else {
656 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 813 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
657 } 814 }
658 }, 815 },
659 SDL_KEYUP() => sub { 816 SDL_KEYUP() => sub {
… …
673 }, 830 },
674); 831);
675 832
676############################################################################# 833#############################################################################
677 834
835$SIG{INT} = $SIG{TERM} = sub { exit };
836
678$TILECACHE = CFClient::db_table "tilecache"; 837$TILECACHE = CFClient::db_table "tilecache";
679$FACEMAP = CFClient::db_table "facemap"; 838$FACEMAP = CFClient::db_table "facemap";
680 839
681CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 840CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
682 841
… …
708 867
709@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 868@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
710 869
711$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 870$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
712 871
713init_screen;
714
715{ 872{
716 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 873 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
717 874
718 CFClient::add_font $_ for @fonts; 875 CFClient::add_font $_ for @fonts;
719 CFClient::set_font $fonts[0]; 876 CFClient::set_font $fonts[0];
720} 877}
721 878
879video_init;
880audio_init;
881
722Event::loop; 882Event::loop;
723 883
884END { SDL::Quit }
724 885
886

Diff Legend

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