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.187 by root, Tue Apr 25 12:56:34 2006 UTC vs.
Revision 1.212 by root, Fri May 12 15:45:42 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
76our $MAPWIDGET; 80our $MAPWIDGET;
77our $BUTTONBAR; 81our $BUTTONBAR;
78our $LOGVIEW; 82our $LOGVIEW;
79our $CONSOLE; 83our $CONSOLE;
80our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
81 86
82our $FLOORBOX; 87our $FLOORBOX;
83our $GAUGES; 88our $GAUGES;
84our $STATWIDS; 89our $STATWIDS;
85 90
… …
89our $SDL_MIXER; 94our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
92 97
93our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 99our $STATUSBOX;
95our $DEBUG_STATUS; 100our $DEBUG_STATUS;
96 101
102our $INVWIN;
103our $INV;
104
97sub status { 105sub status {
98 $STATUS_LINE->set_text ($_[0]); 106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
99 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 107 $CFClient::UI::ROOT->on_post_alloc (status_line_positioner => sub {
108 my $widget = $STATUSBOX->{parent};
109 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
110 });
100} 111}
101 112
102sub debug { 113sub debug {
103 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
104 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
105} 117}
106 118
107sub start_game { 119sub start_game {
108 status "logging in..."; 120 status "logging in...";
109 121
110 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
111 123
112 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
113
114 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
115 126
116 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
117 128
118 $CONN = new conn 129 $CONN = eval {
130 new conn
119 host => $host, 131 host => $host,
120 port => $port || 13327, 132 port => $port || 13327,
121 user => $CFG->{user}, 133 user => $CFG->{user},
122 pass => $CFG->{password}, 134 pass => $CFG->{password},
123 mapw => $mapsize, 135 mapw => $mapsize,
124 maph => $mapsize, 136 maph => $mapsize,
137 ;
125 ; 138 };
126 139
140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
127 status "login successful"; 143 status "login successful";
128 144
129 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
146 } else {
147 status "unable to connect";
148 stop_game();
149 }
130} 150}
131 151
132sub stop_game { 152sub stop_game {
153 return unless $CONN;
154
155 status "connection closed";
156 $LOGIN_BUTTON->set_text ("Login");
157 $CONN->destroy;
158 $CONN = 0; # false, does not autovivify
159
160 undef $MAPCACHE;
133 undef $CONN; 161 undef $MAP;
134} 162}
135 163
136sub client_setup { 164sub client_setup {
137 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
138 title => "Client Setup", 166 title => "Client Setup",
… …
314 audio_shutdown (); 342 audio_shutdown ();
315 audio_init (); 343 audio_init ();
316 } 344 }
317 ); 345 );
318 346
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry. "
351 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 ."But you could also set it to 'tell <playername>' to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
319 $dialog 359 $dialog
320} 360}
321 361
322sub set_stats_window_fontsize { 362sub set_stats_window_fontsize {
323 for (values %{$STATWIDS}) { 363 for (values %{$STATWIDS}) {
… …
342 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
343 ); 383 );
344 $win->add (my $hbox = new CFClient::UI::HBox 384 $win->add (my $hbox = new CFClient::UI::HBox
345 children => [ 385 children => [
346 (new CFClient::UI::HBox expand => 1), 386 (new CFClient::UI::HBox expand => 1),
347 ($FLOORBOX = new CFClient::UI::VBox), 387 (new CFClient::UI::VBox children => [
388 (new CFClient::UI::Empty expand => 1),
389 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
390 ]),
348 (my $vbox = new CFClient::UI::VBox), 391 (my $vbox = new CFClient::UI::VBox),
349 ], 392 ],
350 ); 393 );
351 394
352 $vbox->add (new CFClient::UI::HBox 395 $vbox->add (new CFClient::UI::HBox
… …
422 465
423 my $row = 0; 466 my $row = 0;
424 my $col = 0; 467 my $col = 0;
425 468
426 my %resist_names = ( 469 my %resist_names = (
427 slow => "Slow", 470 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
428 holyw => "Holy Word", 471 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
429 conf => "Confusion", 472 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
430 fire => "Fire", 473 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
431 depl => "Depletion (some monsters and other effects can cause stats depletion)", 474 depl => "Depletion (some monsters and other effects can cause stats depletion)",
432 magic => "Magic", 475 magic => "Magic (resistance to magic spells like magic missile or similar)",
433 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 476 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
434 acid => "Acid", 477 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
435 pois => "Poison", 478 pois => "Poison (resistance to getting poisoned)",
436 para => "Paralysation", 479 para => "Paralysation (this resistance affects the chance you get paralysed)",
437 deat => "Death (resistance against death spells)", 480 deat => "Death (resistance against death spells)",
438 phys => "Physical", 481 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
439 blind => "Blind", 482 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
440 fear => "Fear", 483 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
441 tund => "Turn undead", 484 tund => "Turn undead",
442 elec => "Electricity", 485 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
443 cold => "Cold", 486 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
444 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 487 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
445 ); 488 );
446 for (qw/slow holyw conf fire depl magic 489 for (qw/slow holyw conf fire depl magic
447 drain acid pois para deat phys 490 drain acid pois para deat phys
448 blind fear tund elec cold ghit/) 491 blind fear tund elec cold ghit/)
… …
550 593
551} 594}
552 595
553sub metaserver_dialog { 596sub metaserver_dialog {
554 my $dialog = new CFClient::UI::FancyFrame 597 my $dialog = new CFClient::UI::FancyFrame
555 title => "Metaserver", 598 title => "Server List",
556 child => (my $vbox = new CFClient::UI::VBox); 599 child => (my $vbox = new CFClient::UI::VBox);
557 600
558 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 601 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
559 602
560 $dialog 603 $dialog
… …
662 705
663 $METASERVER = metaserver_dialog; 706 $METASERVER = metaserver_dialog;
664 707
665 $vbox->add (new CFClient::UI::Flopper 708 $vbox->add (new CFClient::UI::Flopper
666 expand => 1, 709 expand => 1,
667 text => "Metaserver", 710 text => "Server List",
668 other => $METASERVER, 711 other => $METASERVER,
669 tooltip => "Show a list of avaible crossfire servers", 712 tooltip => "Show a list of available crossfire servers",
670 connect_open => sub { 713 connect_open => sub {
671 update_metaserver $HOST; 714 update_metaserver $HOST;
672 } 715 }
673 ); 716 );
674 } 717 }
… …
689 hidden => 1, 732 hidden => 1,
690 tooltip => "The password for your character", 733 tooltip => "The password for your character",
691 connect_changed => sub { 734 connect_changed => sub {
692 my ($self, $value) = @_; 735 my ($self, $value) = @_;
693 $CFG->{password} = $value; 736 $CFG->{password} = $value;
694 }
695 );
696
697 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
698 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
699 text => $CFG->{say_command},
700 tooltip => "This is the command that will be used if you write a line in the message window entry. "
701 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
702 ."But you could also set it to 'tell <playername>' to only chat with that user.",
703 connect_changed => sub {
704 my ($self, $value) = @_;
705 $CFG->{say_command} = $value;
706 } 737 }
707 ); 738 );
708 739
709 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 740 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
710 $table->add (1, 7, new CFClient::UI::Slider 741 $table->add (1, 7, new CFClient::UI::Slider
… …
717 748
718 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 749 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
719 }, 750 },
720 ); 751 );
721 752
722 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 753 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
754 expand => 1,
755 align => 0,
756 text => "Login",
757 connect_activate => sub {
758 $CONN ? stop_game
723 start_game; 759 : start_game;
760 },
724 }); 761 );
725 762
726 $dialog 763 $dialog
727} 764}
728 765
729sub message_window { 766sub message_window {
… …
778 }; 815 };
779 816
780 $window 817 $window
781} 818}
782 819
820sub make_inventory_window {
821 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
822 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
823 $invwin
824}
825
783sub sdl_init { 826sub sdl_init {
784 CFClient::SDL_Init 827 CFClient::SDL_Init
785 and die "SDL::Init failed!\n"; 828 and die "SDL::Init failed!\n";
786} 829}
787 830
788sub video_init { 831sub video_init {
789 sdl_init; 832 sdl_init;
790 833
834 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
835
791 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 836 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
792 $FULLSCREEN = $CFG->{fullscreen}; 837 $FULLSCREEN = $CFG->{fullscreen};
793 $FAST = $CFG->{fast}; 838 $FAST = $CFG->{fast};
794 839
795 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 840 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
796 or die "SDL_SetVideoMode failed!\n"; 841 or die "SDL_SetVideoMode failed!\n";
797 842
798 $SDL_ACTIVE = 1; 843 $SDL_ACTIVE = 1;
799
800 $LAST_REFRESH = time - 0.01; 844 $LAST_REFRESH = time - 0.01;
801 845
802 CFClient::gl_init; 846 CFClient::gl_init;
803 847
804 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 848 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
805 849
850 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
851
806 ############################################################################# 852 #############################################################################
807 853
854 if ($DEBUG_STATUS) {
855 # reconfigure all widgets
856 $CFClient::UI::ROOT->reconfigure;
857
858 } else {
859 # create the widgets
860
808 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 861 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
809 $DEBUG_STATUS->show; 862 $DEBUG_STATUS->show;
810 863
811 $STATUS_LINE = new CFClient::UI::Label 864 $STATUSBOX = new CFClient::UI::Statusbox;
812 padding => 0, 865 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
813 y => $HEIGHT - $FONTSIZE * 1.8;
814 $STATUS_LINE->show;
815 866
816 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 867 (new CFClient::UI::Frame
817 padding => 0, 868 bg => [0, 0, 0, 0.4],
818 fontsize => 0.8, 869 child => $STATUSBOX,
819 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 870 )->show;
820 $ALT_ENTER_MESSAGE->show;
821 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
822 871
823 CFClient::UI::FancyFrame->new ( 872 CFClient::UI::FancyFrame->new (
824 border_bg => [1, 1, 1, 192/255], 873 border_bg => [1, 1, 1, 192/255],
825 bg => [1, 1, 1, 0], 874 bg => [1, 1, 1, 0],
826 child => $MAPMAP = new CFClient::MapWidget::MapMap 875 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
827 )->show; 876 )->show;
828 877
829 $MAPWIDGET = new CFClient::MapWidget; 878 $MAPWIDGET = new CFClient::MapWidget;
830 $MAPWIDGET->connect (activate_console => sub { 879 $MAPWIDGET->connect (activate_console => sub {
831 my ($mapwidget, $preset) = @_; 880 my ($mapwidget, $preset) = @_;
832 881
833 if ($CONSOLE) { 882 if ($CONSOLE) {
834 $CONSOLE->{input}->{auto_activated} = 1; 883 $CONSOLE->{input}->{auto_activated} = 1;
835 $CONSOLE->{input}->focus_in; 884 $CONSOLE->{input}->focus_in;
836 885
837 if ($preset && $CONSOLE->{input}->get_text eq '') { 886 if ($preset && $CONSOLE->{input}->get_text eq '') {
838 $CONSOLE->{input}->set_text ($preset); 887 $CONSOLE->{input}->set_text ($preset);
888 }
839 } 889 }
840 } 890 });
841 });
842 $MAPWIDGET->show; 891 $MAPWIDGET->show;
843 $MAPWIDGET->focus_in; 892 $MAPWIDGET->focus_in;
844 893
845 $BUTTONBAR = new CFClient::UI::HBox; 894 $BUTTONBAR = new CFClient::UI::HBox;
846 895
847 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 896 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
848 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
849 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
850 899
851 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 900 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
901
852 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 902 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
903 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
853 904
854 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 905 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
855 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 906 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
856 status "Configuration Saved"; 907 status "Configuration Saved";
857 }); 908 });
858 909
859 $BUTTONBAR->show; 910 $BUTTONBAR->show;
860 911
912 # delay till geometry is constant
913 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
861 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 914 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
915 });
916 force_refresh ();
917 }
862} 918}
863 919
864sub video_shutdown { 920sub video_shutdown {
865 $CFClient::UI::ROOT->{children} = [];
866 undef $CFClient::UI::GRAB;
867 undef $CFClient::UI::HOVER;
868 undef $SDL_ACTIVE; 921 undef $SDL_ACTIVE;
869} 922}
870 923
871my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 924my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
872my $bgmusic;#TODO#hack#d# 925my $bgmusic;#TODO#hack#d#
926
927sub audio_channel_finished {
928 my ($channel) = @_;
929
930 warn "channel $channel finished\n";#d#
931}
873 932
874sub audio_music_finished { 933sub audio_music_finished {
875 return unless $CFG->{bgm_enable}; 934 return unless $CFG->{bgm_enable};
876 935
877 # TODO: hack, do play loop and mood music 936 # TODO: hack, do play loop and mood music
… …
881 push @bgmusic, shift @bgmusic; 940 push @bgmusic, shift @bgmusic;
882} 941}
883 942
884sub audio_init { 943sub audio_init {
885 if ($CFG->{audio_enable}) { 944 if ($CFG->{audio_enable}) {
886 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 945 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
887 $SDL_MIXER = !CFClient::Mix_OpenAudio; 946 $SDL_MIXER = !CFClient::Mix_OpenAudio;
888 CFClient::Mix_AllocateChannels 8; 947 CFClient::Mix_AllocateChannels 8;
889 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 948 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
890 949
891 audio_music_finished; 950 audio_music_finished;
… …
918} 977}
919 978
920my %animate_object; 979my %animate_object;
921my $animate_timer; 980my $animate_timer;
922 981
923my $want_refresh;
924my $can_refresh;
925
926my $fps = 9; 982my $fps = 9;
927 983
928sub force_refresh { 984sub force_refresh {
929 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 985 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
930 debug sprintf "%3.2f", $fps; 986 debug sprintf "%3.2f", $fps;
931 987
932 $want_refresh = 0;
933 $can_refresh = 0;
934
935 $CFClient::UI::ROOT->draw; 988 $CFClient::UI::ROOT->draw;
936
937 CFClient::SDL_GL_SwapBuffers; 989 CFClient::SDL_GL_SwapBuffers;
938 990
991 $WANT_REFRESH = 0;
992 $CAN_REFRESH = 0;
939 $LAST_REFRESH = $NOW; 993 $LAST_REFRESH = $NOW;
940} 994}
941 995
942my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 996my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
943 $NOW = time; 997 $NOW = time;
… …
945 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 999 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
946 for CFClient::SDL_PollEvent; 1000 for CFClient::SDL_PollEvent;
947 1001
948 if (%animate_object) { 1002 if (%animate_object) {
949 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1003 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
950 $want_refresh++; 1004 $WANT_REFRESH++;
951 } 1005 }
952 1006
953 if ($want_refresh) { 1007 if ($WANT_REFRESH) {
954 force_refresh; 1008 force_refresh;
955 } else { 1009 } else {
956 $can_refresh = 1; 1010 $CAN_REFRESH = 1;
957 } 1011 }
958}); 1012});
959
960sub refresh {
961 $want_refresh++;
962}
963 1013
964sub animation_start { 1014sub animation_start {
965 my ($widget) = @_; 1015 my ($widget) = @_;
966 $animate_object{$widget} = $widget; 1016 $animate_object{$widget} = $widget;
967} 1017}
… …
1279 [0.55, 0.41, 0.13], 1329 [0.55, 0.41, 0.13],
1280 [0.99, 0.77, 0.26], 1330 [0.99, 0.77, 0.26],
1281 [0.74, 0.65, 0.41], 1331 [0.74, 0.65, 0.41],
1282 ); 1332 );
1283 1333
1334 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1335
1336 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1337 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1338 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1339
1284 $LOGVIEW->add_paragraph ($color[$color], $text); 1340 $LOGVIEW->add_paragraph ($color[$color],
1341 join "\n", map "$time $_", split /\n/, $text);
1342
1343 $STATUSBOX->add ($text,
1344 group => $text,
1345 color => $color[$color],
1346 timeout => 60,
1347 tooltip_font => $::FONT_FIXED,
1348 );
1349}
1350
1351sub conn::drawextinfo {
1352 my ($self, $color, $type, $subtype, $message) = @_;
1353
1354 $self->drawinfo ($color, $message);
1285} 1355}
1286 1356
1287sub conn::spell_add { 1357sub conn::spell_add {
1288 my ($self, $spell) = @_; 1358 my ($self, $spell) = @_;
1289 1359
… …
1302 1372
1303 for my $skill (values %{$self->{skill_info}}) { 1373 for my $skill (values %{$self->{skill_info}}) {
1304 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1374 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1305 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1375 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1306 } 1376 }
1377
1378 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1379 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1380 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1381 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1382}
1383
1384sub conn::eof {
1385 stop_game;
1307} 1386}
1308 1387
1309sub update_floorbox { 1388sub update_floorbox {
1310 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1389 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1390 return unless $CONN;
1391
1311 $FLOORBOX->clear; 1392 $FLOORBOX->clear;
1312 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1393 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1313 1394
1314 my @items = values %{ $CONN->{container}{0} }; 1395 my $count = 4;
1315 1396 for (@{ $CONN->{container}{0} }) {
1316 # we basically have to use the same sorting as everybody else 1397 if (--$count) {
1317 @items = sort { $a->{type} <=> $b->{type} } @items; 1398 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1318 1399 } else {
1319 for my $item (reverse @items) { 1400 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1320 my $desc = $item->{nrof} < 2
1321 ? $item->{name}
1322 : "$item->{nrof} $item->{name_pl}";
1323 # todo: animation widget, face widget, weight(?) etc.
1324 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1325 tooltip => (CFClient::UI::Label->escape ($desc)
1326 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1327 can_hover => 1,
1328 can_events => 1,
1329 connect_button_down => sub {
1330 my ($self, $ev, $x, $y) = @_;
1331
1332 # todo: maybe put examine on 1? but should just be a tooltip :(
1333 if ($ev->{button} == 1) {
1334 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1335 } elsif ($ev->{button} == 2) {
1336 $CONN->send ("apply $item->{tag}");
1337 } elsif ($ev->{button} == 3) {
1338 # examine, lock, mark, maybe other things
1339 warn "MENU not implemented yet\n";
1340 }
1341
1342 1
1343 }, 1401 last;
1344 );
1345
1346 $hbox->add (new CFClient::UI::Face
1347 can_events => 0,
1348 face => $item->{face},
1349 anim => $item->{anim},
1350 animspeed => $item->{animspeed},
1351 );
1352 1402 }
1353 $hbox->add (new CFClient::UI::Label
1354 can_events => 0,
1355 text => $desc,
1356 );
1357 } 1403 }
1358 }); 1404 });
1359 refresh; 1405
1406 $WANT_REFRESH++;
1360} 1407}
1361 1408
1362sub conn::container_add { 1409sub conn::container_add {
1363 my ($self, $id, $items) = @_; 1410 my ($self, $tag, $items) = @_;
1364 1411
1365 update_floorbox if $id == 0; 1412 update_floorbox if $tag == 0;
1413
1414 $INV->set_items ($self->{container}{$self->{player}{tag}})
1415 if $tag == $self->{player}{tag};
1416
1366 # $self-<{player}{tag} => player inv 1417 # $self-<{player}{tag} => player inv
1367 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1418 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1368} 1419}
1369 1420
1370sub conn::container_clear { 1421sub conn::container_clear {
1371 my ($self, $id) = @_; 1422 my ($self, $tag) = @_;
1372 1423
1373 update_floorbox if $id == 0; 1424 update_floorbox if $tag == 0;
1425
1426 $INV->set_items ($self->{container}{$tag})
1427 if $tag == $self->{player}{tag};
1428
1374# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1429# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1375} 1430}
1376 1431
1377sub conn::item_delete { 1432sub conn::item_delete {
1378 my ($self, @items) = @_; 1433 my ($self, @items) = @_;
1379 1434
1380 for (@items) { 1435 for (@items) {
1381 update_floorbox if $_->{container} == 0; 1436 update_floorbox if $_->{container} == 0;
1437
1438 $INV->set_items ($self->{container}{$_->{container}})
1439 if $_->{container} == $self->{player}{tag};
1382 } 1440 }
1383} 1441}
1384 1442
1385sub conn::item_update { 1443sub conn::item_update {
1386 my ($self, $item) = @_; 1444 my ($self, $item) = @_;
1387 1445
1388 update_floorbox if $item->{container} == 0; 1446 update_floorbox if $item->{container} == 0;
1447
1448 $INV->set_items ($self->{container}{$item->{container}})
1449 if $item->{container} == $self->{player}{tag};
1389} 1450}
1390 1451
1391%SDL_CB = ( 1452%SDL_CB = (
1392 CFClient::SDL_QUIT => sub { 1453 CFClient::SDL_QUIT => sub {
1393 Event::unloop -1; 1454 Event::unloop -1;
1394 }, 1455 },
1395 CFClient::SDL_VIDEORESIZE => sub { 1456 CFClient::SDL_VIDEORESIZE => sub {
1396 }, 1457 },
1397 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1458 CFClient::SDL_VIDEOEXPOSE => sub {
1459 $WANT_REFRESH++;
1460 },
1398 CFClient::SDL_ACTIVEEVENT => sub { 1461 CFClient::SDL_ACTIVEEVENT => sub {
1399# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1462# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1400 }, 1463 },
1401 CFClient::SDL_KEYDOWN => sub { 1464 CFClient::SDL_KEYDOWN => sub {
1402 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1465 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1406 video_init; 1469 video_init;
1407 } else { 1470 } else {
1408 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1471 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1409 } 1472 }
1410 }, 1473 },
1411 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1474 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1412 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1475 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1413 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1476 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1414 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1477 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1415 CFClient::SDL_USEREVENT => \&audio_music_finished, 1478 CFClient::SDL_USEREVENT => sub {
1479 if ($_[0]{code} == 1) {
1480 audio_channel_finished $_[0]{data1};
1481 } elsif ($_[0]{code} == 0) {
1482 audio_music_finished;
1483 }
1484 },
1416); 1485);
1417 1486
1418############################################################################# 1487#############################################################################
1419 1488
1420$SIG{INT} = $SIG{TERM} = sub { exit }; 1489$SIG{INT} = $SIG{TERM} = sub { exit };
1421 1490
1422$TILECACHE = CFClient::db_table "tilecache";
1423$FACEMAP = CFClient::db_table "facemap";
1424
1425CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1426
1427my %DEF_CFG = (
1428 sdl_mode => 0,
1429 width => 640,
1430 height => 480,
1431 fullscreen => 0,
1432 fast => 0,
1433 map_scale => 0.5,
1434 fow_enable => 1,
1435 fow_intensity => 0.45,
1436 fow_smooth => 0,
1437 gui_fontsize => 1,
1438 log_fontsize => 1,
1439 gauge_fontsize => 1,
1440 gauge_size => 0.35,
1441 stat_fontsize => 1,
1442 mapsize => 100,
1443 host => "crossfire.schmorp.de",
1444 say_command => 'say',
1445 audio_enable => 1,
1446 bgm_enable => 1,
1447 bgm_volume => 0.25,
1448);
1449
1450while (my ($k, $v) = each %DEF_CFG) {
1451 $CFG->{$k} = $v unless exists $CFG->{$k};
1452}
1453
1454sdl_init;
1455
1456@SDL_MODES = reverse
1457 grep $_->[0] >= 640 && $_->[1] >= 480,
1458 CFClient::SDL_ListModes;
1459
1460@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1461
1462$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1463
1464{ 1491{
1492 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1493
1494 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1495
1496 $TILECACHE = CFClient::db_table "tilecache";
1497 $FACEMAP = CFClient::db_table "facemap";
1498
1499 my %DEF_CFG = (
1500 sdl_mode => 0,
1501 width => 640,
1502 height => 480,
1503 fullscreen => 0,
1504 fast => 0,
1505 map_scale => 0.5,
1506 fow_enable => 1,
1507 fow_intensity => 0.45,
1508 fow_smooth => 0,
1509 gui_fontsize => 1,
1510 log_fontsize => 1,
1511 gauge_fontsize=> 1,
1512 gauge_size => 0.35,
1513 stat_fontsize => 1,
1514 mapsize => 100,
1515 host => "crossfire.schmorp.de",
1516 say_command => 'say',
1517 audio_enable => 1,
1518 bgm_enable => 1,
1519 bgm_volume => 0.25,
1520 );
1521
1522 while (my ($k, $v) = each %DEF_CFG) {
1523 $CFG->{$k} = $v unless exists $CFG->{$k};
1524 }
1525
1526 sdl_init;
1527
1528 @SDL_MODES = reverse
1529 grep $_->[0] >= 640 && $_->[1] >= 480,
1530 CFClient::SDL_ListModes;
1531
1532 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1533
1534 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1535
1536 {
1465 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1537 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1466 DejaVuSans.ttf 1538 DejaVuSans.ttf
1467 DejaVuSansMono.ttf 1539 DejaVuSansMono.ttf
1468 DejaVuSans-Bold.ttf 1540 DejaVuSans-Bold.ttf
1469 DejaVuSansMono-Bold.ttf 1541 DejaVuSansMono-Bold.ttf
1470 DejaVuSans-Oblique.ttf 1542 DejaVuSans-Oblique.ttf
1471 DejaVuSansMono-Oblique.ttf 1543 DejaVuSansMono-Oblique.ttf
1472 DejaVuSans-BoldOblique.ttf 1544 DejaVuSans-BoldOblique.ttf
1473 DejaVuSansMono-BoldOblique.ttf 1545 DejaVuSansMono-BoldOblique.ttf
1474 ); 1546 );
1475 1547
1476 CFClient::add_font $_ for @fonts; 1548 CFClient::add_font $_ for @fonts;
1477 1549
1478 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1550 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1479 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1551 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1480 1552
1481 $FONT_PROP->make_default; 1553 $FONT_PROP->make_default;
1482} 1554 }
1483 1555
1484video_init; 1556 video_init;
1485audio_init; 1557 audio_init;
1558}
1486 1559
1487Event::loop; 1560Event::loop;
1488 1561
1489END { CFClient::SDL_Quit } 1562END { CFClient::SDL_Quit }
1490 1563

Diff Legend

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