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.82 by root, Wed Dec 24 04:09:27 2008 UTC vs.
Revision 1.117 by root, Tue Aug 31 14:31:50 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 ();
94use AnyEvent::DNS ();
93 95
94use Compress::LZF; 96use Compress::LZF;
95use JSON::XS; 97use JSON::XS;
96 98
97use DC; 99use DC;
… …
131 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
132}; 134};
133 135
134my $MAX_FPS = 60; 136my $MAX_FPS = 60;
135 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 141
138our $LAST_REFRESH; 142our $LAST_REFRESH;
139our $NOW; 143our $NOW;
140 144
141our $CFG; 145our $CFG;
142our $PROFILE; # current profile 146our $PROFILE; # current profile
143our $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;
144 149
145our $WANT_REFRESH; 150our $WANT_REFRESH;
146 151
147our $MODE_SLIDER; 152our $MODE_SLIDER;
148our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
… …
161 166
162our $MAP; 167our $MAP;
163our $MAPMAP; 168our $MAPMAP;
164our $MAPWIDGET; 169our $MAPWIDGET;
165our $COMPLETER; 170our $COMPLETER;
166our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
167our $METASERVER; 175our $METASERVER;
168our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 177our $QUIT_DIALOG;
170our $HOST_ENTRY; 178our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
197our $FLOORBOX; 205our $FLOORBOX;
198our $GAUGES; 206our $GAUGES;
199our $STATWIDS; 207our $STATWIDS;
200 208
201our $SDL_ACTIVE; 209our $SDL_ACTIVE;
202our %SDL_CB; 210our @SDL_CB;
203 211
204our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 213our $STATUSBOX;
206our $MODBOX; 214our $MODBOX;
207our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
338 or return; 346 or return;
339 347
340 $meta->{data} 348 $meta->{data}
341 or return; 349 or return;
342 350
343 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
344 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
345 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
346 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
347 &audio_music_push ($face); 355 &audio_music_push ($face);
348 } 356 }
349 } else { 357 } else {
350 # fetch from database 358 # fetch from database
351 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
352 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
353 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
354 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;
355 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
356 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
357 365
358 audio_sound_push ($face); 366 audio_sound_push ($face);
359 }; 367 };
… …
406 414
407 audio_music_update_volume; 415 audio_music_update_volume;
408 416
409 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
410 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
411 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
412 ? 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
413 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
414 425
415 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
416 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;
417 428
… …
507 audio_music_push; 518 audio_music_push;
508} 519}
509 520
510sub audio_init { 521sub audio_init {
511 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
512 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
513 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
514 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
515 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
516 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
… …
530 sub audio_tab_update; 550 sub audio_tab_update;
531 audio_tab_update; 551 audio_tab_update;
532} 552}
533 553
534sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
535 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
536 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
537 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
538 563
539 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
… …
541 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
542 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
543 568
544 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
545 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
546} 573}
547 574
548############################################################################# 575#############################################################################
549 576
550sub destroy_query_dialog { 577sub destroy_query_dialog {
… …
791 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
792 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
793 mapw => $mapw, 820 mapw => $mapw,
794 maph => $maph, 821 maph => $maph,
795 822
823 c_version => {
824 client => "deliantra",
796 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
797 829
798 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
799 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
800 map => $MAP, 832 map => $MAP,
801 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
… …
807 839
808 on_connect => sub { 840 on_connect => sub {
809 if ($_[0]) { 841 if ($_[0]) {
810 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
811 843
812 status "login successful"; 844 status "successfully connected to the server";
813 } else { 845 } else {
814 undef $CONN; 846 undef $CONN;
815 status "unable to connect: $!"; 847 status "unable to connect: $!";
816 stop_game(); 848 stop_game();
817 } 849 }
… …
819 ; 851 ;
820} 852}
821 853
822sub start_game { 854sub start_game {
823 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.";
824 860
825 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
826 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
827
828 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
829 863
830 $MAP = new DC::Map; 864 $MAP = new DC::Map;
831 865
832 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
833 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
834 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
835 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
836 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) {
837 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
838 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
839 } 877 }
840 878
841 dc_connect $host, $port; 879 dc_connect $host, $port;
842 }; 880 };
843 } else { 881 } else {
… …
910 948
911 $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");
912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
913 951
914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
915 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
916 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
917 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
918 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
919 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
… …
1011 . "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, "
1012 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1014 ); 1053 );
1015 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
1016 $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");
1017 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1020 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 }
… …
1032 $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");
1033 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
1034 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
1035 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.",
1036 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 }
1037 ); 1101 );
1038 1102
1039 $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");
1040 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1092 ]); 1156 ]);
1093 1157
1094 my $text = !$freq 1158 my $text = !$freq
1095 ? "audio is off" 1159 ? "audio is off"
1096 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1097 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1098 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1099 1166
1100 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1101} 1168}
1102 1169
1103sub audio_setup { 1170sub audio_setup {
… …
1106 $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]);
1107 1174
1108 my $row = 0; 1175 my $row = 0;
1109 1176
1110 $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");
1111 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1112 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1113 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.",
1114 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 }
1115 ); 1195 );
1116 1196
1117 $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");
1118 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1119 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
… …
1132 ); 1212 );
1133 1213
1134 $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");
1135 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1136 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1137 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.",
1138 on_changed => sub { 1218 on_changed => sub {
1139 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1140 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1141 audio_music_push; 1221 audio_music_push;
1142 1 1222 1
… …
1153 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1154 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1155 options => [ 1235 options => [
1156 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1157 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1158 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1159 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1160 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1161 ], 1241 ],
1162 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.",
1163 on_changed => sub { 1243 on_changed => sub {
1164 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1165 audio_tab_update; 1245 audio_tab_update;
… …
1189 $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");
1190 $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
1191 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1192 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1193 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 "
1194 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1195 on_changed => sub { 1275 on_changed => sub {
1196 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1197 audio_tab_update; 1277 audio_tab_update;
1198 1 1278 1
1199 } 1279 }
… …
1243} 1323}
1244 1324
1245sub make_gauge_window { 1325sub make_gauge_window {
1246 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1247 1327
1248 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1249 force_x => 0, 1329 force_x => 0,
1250 force_y => "max", 1330 force_y => "max",
1251 force_w => $WIDTH, 1331 force_w => $WIDTH,
1252 force_h => $gh, 1332 force_h => $gh,
1253 ); 1333 );
… …
1269 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1270 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1271 ], 1351 ],
1272 ); 1352 );
1273 1353
1274 $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");
1275 $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");
1276 $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");
1277 $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");
1278
1279 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1280 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1281 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1282 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1283
1284 $GAUGES = {
1285 exp => $exp, prg => $prg, sklprg => $sklprg,
1286 win => $win, range => $rng,
1287 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1288 };
1289 1358
1290 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1291 1360
1292 $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
1293} 1379}
1294 1380
1295sub debug_setup { 1381sub debug_setup {
1296 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1297 1383
1298 $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");
1299 $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 });
1300 $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");
1301 $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 });
1302 $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");
1303 $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 });
1304 $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");
1305 $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
1306 $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() } );
1307
1308 $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#
1309 1397
1310 $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);
1311 $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);
1312 $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 );
1313 $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);
… …
1434 para => ["Paralysation", 1522 para => ["Paralysation",
1435 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1436 deat => ["Death", 1524 deat => ["Death",
1437 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1438 phys => ["Physical", 1526 phys => ["Physical",
1439 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], 1527 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
1440 blind => ["Blind", 1528 blind => ["Blind",
1441 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1529 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1442 fear => ["Fear", 1530 fear => ["Fear",
1443 "<b>Fear</b> (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)"], 1531 "<b>Fear</b> (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)"],
1444 tund => ["Turn undead", 1532 tund => ["Turn undead",
… …
1634 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]),
1635 ); 1723 );
1636 1724
1637 $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");
1638 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1639 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1640 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1641 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1642 ); 1730 );
1643 1731
1644 $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");
1645 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1646 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1647 hidden => 1, 1735 hidden => 1,
1648 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1649 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1650 ); 1738 );
1651 1739
1652 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1653 expand => 1, 1741 expand => 1,
1654 text => "Login / Register", 1742 text => "Login / Register",
… …
1690 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1691 1779
1692 $vbox->add ( 1780 $vbox->add (
1693 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1694 expand => 1, 1782 expand => 1,
1695 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1696 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>)",
1697 on_changed => sub { 1785 on_changed => sub {
1698 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1699 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1700 1 1788 1
1701 } 1789 }
1702 ); 1790 );
1703 1791
1704 if (0) { #d# disabled 1792 if (0) { #d# disabled
… …
1747 1835
1748 my $row = 0; 1836 my $row = 0;
1749 1837
1750 $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");
1751 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1752 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1753 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?",
1754 on_changed => sub { 1843 on_changed => sub {
1755 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1756 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
… …
1758 } 1847 }
1759 ); 1848 );
1760 1849
1761 $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");
1762 $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,
1763 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1764 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 "
1765 . "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 "
1766 . "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.",
1767 on_changed => sub { 1857 on_changed => sub {
… …
1769 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1770 0 1860 0
1771 }, 1861 },
1772 ); 1862 );
1773 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
1774 $table 1886 $table
1775} 1887}
1776 1888
1777sub autopickup_setup { 1889sub autopickup_setup {
1778 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
… …
1784 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1785 ); 1897 );
1786 1898
1787 for ( 1899 for (
1788 ["General", 0, 0, 1900 ["General", 0, 0,
1789 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1790 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1791 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1792 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1793 ], 1904 ],
1794 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1795 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
… …
1843 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1844 } else { 1955 } else {
1845 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1846 } 1957 }
1847 1958
1848 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1849 if defined $::CONN; 1960 if defined $::CONN;
1850 1961
1851 0 1962 0
1852 }); 1963 });
1853 1964
… …
1870 }); 1981 });
1871 1982
1872 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1873 text => "set", 1984 text => "set",
1874 on_activate => sub { 1985 on_activate => sub {
1875 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1876 if defined $::CONN; 1987 if defined $::CONN;
1877 0 1988 0
1878 }); 1989 });
1879 1990
1880 $r 1991 $r
1881} 1992}
1882 1993
1883my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1884 type => sub { 1995 type => sub {
1996 use sort 'stable';
1885 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1886 }, 1998 },
1887 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1888 my $NOW = time; 2001 my $NOW = time;
1889 sort { 2002 sort {
1890 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;
1891 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;
1892 2005
1893 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1894 or $btime <=> $atime 2007 or $btime <=> $atime
1895 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1896 } @_ 2009 } @_
1897 }, 2010 },
1898 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1899 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1900 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1901 } @_ }, 2016 } @_
2017 },
1902); 2018);
1903 2019
1904sub inventory_widget { 2020sub inventory_widget {
1905 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1906 2022
… …
1993 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1994 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1995 } 2111 }
1996} 2112}
1997 2113
1998sub player_window { 2114sub make_playerbook {
1999 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2000 x => "center", 2116 x => "center",
2001 y => "center", 2117 y => "center",
2002 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
2003 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
… …
2037 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
2038 2154
2039 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
2040 2156
2041 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
2042 $plwin
2043} 2158}
2044 2159
2045sub keyboard_setup { 2160sub keyboard_setup {
2046 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
2047} 2162}
2048 2163
2049sub help_window { 2164sub make_help_window {
2050 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
2051 x => 'center', 2166 x => 'center',
2052 y => 'center', 2167 y => 'center',
2053 z => 4, 2168 z => 4,
2054 name => 'doc_browser', 2169 name => 'doc_browser',
… …
2143 2258
2144 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2145 $win->show; 2260 $win->show;
2146 }; 2261 };
2147 2262
2148 $win 2263 $HELP_WINDOW = $win;
2149}
2150
2151sub open_string_query {
2152 my ($title, $cb, $txt, $tooltip) = @_;
2153 my $dialog = new DC::UI::Toplevel
2154 x => "center",
2155 y => "center",
2156 z => 50,
2157 force_w => $WIDTH * 4/5,
2158 title => $title;
2159
2160 $dialog->add (
2161 my $e = new DC::UI::Entry
2162 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2163 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2164 tooltip => $tooltip
2165 );
2166
2167 $e->grab_focus;
2168 $e->set_text ($txt) if $txt;
2169 $dialog->show;
2170} 2264}
2171 2265
2172sub open_quit_dialog { 2266sub open_quit_dialog {
2173 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2174 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2207 2301
2208 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2209 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2210} 2304}
2211 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
2212sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2213 # find all tips 2415 # find all tips
2214 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2215 2417
2216 DC::DB::get state => "tip_of_the_day", sub { 2418 DC::DB::get state => "tip_of_the_day", sub {
… …
2261 2463
2262 $dialog->show; 2464 $dialog->show;
2263 }; 2465 };
2264} 2466}
2265 2467
2266sub sdl_init {
2267 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2268 and die "SDL::Init failed!\n";
2269}
2270
2271sub video_init { 2468sub video_init {
2272 DC::set_theme $CFG->{uitheme}; 2469 DC::set_theme $CFG->{uitheme};
2273 2470
2274 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
… …
2334 2531
2335 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2336 padding => 0, 2533 padding => 0,
2337 z => 100, 2534 z => 100,
2338 force_x => "max", 2535 force_x => "max",
2339 force_y => 0; 2536 force_y => 20;
2340 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2341 2538
2342 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2343 2540
2344 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
… …
2355 2552
2356 (new DC::UI::Frame 2553 (new DC::UI::Frame
2357 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2358 force_x => 0, 2555 force_x => 0,
2359 force_y => "max", 2556 force_y => "max",
2360 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2361 )->show; 2558 )->show;
2362 2559
2363 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2364 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2365 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2366 align => 0, 2563 align => 0,
2367 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2368 fontsize => 0.5, 2565 fontsize => 0.5,
2369 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2370 ); 2567 );
2371 2568
2372 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2373 title => "Minimap", 2570 title => "Minimap",
2374 name => "mapmap", 2571 name => "mapmap",
2375 x => 0, 2572 x => 0,
2376 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2377 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2378 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2379 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2380 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.",
2381 ), 2578 ),
… …
2410 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2411 # 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
2412 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2413 name => "message_window2", 2610 name => "message_window2",
2414 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2415 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2416 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2417 ; 2615 ;
2418 2616
2419 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2439 . "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 "
2440 . "binding editor closes"); 2638 . "binding editor closes");
2441 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2442 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2443 2641
2444 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2445 2644
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2447 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2448
2449# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2450# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2451
2452 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
2453
2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2455 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2456
2457 $BUTTONBAR->add (new DC::UI::Button
2458 text => "Save Config",
2459 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2460 on_activate => sub {
2461 $::CFG->{layout} = DC::UI::get_layout;
2462 DC::write_cfg;
2463 status "Configuration Saved";
2464 0
2465 },
2466 );
2467
2468 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2469 tooltip => "View Documentation");
2470
2471 $BUTTONBAR->add (new DC::UI::Button
2472 text => "Quit",
2473 tooltip => "Terminates the program",
2474 on_activate => sub {
2475 if ($CONN) {
2476 open_quit_dialog;
2477 } else {
2478 EV::unloop EV::UNLOOP_ALL;
2479 }
2480 0
2481 },
2482 );
2483
2484 $BUTTONBAR->show;
2485 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2486 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2487 } 2647 }
2488 2648
2489 $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]);
2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2491 2651
2492 $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;
2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2495 2657
2496 $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]);
2497} 2659}
… …
2507my $animate_timer; 2669my $animate_timer;
2508 2670
2509my $fps = 9; 2671my $fps = 9;
2510 2672
2511sub force_refresh { 2673sub force_refresh {
2512 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2513 $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;
2514 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2515 } 2677 }
2516 2678
2517 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
… …
2525my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2526 2688
2527my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2528 $NOW = EV::now; 2690 $NOW = EV::now;
2529 2691
2530 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2531 for DC::poll_events; 2693 for DC::poll_events;
2532 2694
2533 if (%animate_object) { 2695 if (%animate_object) {
2534 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2535 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
… …
2547sub animation_stop { 2709sub animation_stop {
2548 my ($widget) = @_; 2710 my ($widget) = @_;
2549 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2550} 2712}
2551 2713
2552%SDL_CB = (
2553 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2554 crash "SDL_QUIT"; 2715 crash "SDL_QUIT";
2555 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2556 }, 2717};
2557 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2558 },
2559 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2560 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2561 }, 2721};
2562 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2563# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2564# 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#
2565# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2566# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2567# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2568# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2569 }, 2729};
2570 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2571 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2572 # alt-enter 2732 # alt-enter
2573 video_shutdown; 2733 video_shutdown;
2574 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2575 video_init; 2735 video_init;
2576 } else { 2736 } else {
2577 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2578 } 2738 }
2579 update_modbox; 2739 update_modbox;
2580 }, 2740};
2581 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2582 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2583 update_modbox; 2743 update_modbox;
2584 }, 2744};
2585 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2586 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2587 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2588 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2589 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2590 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2591 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2592 audio_music_finished; 2752 audio_music_finished;
2593 }
2594 }, 2753 }
2595); 2754};
2596 2755
2597############################################################################# 2756#############################################################################
2598 2757
2599$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2600 EV::unloop; 2759 EV::unloop;
2601 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2602}; 2761};
2603 2762
2604# due to mac os x + sdl combined briandamage, we need this contortion 2763# due to mac os x + sdl combined braindamage, we need this contortion
2605sub main { 2764sub main {
2606 { 2765 {
2607 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2608 2767
2609 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2626 DC::DB::open_db; 2785 DC::DB::open_db;
2627 2786
2628 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2629 2788
2630 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2631 sdl_mode => undef, 2791 sdl_mode => undef,
2632 fullscreen => 1, 2792 fullscreen => 1,
2633 fast => 0, 2793 fast => 0,
2634 force_opengl11 => undef, 2794 force_opengl11 => undef,
2635 disable_alpha => 0, 2795 disable_alpha => 0,
2636 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2637 texture_compression => 1, 2798 texture_compression => 1,
2638 map_scale => 1, 2799 map_scale => 1,
2639 fow_enable => 1, 2800 fow_enable => 1,
2640 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2641 map_smoothing => 1, 2803 map_smoothing => 1,
2642 gui_fontsize => 1, 2804 gui_fontsize => 1,
2643 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2644 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2645 gauge_size => 0.35, 2807 gauge_size => 0.35,
… …
2653 effects_enable => 1, 2815 effects_enable => 1,
2654 effects_volume => 1, 2816 effects_volume => 1,
2655 bgm_enable => 1, 2817 bgm_enable => 1,
2656 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2657 output_rate => "", 2819 output_rate => "",
2658 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2659 inv_sort => "mtime", 2821 inv_sort => "mtime",
2660 default => "profile", # default profile 2822 default => "profile", # default profile
2661 show_tips => 1, 2823 show_tips => 1,
2662 logview_max_par => 1000, 2824 logview_max_par => 1000,
2663 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2664 uitheme => "wood", 2826 uitheme => "wood",
2665 ); 2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2666 2829 );
2830
2667 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2668 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2669 } 2833 }
2670 2834
2671 $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} ||= {};
2672 $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;
2673 2862
2674 # convert old bindings (only default profile matters) 2863 # convert old bindings (only default profile matters)
2675 if (my $bindings = delete $PROFILE->{bindings}) { 2864 if (my $bindings = delete $PROFILE->{bindings}) {
2676 while (my ($mod, $syms) = each %$bindings) { 2865 while (my ($mod, $syms) = each %$bindings) {
2677 while (my ($sym, $cmds) = each %$syms) { 2866 while (my ($sym, $cmds) = each %$syms) {
… …
2681 }; 2870 };
2682 } 2871 }
2683 } 2872 }
2684 } 2873 }
2685 2874
2686 sdl_init; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2687 2877
2688 { 2878 {
2689 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2690 DejaVuSans.ttf 2880 DejaVuSans.ttf
2691 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
… …
2693 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2694 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2695 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2696 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2697 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2698 ); 2889 );
2699 2890
2700 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2701 2892
2702 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2703 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2704 2895
2705 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2706 2897
… …
2718# } 2909# }
2719# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2720# warn $t2-$t1; 2911# warn $t2-$t1;
2721# } 2912# }
2722 2913
2914 DC::IMG_Init;
2723 video_init; 2915 video_init;
2724 audio_init; 2916 audio_init;
2725 } 2917 }
2726 2918
2727 show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
… …
2729 our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2730 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2731 $startup_done->(); 2923 $startup_done->();
2732 }; 2924 };
2733 2925
2926 debug_toggle 0;
2927
2734 delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2735 EV::loop; 2929 EV::loop;
2736 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2737#video_shutdown; 2933 #video_shutdown;
2738#audio_shutdown; 2934 #audio_shutdown;
2935
2739 DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2740 DC::SDL_Quit; 2937 DC::SDL_Quit;
2741 DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2742} 2939}
2743 2940
… …
2747 2944
2748deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2749 2946
2750=head1 SYNOPSIS 2947=head1 SYNOPSIS
2751 2948
2752Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2753 2951
2754=head1 USAGE 2952=head1 USAGE
2755 2953
2756deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2954The deliantra client utilises OpenGL for all UI elements and the game. It
2757be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2758 2956
2759=head1 DEBUGGING 2957=head1 DEBUGGING
2760 2958
2761
2762CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2763 2960
2764 1 draw borders around widgets 2961 1 draw borders around widgets
2765 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2766 4 show fps 2963 4 show fps
2767 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2768 2966
2769=head1 AUTHOR 2967=head1 AUTHOR
2770 2968
2771Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2772 2970

Diff Legend

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