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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.83 by root, Sun Jan 4 10:22:19 2009 UTC vs.
Revision 1.115 by root, Sat Apr 24 09:53:09 2010 UTC

… …
21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 require AnyEvent::DNS;
29 AnyEvent::DNS::resolver ();
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 # OS X 59 # OS X
56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
61 } 63 }
62 64
63 unshift @INC, $root; 65 unshift @INC, $root;
64 } 66 }
65} 67}
66 68
67# prepend private library directory 69# prepend private library directory and prepare env
68BEGIN { 70BEGIN {
69 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 73 if (-d $path) {
72 unshift @INC, $path; 74 unshift @INC, $path;
… …
86 88
87use Deliantra; 89use Deliantra;
88use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
89 91
90use AnyEvent::Util (); 92use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 93use AnyEvent::Socket ();
93use AnyEvent::DNS (); 94use AnyEvent::DNS ();
94 95
95use Compress::LZF; 96use Compress::LZF;
96use JSON::XS; 97use JSON::XS;
… …
132 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
133}; 134};
134 135
135my $MAX_FPS = 60; 136my $MAX_FPS = 60;
136 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
137our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
138 141
139our $LAST_REFRESH; 142our $LAST_REFRESH;
140our $NOW; 143our $NOW;
141 144
142our $CFG; 145our $CFG;
143our $PROFILE; # current profile 146our $PROFILE; # current profile
144our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
145 149
146our $WANT_REFRESH; 150our $WANT_REFRESH;
147 151
148our $MODE_SLIDER; 152our $MODE_SLIDER;
149our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
162 166
163our $MAP; 167our $MAP;
164our $MAPMAP; 168our $MAPMAP;
165our $MAPWIDGET; 169our $MAPWIDGET;
166our $COMPLETER; 170our $COMPLETER;
167our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
168our $METASERVER; 175our $METASERVER;
169our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
170our $QUIT_DIALOG; 177our $QUIT_DIALOG;
171our $HOST_ENTRY; 178our $HOST_ENTRY;
172our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
198our $FLOORBOX; 205our $FLOORBOX;
199our $GAUGES; 206our $GAUGES;
200our $STATWIDS; 207our $STATWIDS;
201 208
202our $SDL_ACTIVE; 209our $SDL_ACTIVE;
203our %SDL_CB; 210our @SDL_CB;
204 211
205our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
206our $STATUSBOX; 213our $STATUSBOX;
207our $MODBOX; 214our $MODBOX;
208our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
339 or return; 346 or return;
340 347
341 $meta->{data} 348 $meta->{data}
342 or return; 349 or return;
343 350
344 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
345 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
346 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
347 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
348 &audio_music_push ($face); 355 &audio_music_push ($face);
349 } 356 }
350 } else { 357 } else {
351 # fetch from database 358 # fetch from database
352 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
353 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
354 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
355 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
356 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
357 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
358 365
359 audio_sound_push ($face); 366 audio_sound_push ($face);
360 }; 367 };
… …
407 414
408 audio_music_update_volume; 415 audio_music_update_volume;
409 416
410 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
411 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
412 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
413 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
414 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
415 425
416 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
418 428
… …
508 audio_music_push; 518 audio_music_push;
509} 519}
510 520
511sub audio_init { 521sub audio_init {
512 if ($CFG->{audio_enable}) { 522 if ($CFG->{audio_enable}) {
523 if (length $CFG->{audio_driver}) {
524 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
525 DC::SDL_Init DC::SDL_INIT_AUDIO
526 and die "SDL::Init failed!\n";
527 } else {
528 DC::SDL_Init DC::SDL_INIT_AUDIO
529 and die "SDL::Init failed!\n";
530 }
531
513 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
514 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
515 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
516 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
517 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
531 sub audio_tab_update; 550 sub audio_tab_update;
532 audio_tab_update; 551 audio_tab_update;
533} 552}
534 553
535sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
536 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
537 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
538 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
539 563
540 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
… …
542 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
543 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
544 568
545 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
546 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
547} 573}
548 574
549############################################################################# 575#############################################################################
550 576
551sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
792 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
793 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
794 mapw => $mapw, 820 mapw => $mapw,
795 maph => $maph, 821 maph => $maph,
796 822
823 c_version => {
824 client => "deliantra",
797 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
798 829
799 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
800 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
801 map => $MAP, 832 map => $MAP,
802 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
808 839
809 on_connect => sub { 840 on_connect => sub {
810 if ($_[0]) { 841 if ($_[0]) {
811 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
812 843
813 status "login successful"; 844 status "successfully connected to the server";
814 } else { 845 } else {
815 undef $CONN; 846 undef $CONN;
816 status "unable to connect: $!"; 847 status "unable to connect: $!";
817 stop_game(); 848 stop_game();
818 } 849 }
… …
820 ; 851 ;
821} 852}
822 853
823sub start_game { 854sub start_game {
824 status "logging in..."; 855 status "logging in...";
856
857 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
858 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
859 or return status "$server: unable to parse server address, try an empty field.";
825 860
826 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
827 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
828
829 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
830 863
831 $MAP = new DC::Map; 864 $MAP = new DC::Map;
832 865
833 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
834 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
835 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
836 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
837 if ($_[0] ne "80.101.114.108") { # Perl 870 if ($_[0] ne "80.101.114.108") { # P-e-r-l
871 status "dns failure, trying differently";
872 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
873 unless (defined $host) {
838 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
839 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
840 } 877 }
841 878
842 dc_connect $host, $port; 879 dc_connect $host, $port;
843 }; 880 };
844 } else { 881 } else {
… …
911 948
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
914 951
915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
916 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
917 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
918 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
919 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
920 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
… …
1012 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1050 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1013 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
1014 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1015 ); 1053 );
1016 1054
1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1056 $table->add_at (1, $row++, new DC::UI::CheckBox
1057 state => $CFG->{smooth_transitions},
1058 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1059 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1060 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1061 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1062 );
1063
1064
1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1018 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1021 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1034 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1035 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1036 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1084 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1086 );
1087
1088 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1089 $table->add_at (1, $row++, new DC::UI::ImageButton
1090 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1091 bg => [0.3, 0.3, 0.2],
1092 force_w => 64,
1093 force_h => 64,
1094 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1095 on_activate => sub {
1096 my ($self) = @_;
1097 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1098 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1099 $MAPWIDGET->update;
1100 }
1038 ); 1101 );
1039 1102
1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1041 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1042 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1093 ]); 1156 ]);
1094 1157
1095 my $text = !$freq 1158 my $text = !$freq
1096 ? "audio is off" 1159 ? "audio is off"
1097 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1098 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1099 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1100 1166
1101 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1102} 1168}
1103 1169
1104sub audio_setup { 1170sub audio_setup {
… …
1107 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1173 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
1108 1174
1109 my $row = 0; 1175 my $row = 0;
1110 1176
1111 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1177 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1112 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1113 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1114 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1180 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1115 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1181 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1182 );
1183 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1184
1185 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1186 $driver->add (new DC::UI::Entry
1187 text => $CFG->{audio_driver},
1188 template => "dsound1234",
1189 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1190 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1191 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1192 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1193 . "in no sound.",
1194 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1116 ); 1195 );
1117 1196
1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1197 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1119 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1120 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1133 ); 1212 );
1134 1213
1135 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1136 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1137 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1138 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1217 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1139 on_changed => sub { 1218 on_changed => sub {
1140 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1141 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1142 audio_music_push; 1221 audio_music_push;
1143 1 1222 1
… …
1154 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1155 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1156 options => [ 1235 options => [
1157 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1158 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1159 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1160 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1161 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1162 ], 1241 ],
1163 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1242 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1164 on_changed => sub { 1243 on_changed => sub {
1165 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1166 audio_tab_update; 1245 audio_tab_update;
… …
1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1269 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1191 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1270 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1192 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1193 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1194 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1273 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1195 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1196 on_changed => sub { 1275 on_changed => sub {
1197 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1198 audio_tab_update; 1277 audio_tab_update;
1199 1 1278 1
1200 } 1279 }
… …
1244} 1323}
1245 1324
1246sub make_gauge_window { 1325sub make_gauge_window {
1247 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1248 1327
1249 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1250 force_x => 0, 1329 force_x => 0,
1251 force_y => "max", 1330 force_y => "max",
1252 force_w => $WIDTH, 1331 force_w => $WIDTH,
1253 force_h => $gh, 1332 force_h => $gh,
1254 ); 1333 );
… …
1270 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1271 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1272 ], 1351 ],
1273 ); 1352 );
1274 1353
1275 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1354 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1276 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1355 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1277 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1356 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1278 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1357 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1279
1280 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1281 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1282 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1283 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1284
1285 $GAUGES = {
1286 exp => $exp, prg => $prg, sklprg => $sklprg,
1287 win => $win, range => $rng,
1288 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1289 };
1290 1358
1291 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1292 1360
1293 $win 1361 $win
1362}
1363
1364our $BW_WATCHER;
1365
1366sub debug_toggle($) {
1367 $DELIANTRA_DEBUG ^= $_[0];
1368
1369 if ($DELIANTRA_DEBUG & 16) {
1370 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1371 return unless $CONN;
1372 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1373 $CONN->{octets_in} = 0;
1374 };
1375 } else {
1376 undef $BW_WATCHER;
1377 }
1378
1294} 1379}
1295 1380
1296sub debug_setup { 1381sub debug_setup {
1297 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1298 1383
1299 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1384 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1300 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1385 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1301 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1386 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1302 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1387 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1303 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1388 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1304 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1389 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1305 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1390 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1306 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1391 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1392 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1393 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1394
1307 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1395 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1308
1309 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1396 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1310 1397
1311 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1398 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1312 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1399 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1313 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1400 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1314 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1401 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1635 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1722 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1636 ); 1723 );
1637 1724
1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1725 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1639 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1640 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1641 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1643 ); 1730 );
1644 1731
1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1732 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1646 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1647 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1648 hidden => 1, 1735 hidden => 1,
1649 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1650 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1651 ); 1738 );
1652 1739
1653 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1654 expand => 1, 1741 expand => 1,
1655 text => "Login / Register", 1742 text => "Login / Register",
… …
1691 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1692 1779
1693 $vbox->add ( 1780 $vbox->add (
1694 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1695 expand => 1, 1782 expand => 1,
1696 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1697 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1784 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1698 on_changed => sub { 1785 on_changed => sub {
1699 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1700 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1701 1 1788 1
1702 } 1789 }
1703 ); 1790 );
1704 1791
1705 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1748 1835
1749 my $row = 0; 1836 my $row = 0;
1750 1837
1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1752 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1753 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1754 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1842 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1755 on_changed => sub { 1843 on_changed => sub {
1756 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1757 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
… …
1759 } 1847 }
1760 ); 1848 );
1761 1849
1762 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1763 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1851 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1852 c_colspan => 2,
1764 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1854 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1766 . "sends more messages than this number, older messages get removed to save memory and " 1855 . "sends more messages than this number, older messages get removed to save memory and "
1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1856 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1768 on_changed => sub { 1857 on_changed => sub {
… …
1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1771 0 1860 0
1772 }, 1861 },
1773 ); 1862 );
1774 1863
1864 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1865 $table->add_at (1, $row, new DC::UI::CheckBox
1866 state => $CFG->{config_autosave},
1867 tooltip => "Normally, configuration settings and the user interface layout "
1868 . "are saved on client exit. You can disable this behaviour by "
1869 . "unchecking this checkbox.",
1870 on_changed => sub {
1871 my ($self, $value) = @_;
1872 $CFG->{config_autosave} = $value;
1873 0
1874 }
1875 );
1876 $table->add_at (2, $row++, new DC::UI::Button
1877 text => "Save Now",
1878 tooltip => "Use this to manually save configuration and UI layout when "
1879 . "autosave is disabled.",
1880 on_activate => sub {
1881 DC::write_cfg;
1882 0
1883 }
1884 );
1885
1775 $table 1886 $table
1776} 1887}
1777 1888
1778sub autopickup_setup { 1889sub autopickup_setup {
1779 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
… …
1785 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1786 ); 1897 );
1787 1898
1788 for ( 1899 for (
1789 ["General", 0, 0, 1900 ["General", 0, 0,
1790 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1791 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1792 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1793 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1794 ], 1904 ],
1795 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1796 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
… …
1844 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1845 } else { 1955 } else {
1846 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1847 } 1957 }
1848 1958
1849 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1850 if defined $::CONN; 1960 if defined $::CONN;
1851 1961
1852 0 1962 0
1853 }); 1963 });
1854 1964
… …
1871 }); 1981 });
1872 1982
1873 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1874 text => "set", 1984 text => "set",
1875 on_activate => sub { 1985 on_activate => sub {
1876 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1877 if defined $::CONN; 1987 if defined $::CONN;
1878 0 1988 0
1879 }); 1989 });
1880 1990
1881 $r 1991 $r
1882} 1992}
1883 1993
1884my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1885 type => sub { 1995 type => sub {
1996 use sort 'stable';
1886 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1887 }, 1998 },
1888 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1889 my $NOW = time; 2001 my $NOW = time;
1890 sort { 2002 sort {
1891 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2003 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1892 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 2004 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1893 2005
1894 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1895 or $btime <=> $atime 2007 or $btime <=> $atime
1896 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1897 } @_ 2009 } @_
1898 }, 2010 },
1899 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1900 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1901 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1902 } @_ }, 2016 } @_
2017 },
1903); 2018);
1904 2019
1905sub inventory_widget { 2020sub inventory_widget {
1906 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1907 2022
… …
1994 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1995 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1996 } 2111 }
1997} 2112}
1998 2113
1999sub player_window { 2114sub make_playerbook {
2000 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2001 x => "center", 2116 x => "center",
2002 y => "center", 2117 y => "center",
2003 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
2004 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
… …
2038 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2039 2154
2040 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2041 2156
2042 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2043 $plwin
2044} 2158}
2045 2159
2046sub keyboard_setup { 2160sub keyboard_setup {
2047 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2048} 2162}
2049 2163
2050sub help_window { 2164sub make_help_window {
2051 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2052 x => 'center', 2166 x => 'center',
2053 y => 'center', 2167 y => 'center',
2054 z => 4, 2168 z => 4,
2055 name => 'doc_browser', 2169 name => 'doc_browser',
… …
2144 2258
2145 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2146 $win->show; 2260 $win->show;
2147 }; 2261 };
2148 2262
2149 $win 2263 $HELP_WINDOW = $win;
2150}
2151
2152sub open_string_query {
2153 my ($title, $cb, $txt, $tooltip) = @_;
2154 my $dialog = new DC::UI::Toplevel
2155 x => "center",
2156 y => "center",
2157 z => 50,
2158 force_w => $WIDTH * 4/5,
2159 title => $title;
2160
2161 $dialog->add (
2162 my $e = new DC::UI::Entry
2163 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2164 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2165 tooltip => $tooltip
2166 );
2167
2168 $e->grab_focus;
2169 $e->set_text ($txt) if $txt;
2170 $dialog->show;
2171} 2264}
2172 2265
2173sub open_quit_dialog { 2266sub open_quit_dialog {
2174 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2175 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2208 2301
2209 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2210 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2211} 2304}
2212 2305
2306sub make_menubar {
2307 $MENUFRAME = new DC::UI::Toplevel
2308 border => 0,
2309 force_x => 0,
2310 force_y => 0,
2311 force_w => $::WIDTH,
2312 child => ($MENUBAR = new DC::UI::HBox),
2313 ;
2314
2315 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2316
2317 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2318 make_gauge_window->show;
2319
2320# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2321# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2322
2323 make_playerbook;
2324
2325 $MENUPOPUP = DC::UI::Menu->new (items => [
2326 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2327 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2328 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2329 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2330 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2331 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2332 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2333 ["Quit…" , sub {
2334 if ($CONN) {
2335 open_quit_dialog;
2336 } else {
2337 EV::unloop EV::UNLOOP_ALL;
2338 }
2339 }],
2340 ]);
2341
2342 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2343 tooltip => "Shows the main menu",
2344 on_button_down => sub {
2345 my ($self, $ev) = @_;
2346 local $ev->{x} = 0;
2347 local $ev->{y} = 0;
2348 $MENUPOPUP->popup ($ev);
2349 },
2350 );
2351
2352 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2353 padding_x => 6,
2354 padding_y => 3,
2355 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2356 template => " Exp: 888,888,888,888 (lvl 188) ",
2357 );
2358
2359 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2360 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2361 . "will automatically pick up items as defined by your item pickup settings "
2362 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2363 . "disable autopickup by disabling this checkbox.",
2364 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2365 on_changed => sub {
2366 my ($self, $value) = @_;
2367 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2368 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2369 $CONN->send_pickup ($CFG->{pickup})
2370 if $CONN;
2371 },
2372 );
2373
2374 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2375 c_rescale => 1,
2376 padding_x => 6,
2377 padding_y => 3,
2378 force_w => $::WIDTH * 0.2,
2379 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2380 template => "two handed weapons 99%",
2381 );
2382
2383 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2384 expand => 1,
2385 align => 1, can_hover => 1, can_events => 1,
2386 text => "Range and Combat Slots",
2387 tooltip => "#stat_ranged",
2388 );
2389
2390 $MENUFRAME->show;
2391}
2392
2393sub open_string_query {
2394 my ($title, $cb, $txt, $tooltip) = @_;
2395 my $dialog = new DC::UI::Toplevel
2396 x => "center",
2397 y => "center",
2398 z => 50,
2399 force_w => $WIDTH * 4/5,
2400 title => $title;
2401
2402 $dialog->add (
2403 my $e = new DC::UI::Entry
2404 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2405 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2406 tooltip => $tooltip
2407 );
2408
2409 $e->grab_focus;
2410 $e->set_text ($txt) if $txt;
2411 $dialog->show;
2412}
2413
2213sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2214 # find all tips 2415 # find all tips
2215 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2216 2417
2217 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
… …
2262 2463
2263 $dialog->show; 2464 $dialog->show;
2264 }; 2465 };
2265} 2466}
2266 2467
2267sub sdl_init {
2268 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2269 and die "SDL::Init failed!\n";
2270}
2271
2272sub video_init { 2468sub video_init {
2273 DC::set_theme $CFG->{uitheme}; 2469 DC::set_theme $CFG->{uitheme};
2274 2470
2275 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
… …
2335 2531
2336 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2337 padding => 0, 2533 padding => 0,
2338 z => 100, 2534 z => 100,
2339 force_x => "max", 2535 force_x => "max",
2340 force_y => 0; 2536 force_y => 20;
2341 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2342 2538
2343 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2344 2540
2345 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2356 2552
2357 (new DC::UI::Frame 2553 (new DC::UI::Frame
2358 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2359 force_x => 0, 2555 force_x => 0,
2360 force_y => "max", 2556 force_y => "max",
2361 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2362 )->show; 2558 )->show;
2363 2559
2364 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2365 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2366 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2367 align => 0, 2563 align => 0,
2368 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2369 fontsize => 0.5, 2565 fontsize => 0.5,
2370 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2371 ); 2567 );
2372 2568
2373 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2374 title => "Minimap", 2570 title => "Minimap",
2375 name => "mapmap", 2571 name => "mapmap",
2376 x => 0, 2572 x => 0,
2377 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2378 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2379 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2380 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2381 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2577 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2382 ), 2578 ),
… …
2411 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2412 # the name is changed to not conflict with the older name as users could have hidden it 2608 # the name is changed to not conflict with the older name as users could have hidden it
2413 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2414 name => "message_window2", 2610 name => "message_window2",
2415 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2416 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2417 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2418 ; 2615 ;
2419 2616
2420 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2440 . "After pressing the combo the binding will be saved automatically and the " 2637 . "After pressing the combo the binding will be saved automatically and the "
2441 . "binding editor closes"); 2638 . "binding editor closes");
2442 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2443 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2444 2641
2445 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2446 2644
2447 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2448 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2449
2450# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2451# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2452
2453 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
2454
2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2456 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2457
2458 $BUTTONBAR->add (new DC::UI::Button
2459 text => "Save Config",
2460 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2461 on_activate => sub {
2462 $::CFG->{layout} = DC::UI::get_layout;
2463 DC::write_cfg;
2464 status "Configuration Saved";
2465 0
2466 },
2467 );
2468
2469 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2470 tooltip => "View Documentation");
2471
2472 $BUTTONBAR->add (new DC::UI::Button
2473 text => "Quit",
2474 tooltip => "Terminates the program",
2475 on_activate => sub {
2476 if ($CONN) {
2477 open_quit_dialog;
2478 } else {
2479 EV::unloop EV::UNLOOP_ALL;
2480 }
2481 0
2482 },
2483 );
2484
2485 $BUTTONBAR->show;
2486 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2487 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2488 } 2647 }
2489 2648
2490 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2649 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2491 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2492 2651
2493 $CAVEAT_LABEL->set_text ("None :)"); 2652 $CAVEAT_LABEL->set_text ("None :)");
2653 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2654 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2494 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2495 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2496 2657
2497 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2658 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2498} 2659}
… …
2508my $animate_timer; 2669my $animate_timer;
2509 2670
2510my $fps = 9; 2671my $fps = 9;
2511 2672
2512sub force_refresh { 2673sub force_refresh {
2513 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2514 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2675 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2515 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2516 } 2677 }
2517 2678
2518 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2526my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2527 2688
2528my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2529 $NOW = EV::now; 2690 $NOW = EV::now;
2530 2691
2531 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2532 for DC::poll_events; 2693 for DC::poll_events;
2533 2694
2534 if (%animate_object) { 2695 if (%animate_object) {
2535 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2536 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
… …
2548sub animation_stop { 2709sub animation_stop {
2549 my ($widget) = @_; 2710 my ($widget) = @_;
2550 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2551} 2712}
2552 2713
2553%SDL_CB = (
2554 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2555 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2556 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2557 }, 2717};
2558 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2559 },
2560 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2561 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2562 }, 2721};
2563 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2564# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2565# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2724# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2566# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2567# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2568# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2569# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2570 }, 2729};
2571 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2572 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2573 # alt-enter 2732 # alt-enter
2574 video_shutdown; 2733 video_shutdown;
2575 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2576 video_init; 2735 video_init;
2577 } else { 2736 } else {
2578 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2579 } 2738 }
2580 update_modbox; 2739 update_modbox;
2581 }, 2740};
2582 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2583 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2584 update_modbox; 2743 update_modbox;
2585 }, 2744};
2586 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2587 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2588 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2589 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2590 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2591 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2592 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2593 audio_music_finished; 2752 audio_music_finished;
2594 }
2595 }, 2753 }
2596); 2754};
2597 2755
2598############################################################################# 2756#############################################################################
2599 2757
2600$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2601 EV::unloop; 2759 EV::unloop;
2602 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2603}; 2761};
2604
2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
2608 2762
2609# due to mac os x + sdl combined braindamage, we need this contortion 2763# due to mac os x + sdl combined braindamage, we need this contortion
2610sub main { 2764sub main {
2611 { 2765 {
2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
… …
2631 DC::DB::open_db; 2785 DC::DB::open_db;
2632 2786
2633 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2634 2788
2635 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2636 sdl_mode => undef, 2791 sdl_mode => undef,
2637 fullscreen => 1, 2792 fullscreen => 1,
2638 fast => 0, 2793 fast => 0,
2639 force_opengl11 => undef, 2794 force_opengl11 => undef,
2640 disable_alpha => 0, 2795 disable_alpha => 0,
2641 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2642 texture_compression => 1, 2798 texture_compression => 1,
2643 map_scale => 1, 2799 map_scale => 1,
2644 fow_enable => 1, 2800 fow_enable => 1,
2645 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2646 map_smoothing => 1, 2803 map_smoothing => 1,
2647 gui_fontsize => 1, 2804 gui_fontsize => 1,
2648 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2649 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2650 gauge_size => 0.35, 2807 gauge_size => 0.35,
… …
2658 effects_enable => 1, 2815 effects_enable => 1,
2659 effects_volume => 1, 2816 effects_volume => 1,
2660 bgm_enable => 1, 2817 bgm_enable => 1,
2661 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2662 output_rate => "", 2819 output_rate => "",
2663 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2664 inv_sort => "mtime", 2821 inv_sort => "mtime",
2665 default => "profile", # default profile 2822 default => "profile", # default profile
2666 show_tips => 1, 2823 show_tips => 1,
2667 logview_max_par => 1000, 2824 logview_max_par => 1000,
2668 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2669 uitheme => "wood", 2826 uitheme => "wood",
2670 ); 2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2671 2829 );
2830
2672 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2673 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2674 } 2833 }
2675 2834
2676 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2836
2837 # OS X passes some process serial number of other shit. they
2838 # could have used an env var or any other sane mechanism. but
2839 # would it be os x then? no...
2840 shift @args if $args[0] =~ /^-psn_/;
2841
2842 my $profile = 'default';
2843
2844 for (my $i = 0; $i < @args; $i++) {
2845 if ($args[$i] =~ /^--?profile$/) {
2846 $profile = $args[$i + 1];
2847 splice @args, $i, 2, ();
2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2852 }
2853 }
2854
2855 $CFG->{profile}{$profile} ||= {};
2677 $PROFILE = $CFG->{profile}{default}; 2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2858
2859 $PROFILE->{host} = $args[0] if @args > 0;
2860 $PROFILE->{user} = $args[1] if @args > 1;
2861 $PROFILE->{password} = $args[2] if @args > 2;
2678 2862
2679 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2680 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2681 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2682 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2686 }; 2870 };
2687 } 2871 }
2688 } 2872 }
2689 } 2873 }
2690 2874
2691 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2692 2877
2693 { 2878 {
2694 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2695 DejaVuSans.ttf 2880 DejaVuSans.ttf
2696 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
… …
2698 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2699 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2700 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2701 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2702 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2703 ); 2889 );
2704 2890
2705 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2706 2892
2707 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2708 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2709 2895
2710 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2711 2897
… …
2734 our $STARTUP_CANCEL = EV::idle sub { 2920 our $STARTUP_CANCEL = EV::idle sub {
2735 undef $::STARTUP_CANCEL; 2921 undef $::STARTUP_CANCEL;
2736 $startup_done->(); 2922 $startup_done->();
2737 }; 2923 };
2738 2924
2925 debug_toggle 0;
2926
2739 delete $SIG{__DIE__}; 2927 delete $SIG{__DIE__};
2740 EV::loop; 2928 EV::loop;
2741 2929
2930 DC::write_cfg if $CFG->{config_autosave};
2931
2742#video_shutdown; 2932 #video_shutdown;
2743#audio_shutdown; 2933 #audio_shutdown;
2934
2744 DC::OpenGL::quit; 2935 DC::OpenGL::quit;
2745 DC::SDL_Quit; 2936 DC::SDL_Quit;
2746 DC::DB::Server::stop; 2937 DC::DB::Server::stop;
2747} 2938}
2748 2939
… …
2752 2943
2753deliantra - A Deliantra MORPG game client 2944deliantra - A Deliantra MORPG game client
2754 2945
2755=head1 SYNOPSIS 2946=head1 SYNOPSIS
2756 2947
2757Just run it - no commandline arguments are supported. 2948 deliantra [--profile name] [host [user [password]]]
2949 deliantra --help
2758 2950
2759=head1 USAGE 2951=head1 USAGE
2760 2952
2761deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2953The deliantra client utilises OpenGL for all UI elements and the game. It
2762be used in fullscreen mode and interactively. 2954is supposed to be used in fullscreen mode and interactively.
2763 2955
2764=head1 DEBUGGING 2956=head1 DEBUGGING
2765 2957
2766
2767CFPLUS_DEBUG - environment variable 2958DELIANTRA_DEBUG - environment variable
2768 2959
2769 1 draw borders around widgets 2960 1 draw borders around widgets
2770 2 add low-level widget info to tooltips 2961 2 add low-level widget info to tooltips
2771 4 show fps 2962 4 show fps
2772 8 suppress tooltips 2963 8 suppress tooltips
2964 16 show bandwidth downstream
2773 2965
2774=head1 AUTHOR 2966=head1 AUTHOR
2775 2967
2776Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2968Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2777 2969

Diff Legend

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