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.67 by root, Mon Sep 1 10:00:29 2008 UTC vs.
Revision 1.96 by root, Mon Jul 27 23:08:41 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
… …
106 89
107use Deliantra; 90use Deliantra;
108use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
109 92
110use AnyEvent::Util (); 93use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
113 96
114use Compress::LZF; 97use Compress::LZF;
115use JSON::XS; 98use JSON::XS;
116 99
117use DC; 100use DC;
… …
121} 104}
122 105
123BEGIN { 106BEGIN {
124 $SIG{__DIE__} = sub { 107 $SIG{__DIE__} = sub {
125 return if $^S; 108 return if $^S;
126 crash ("CRASH/DIE: $_[0]" => 1); 109 crash "CRASH/DIE: $_[0]" => 1;
127 DC::fatal Carp::longmess "$_[0]"; 110 DC::fatal Carp::longmess "$_[0]";
128 } 111 }
129} 112}
130 113
131use DC::OpenGL (); 114use DC::OpenGL ();
… …
145 128
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
148 131
149$EV::DIED = sub { 132$EV::DIED = sub {
150 crash ("CRASH/EV::DIED: $@" => 1); 133 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
152}; 135};
153 136
154my $MAX_FPS = 60; 137my $MAX_FPS = 60;
155 138
… …
181 164
182our $MAP; 165our $MAP;
183our $MAPMAP; 166our $MAPMAP;
184our $MAPWIDGET; 167our $MAPWIDGET;
185our $COMPLETER; 168our $COMPLETER;
186our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
187our $METASERVER; 173our $METASERVER;
188our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 175our $QUIT_DIALOG;
190our $HOST_ENTRY; 176our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 203our $FLOORBOX;
218our $GAUGES; 204our $GAUGES;
219our $STATWIDS; 205our $STATWIDS;
220 206
221our $SDL_ACTIVE; 207our $SDL_ACTIVE;
222our %SDL_CB; 208our @SDL_CB;
223 209
224our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 211our $STATUSBOX;
226our $MODBOX; 212our $MODBOX;
227our $DEBUG_STATUS; 213our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 221# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 222# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 223*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 224 my ($msg, $backtrace) = @_;
239 225
226 warn $msg;
227
240 return unless $CONN; 228 return unless $CONN;
241 229
242 my $fh = $CONN->{fh} 230 my $fh = $CONN->{fh}
243 or return; 231 or return;
244 232
245 my $buf = delete $CONN->{wbuf}; 233 my $buf = delete $CONN->{wbuf};
246 234
247 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000]; 235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
248 236
249 AnyEvent::Util::fh_nonblocking $fh, 0; 237 AnyEvent::Util::fh_nonblocking $fh, 0;
250
251 syswrite $fh, $buf; 238 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1; 239 AnyEvent::Util::fh_nonblocking $fh, 1;
253 240
254 $msg =~ s/\s+$//; 241 $msg =~ s/\s+$//;
255 242
256 # backtrace as second step, in case it crashes, too 243 # backtrace as second step, in case it crashes, too
257 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") 244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace; 245 if $backtrace;
259}; 246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
260 258
261############################################################################# 259#############################################################################
262 260
263sub status { 261sub status {
264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
346 or return; 344 or return;
347 345
348 $meta->{data} 346 $meta->{data}
349 or return; 347 or return;
350 348
351 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
352 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
354 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
355 &audio_music_push ($face); 353 &audio_music_push ($face);
356 } 354 }
357 } else { 355 } else {
358 # fetch from database 356 # fetch from database
359 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
360 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
361 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
363 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
364 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
365 363
366 audio_sound_push ($face); 364 audio_sound_push ($face);
367 }; 365 };
… …
414 412
415 audio_music_update_volume; 413 audio_music_update_volume;
416 414
417 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
418 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
419 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
420 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
421 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
422 423
423 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
424 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
425 426
426 my $NOW = time; 427 my $NOW = time;
427 428
428 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
429 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
547 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
548 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
549 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
550 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
551 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
552 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
553 undef $SDL_MIXER; 556 undef $SDL_MIXER;
554} 557}
555 558
556############################################################################# 559#############################################################################
… …
787} 790}
788 791
789sub dc_connect { 792sub dc_connect {
790 my ($host, $port) = @_; 793 my ($host, $port) = @_;
791 794
792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
793 797
794 $CONN = 798 $CONN =
795 new DC::Protocol 799 new DC::Protocol
796 host => $host, 800 host => $host,
797 port => $port, 801 port => $port,
798 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
800 mapw => $mapsize, 804 mapw => $mapw,
801 maph => $mapsize, 805 maph => $maph,
802 806
803 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
804 808
805 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
814 818
815 on_connect => sub { 819 on_connect => sub {
816 if ($_[0]) { 820 if ($_[0]) {
817 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
818 822
819 status "login successful"; 823 status "successfully connected to the server";
820 } else { 824 } else {
821 undef $CONN; 825 undef $CONN;
822 status "unable to connect: $!"; 826 status "unable to connect: $!";
823 stop_game(); 827 stop_game();
824 } 828 }
… …
839 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
844 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
846 } 854 }
847 855
848 dc_connect $host, $port; 856 dc_connect $host, $port;
849 }; 857 };
850 } else { 858 } else {
… …
876} 884}
877 885
878sub graphics_setup { 886sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
880 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
881 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 892 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
882 893
883 my $row = 0; 894 my $row = 0;
884 895
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 896 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
886 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 897 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
887 can_events => 1, 898 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 900
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
891 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 902 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1, 903 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as " 904 tooltip => "This field shows any known issues with your config or driver, such as "
894 . "a non-accelerated display format. You can try to work around these issues " 905 . "a non-accelerated display format. You can try to work around these issues "
895 . "by selecting a different video mode, changing the settings below or " 906 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 907 . "by installing the right driver for your graphics card.");
897 908
909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
910 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
911 value => $CFG->{uitheme},
912 options => [
913 [wood => "Wood (the default)"],
914 [plain => "Plain (very)"],
915 [blue => "Blue (dark)"],
916 [metal => "Metal (light)"],
917 ],
918 tooltip => "Choose the User Interface theme that you like most :)",
919 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
920 );
921
898 my $vidmode_tooltip = 922 my $vidmode_tooltip =
899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 923 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
900 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 924 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
901 925
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 928
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
930 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 931 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 932 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
912 937
913 $MODE_SLIDER->connect (changed => sub { 938 $MODE_SLIDER->connect (changed => sub {
914 my ($self, $value) = @_;
915
916 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
917 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
918 });
919 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
920
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
923 state => $CFG->{fullscreen},
924 tooltip => "Bring the client into fullscreen mode.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
926 );
927
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
929 $table->add_at (1, $row++, new DC::UI::CheckBox
930 state => $CFG->{force_opengl11},
931 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
932 . "higher memory usage and slower performance. It will, however, help tremendously on "
933 . "cards that claim to support a feature but fall back to software rendering. "
934 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
935 . "but cards and drivers from other vendors (ATI) are often just as bad. "
936 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
937 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{disable_alpha},
943 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
944 . "by disabling a number of textures and transparency effects. Normally, these "
945 . "effects do not cost a lot of resources, but some graphics cards might fall "
946 . "back to etxremely slow rendering if this is enabled. If disabling this option "
947 . "noticably improves the framerate of the client please report this! "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub {
950 my ($self, $value) = @_; 939 my ($self, $value) = @_;
940
941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
942 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
943 });
944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
945
946 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
948 state => $CFG->{fullscreen},
949 tooltip => "Bring the client into fullscreen mode.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
951 );
952
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
954 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{force_opengl11},
956 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
957 . "higher memory usage and slower performance. It will, however, help tremendously on "
958 . "cards that claim to support a feature but fall back to software rendering. "
959 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
960 . "but cards and drivers from other vendors (ATI) are often just as bad. "
961 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{disable_alpha},
968 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
969 . "by disabling a number of textures and transparency effects. Normally, these "
970 . "effects do not cost a lot of resources, but some graphics cards might fall "
971 . "back to extremely slow rendering if this is enabled. If disabling this option "
972 . "noticably improves the framerate of the client please report this! "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub {
975 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value; 976 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 977 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
978 0
953 0 979 }
954 } 980 );
955 );
956 981
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 985 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
961 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 986 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
962 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 987 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
963 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 990 );
966 991
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 994 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 997 );
973 998
974 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
975 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
977 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1002 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
978 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1004 );
980 1005
981 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1009 on_activate => sub {
985 video_shutdown (); 1010 video_shutdown ();
986 video_init (); 1011 video_init ();
1012 0
987 0 1013 }
988 } 1014 );
989 ); 1015 }
990 1016
1017 {
1018 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1019
1020 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1021
1022 my $row = 0;
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1025 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1026 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
995 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1027 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.", 1028 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1030 );
999 1031
1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1005 ); 1037 );
1006 1038
1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
1010 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1042 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1011 . "This increases load on the graphics subsystem and works only with TRT servers. " 1043 . "This increases load on the graphics subsystem and works only with TRT servers. "
1012 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1046 );
1015 1047
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1017 $table->add_at (1, $row++, new DC::UI::CheckBox 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
1019 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1051 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1053 );
1022 1054
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1026 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1058 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1027 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1060 );
1029 1061
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1033 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1065 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1034 . "but you still need to press apply to correctly re-layout the widget.", 1066 . "but you still need to press apply to correctly re-layout the widget.",
1035 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1067 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1068 );
1037 1069
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1041 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1074 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
1045 0 1078 }
1046 } 1079 );
1047 );
1048 1080
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1084 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1085 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
1056 0 1089 }
1057 } 1090 );
1058 ); 1091 }
1059 1092
1060 $vbox 1093 $vbox
1061} 1094}
1062 1095
1063our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
… …
1226} 1259}
1227 1260
1228sub make_gauge_window { 1261sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1263
1231 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1265 force_x => 0,
1233 force_y => "max", 1266 force_y => "max",
1234 force_w => $WIDTH, 1267 force_w => $WIDTH,
1235 force_h => $gh, 1268 force_h => $gh,
1236 ); 1269 );
… …
1252 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1254 ], 1287 ],
1255 ); 1288 );
1256 1289
1257 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1258 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1291 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1259 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1292 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1260 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1293 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1261
1262 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1263 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1264 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1265 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1266
1267 $GAUGES = {
1268 exp => $exp, prg => $prg, sklprg => $sklprg,
1269 win => $win, range => $rng,
1270 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1271 };
1272 1294
1273 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1274 1296
1275 $win 1297 $win
1276} 1298}
… …
1618 ); 1640 );
1619 1641
1620 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1621 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1622 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1623 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1624 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1625 ); 1647 );
1626 1648
1627 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1628 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1730 1752
1731 my $row = 0; 1753 my $row = 0;
1732 1754
1733 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1734 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1736 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1737 on_changed => sub { 1760 on_changed => sub {
1738 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1741 } 1764 }
1742 ); 1765 );
1743 1766
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1745 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1746 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1748 . "sends more messages than this number, older messages get removed to save memory and " 1772 . "sends more messages than this number, older messages get removed to save memory and "
1749 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1750 on_changed => sub { 1774 on_changed => sub {
… …
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1777 0
1754 }, 1778 },
1755 ); 1779 );
1756 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1757 $table 1803 $table
1758} 1804}
1759 1805
1760sub autopickup_setup { 1806sub autopickup_setup {
1761 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1767 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1768 ); 1814 );
1769 1815
1770 for ( 1816 for (
1771 ["General", 0, 0, 1817 ["General", 0, 0,
1772 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1773 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1774 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1775 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1776 ], 1821 ],
1777 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1778 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1826 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1827 } else { 1872 } else {
1828 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1829 } 1874 }
1830 1875
1831 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1832 if defined $::CONN; 1877 if defined $::CONN;
1833 1878
1834 0 1879 0
1835 }); 1880 });
1836 1881
… …
1853 }); 1898 });
1854 1899
1855 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1856 text => "set", 1901 text => "set",
1857 on_activate => sub { 1902 on_activate => sub {
1858 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1859 if defined $::CONN; 1904 if defined $::CONN;
1860 0 1905 0
1861 }); 1906 });
1862 1907
1863 $r 1908 $r
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1978 } 2023 }
1979} 2024}
1980 2025
1981sub player_window { 2026sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2028 x => "center",
1984 y => "center", 2029 y => "center",
1985 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
2021 2066
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2068
2024 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
2025 $plwin
2026} 2070}
2027 2071
2028sub keyboard_setup { 2072sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
2030} 2074}
2031 2075
2032sub help_window { 2076sub make_help_window {
2033 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
2034 x => 'center', 2078 x => 'center',
2035 y => 'center', 2079 y => 'center',
2036 z => 4, 2080 z => 4,
2037 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2126 2170
2127 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2172 $win->show;
2129 }; 2173 };
2130 2174
2131 $win 2175 $HELP_WINDOW = $win;
2132}
2133
2134sub open_string_query {
2135 my ($title, $cb, $txt, $tooltip) = @_;
2136 my $dialog = new DC::UI::Toplevel
2137 x => "center",
2138 y => "center",
2139 z => 50,
2140 force_w => $WIDTH * 4/5,
2141 title => $title;
2142
2143 $dialog->add (
2144 my $e = new DC::UI::Entry
2145 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2146 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2147 tooltip => $tooltip
2148 );
2149
2150 $e->grab_focus;
2151 $e->set_text ($txt) if $txt;
2152 $dialog->show;
2153} 2176}
2154 2177
2155sub open_quit_dialog { 2178sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2213
2191 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2193} 2216}
2194 2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # 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
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2324}
2325
2195sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2196 # find all tips 2327 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2329
2199 DC::DB::get state => "tip_of_the_day", sub { 2330 DC::DB::get state => "tip_of_the_day", sub {
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2381 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2382 and die "SDL::Init failed!\n";
2252} 2383}
2253 2384
2254sub video_init { 2385sub video_init {
2386 DC::set_theme $CFG->{uitheme};
2387
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2388 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2389 $SDL_REINIT = 0;
2257 2390
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2391 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2392 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2396 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2397
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2398 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2399 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2400
2268 # now choose biggets mode <= 1024x768 2401 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2402 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2403 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2404 $CFG->{sdl_mode} = $_;
2272 } 2405 }
2273 } 2406 }
… …
2336 2469
2337 (new DC::UI::Frame 2470 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2472 force_x => 0,
2340 force_y => "max", 2473 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2475 )->show;
2343 2476
2344 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2347 align => 0, 2480 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2482 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2351 ); 2484 );
2352 2485
2353 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2354 title => "Minimap", 2487 title => "Minimap",
2355 name => "mapmap", 2488 name => "mapmap",
2356 x => 0, 2489 x => 0,
2357 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2358 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2361 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2495 ),
2363 )->show; 2496 )->show;
2364 2497
2365 $MAPWIDGET = new DC::MapWidget; 2498 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2499 $MAPWIDGET->connect (activate_console => sub {
… …
2391 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2393 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2", 2527 name => "message_window2",
2395 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2396 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2398 ; 2532 ;
2399 2533
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2420 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2421 . "binding editor closes"); 2555 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2424 2558
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2426 2561
2427 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2428 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2429
2430# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2431# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2432
2433 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
2434
2435 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2436 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2437
2438 $BUTTONBAR->add (new DC::UI::Button
2439 text => "Save Config",
2440 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2441 on_activate => sub {
2442 $::CFG->{layout} = DC::UI::get_layout;
2443 DC::write_cfg;
2444 status "Configuration Saved";
2445 0
2446 },
2447 );
2448
2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2450 tooltip => "View Documentation");
2451
2452 $BUTTONBAR->add (new DC::UI::Button
2453 text => "Quit",
2454 tooltip => "Terminates the program",
2455 on_activate => sub {
2456 if ($CONN) {
2457 open_quit_dialog;
2458 } else {
2459 EV::unloop EV::UNLOOP_ALL;
2460 }
2461 0
2462 },
2463 );
2464
2465 $BUTTONBAR->show;
2466 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2468 } 2564 }
2469 2565
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2568
2473 $CAVEAT_LABEL->set_text ("None :)"); 2569 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2570 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2571 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2506my $want_refresh = EV::prepare_ns \&force_refresh; 2602my $want_refresh = EV::prepare_ns \&force_refresh;
2507 2603
2508my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2604my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2509 $NOW = EV::now; 2605 $NOW = EV::now;
2510 2606
2511 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2607 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2512 for DC::poll_events; 2608 for DC::poll_events;
2513 2609
2514 if (%animate_object) { 2610 if (%animate_object) {
2515 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2611 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2516 $WANT_REFRESH = 1; 2612 $WANT_REFRESH = 1;
… …
2528sub animation_stop { 2624sub animation_stop {
2529 my ($widget) = @_; 2625 my ($widget) = @_;
2530 delete $animate_object{$widget}; 2626 delete $animate_object{$widget};
2531} 2627}
2532 2628
2533%SDL_CB = (
2534 DC::SDL_QUIT => sub { 2629$SDL_CB[DC::SDL_QUIT] = sub {
2535 crash "SDL_QUIT"; 2630 crash "SDL_QUIT";
2536 EV::unloop EV::UNLOOP_ALL; 2631 EV::unloop EV::UNLOOP_ALL;
2537 }, 2632};
2538 DC::SDL_VIDEORESIZE => sub { 2633$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2539 },
2540 DC::SDL_VIDEOEXPOSE => sub { 2634$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2541 DC::UI::full_refresh; 2635 DC::UI::full_refresh;
2542 }, 2636};
2543 DC::SDL_ACTIVEEVENT => sub { 2637$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2544# not useful, as APPACTIVE includes only iconified state, not unmapped 2638# not useful, as APPACTIVE includes only iconified state, not unmapped
2545# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2639# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2546# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2640# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2547# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2641# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2548# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2642# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2643# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2550 }, 2644};
2551 DC::SDL_KEYDOWN => sub { 2645$SDL_CB[DC::SDL_KEYDOWN] = sub {
2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2646 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2553 # alt-enter 2647 # alt-enter
2554 video_shutdown; 2648 video_shutdown;
2555 $FULLSCREEN_ENABLE->toggle; 2649 $FULLSCREEN_ENABLE->toggle;
2556 video_init; 2650 video_init;
2557 } else { 2651 } else {
2558 &DC::UI::feed_sdl_key_down_event; 2652 &DC::UI::feed_sdl_key_down_event;
2559 } 2653 }
2560 update_modbox; 2654 update_modbox;
2561 }, 2655};
2562 DC::SDL_KEYUP => sub { 2656$SDL_CB[DC::SDL_KEYUP] = sub {
2563 &DC::UI::feed_sdl_key_up_event; 2657 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox; 2658 update_modbox;
2565 }, 2659};
2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2660$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2661$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2662$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2569 DC::SDL_USEREVENT => sub { 2663$SDL_CB[DC::SDL_USEREVENT] = sub {
2570 if ($_[0]{code} == 1) { 2664 if ($_[0]{code} == 1) {
2571 audio_channel_finished $_[0]{data1}; 2665 audio_channel_finished $_[0]{data1};
2572 } elsif ($_[0]{code} == 0) { 2666 } elsif ($_[0]{code} == 0) {
2573 audio_music_finished; 2667 audio_music_finished;
2574 }
2575 }, 2668 }
2576); 2669};
2577 2670
2578############################################################################# 2671#############################################################################
2579 2672
2580$SIG{INT} = $SIG{TERM} = sub { 2673$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2674 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2675 #d# TODO calling exit here hangs the process in some futex
2583}; 2676};
2584 2677
2585# due to mac os x + sdl combined briandamage, we need this contortion 2678# due to mac os x + sdl combined braindamage, we need this contortion
2586sub main { 2679sub main {
2587 { 2680 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2681 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2682
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2683 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2700 DC::DB::open_db;
2608 2701
2609 DC::UI::set_layout ($::CFG->{layout}); 2702 DC::UI::set_layout ($::CFG->{layout});
2610 2703
2611 my %DEF_CFG = ( 2704 my %DEF_CFG = (
2705 config_autosave => 1,
2612 sdl_mode => undef, 2706 sdl_mode => undef,
2613 fullscreen => 1, 2707 fullscreen => 1,
2614 fast => 0, 2708 fast => 0,
2615 force_opengl11 => undef, 2709 force_opengl11 => undef,
2616 disable_alpha => 0, 2710 disable_alpha => 0,
… …
2634 effects_enable => 1, 2728 effects_enable => 1,
2635 effects_volume => 1, 2729 effects_volume => 1,
2636 bgm_enable => 1, 2730 bgm_enable => 1,
2637 bgm_volume => 0.5, 2731 bgm_volume => 0.5,
2638 output_rate => "", 2732 output_rate => "",
2639 pickup => 0, 2733 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2640 inv_sort => "mtime", 2734 inv_sort => "mtime",
2641 default => "profile", # default profile 2735 default => "profile", # default profile
2642 show_tips => 1, 2736 show_tips => 1,
2643 logview_max_par => 1000, 2737 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2738 shift_fire_stop => 0,
2739 uitheme => "wood",
2740 map_shift_x => -24, # arbitrary
2741 map_shift_y => +24, # arbitrary
2645 ); 2742 );
2646 2743
2647 while (my ($k, $v) = each %DEF_CFG) { 2744 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2745 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2746 }
… …
2663 } 2760 }
2664 } 2761 }
2665 2762
2666 sdl_init; 2763 sdl_init;
2667 2764
2765 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2766 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2767
2668 { 2768 {
2669 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2769 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2670 DejaVuSans.ttf 2770 DejaVuSans.ttf
2671 DejaVuSansMono.ttf 2771 DejaVuSansMono.ttf
2672 DejaVuSans-Bold.ttf 2772 DejaVuSans-Bold.ttf
2673 DejaVuSansMono-Bold.ttf 2773 DejaVuSansMono-Bold.ttf
2674 DejaVuSans-Oblique.ttf 2774 DejaVuSans-Oblique.ttf
2675 DejaVuSansMono-Oblique.ttf 2775 DejaVuSansMono-Oblique.ttf
2676 DejaVuSans-BoldOblique.ttf 2776 DejaVuSans-BoldOblique.ttf
2677 DejaVuSansMono-BoldOblique.ttf 2777 DejaVuSansMono-BoldOblique.ttf
2778 mona.ttf
2678 ); 2779 );
2679 2780
2680 DC::add_font $_ for @fonts; 2781 DC::add_font $_ for @fonts;
2681 2782
2682 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2783 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2712 }; 2813 };
2713 2814
2714 delete $SIG{__DIE__}; 2815 delete $SIG{__DIE__};
2715 EV::loop; 2816 EV::loop;
2716 2817
2818 DC::write_cfg if $CFG->{config_autosave};
2819
2717#video_shutdown; 2820 #video_shutdown;
2718#audio_shutdown; 2821 #audio_shutdown;
2822
2719 DC::OpenGL::quit; 2823 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2824 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2825 DC::DB::Server::stop;
2722} 2826}
2723 2827

Diff Legend

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