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.76 by root, Wed Sep 3 12:50:43 2008 UTC vs.
Revision 1.99 by root, Tue Dec 22 00:35:44 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;
… …
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;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
155 140
156our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
157 142
158our $LAST_REFRESH; 143our $LAST_REFRESH;
159our $NOW; 144our $NOW;
… …
181 166
182our $MAP; 167our $MAP;
183our $MAPMAP; 168our $MAPMAP;
184our $MAPWIDGET; 169our $MAPWIDGET;
185our $COMPLETER; 170our $COMPLETER;
186our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
187our $METASERVER; 175our $METASERVER;
188our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 177our $QUIT_DIALOG;
190our $HOST_ENTRY; 178our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 205our $FLOORBOX;
218our $GAUGES; 206our $GAUGES;
219our $STATWIDS; 207our $STATWIDS;
220 208
221our $SDL_ACTIVE; 209our $SDL_ACTIVE;
222our %SDL_CB; 210our @SDL_CB;
223 211
224our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 213our $STATUSBOX;
226our $MODBOX; 214our $MODBOX;
227our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 225*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
239 227
228 warn $msg;
229
240 return unless $CONN; 230 return unless $CONN;
241 231
242 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
243 or return; 233 or return;
244 234
… …
254 244
255 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 247 if $backtrace;
258}; 248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
259 260
260############################################################################# 261#############################################################################
261 262
262sub status { 263sub status {
263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
345 or return; 346 or return;
346 347
347 $meta->{data} 348 $meta->{data}
348 or return; 349 or return;
349 350
350 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 355 &audio_music_push ($face);
355 } 356 }
356 } else { 357 } else {
357 # fetch from database 358 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
364 365
365 audio_sound_push ($face); 366 audio_sound_push ($face);
366 }; 367 };
… …
413 414
414 audio_music_update_volume; 415 audio_music_update_volume;
415 416
416 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
417 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
418 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
421 425
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 428
425 my $NOW = time; 429 my $NOW = time;
426 430
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
546 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
547 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
548 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
549 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
550 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
551 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
552 undef $SDL_MIXER; 558 undef $SDL_MIXER;
553} 559}
554 560
555############################################################################# 561#############################################################################
… …
786} 792}
787 793
788sub dc_connect { 794sub dc_connect {
789 my ($host, $port) = @_; 795 my ($host, $port) = @_;
790 796
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 797 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
798 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 799
793 $CONN = 800 $CONN =
794 new DC::Protocol 801 new DC::Protocol
795 host => $host, 802 host => $host,
796 port => $port, 803 port => $port,
797 user => $PROFILE->{user}, 804 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 805 pass => $PROFILE->{password},
799 mapw => $mapsize, 806 mapw => $mapw,
800 maph => $mapsize, 807 maph => $maph,
801 808
802 client => "$DC::VERSION $] $^O", 809 client => "$DC::VERSION $] $^O",
803 810
804 map_widget => $MAPWIDGET, 811 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 812 statusbox => $STATUSBOX,
… …
813 820
814 on_connect => sub { 821 on_connect => sub {
815 if ($_[0]) { 822 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
817 824
818 status "login successful"; 825 status "successfully connected to the server";
819 } else { 826 } else {
820 undef $CONN; 827 undef $CONN;
821 status "unable to connect: $!"; 828 status "unable to connect: $!";
822 stop_game(); 829 stop_game();
823 } 830 }
… …
825 ; 832 ;
826} 833}
827 834
828sub start_game { 835sub start_game {
829 status "logging in..."; 836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
830 841
831 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835 844
836 $MAP = new DC::Map; 845 $MAP = new DC::Map;
837 846
838 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
845 } 858 }
846 859
847 dc_connect $host, $port; 860 dc_connect $host, $port;
848 }; 861 };
849 } else { 862 } else {
… …
875} 888}
876 889
877sub graphics_setup { 890sub graphics_setup {
878 my $vbox = new DC::UI::VBox; 891 my $vbox = new DC::UI::VBox;
879 892
893 {
894 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
895
880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 896 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
881 897
882 my $row = 0; 898 my $row = 0;
883 899
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 900 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
885 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 901 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
886 can_events => 1, 902 can_events => 1,
887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 903 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888 904
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
890 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 906 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1, 907 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as " 908 tooltip => "This field shows any known issues with your config or driver, such as "
893 . "a non-accelerated display format. You can try to work around these issues " 909 . "a non-accelerated display format. You can try to work around these issues "
894 . "by selecting a different video mode, changing the settings below or " 910 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card."); 911 . "by installing the right driver for your graphics card.");
896 912
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
898 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector 914 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
899 value => $CFG->{uitheme}, 915 value => $CFG->{uitheme},
900 options => [ 916 options => [
901 [wood => "Wood (the default)"], 917 [wood => "Wood (the default)"],
902 [plain => "Plain (very)"], 918 [plain => "Plain (very)"],
903 [blue => "Blue (dark)"], 919 [blue => "Blue (dark)"],
904 [metal => "Metal (light)"], 920 [metal => "Metal (light)"],
905 ], 921 ],
906 tooltip => "Choose the User Interface theme that you like most :)", 922 tooltip => "Choose the User Interface theme that you like most :)",
907 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 } 923 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
908 ); 924 );
909 925
910 my $vidmode_tooltip = 926 my $vidmode_tooltip =
911 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 927 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
912 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 928 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
913 929
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
915 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
916 932
917 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
934 c_rescale => 1,
918 force_w => $WIDTH * 0.1, expand => 1, 935 force_w => $WIDTH * 0.1, expand => 1,
919 range => [ ($CFG->{sdl_mode}) x 3 ], 936 range => [ ($CFG->{sdl_mode}) x 3 ],
920 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
921 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
922 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
923 can_events => 1, tooltip => $vidmode_tooltip); 940 can_events => 1, tooltip => $vidmode_tooltip);
924 941
925 $MODE_SLIDER->connect (changed => sub { 942 $MODE_SLIDER->connect (changed => sub {
926 my ($self, $value) = @_;
927
928 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
929 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
930 });
931 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
932
933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
934 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
935 state => $CFG->{fullscreen},
936 tooltip => "Bring the client into fullscreen mode.",
937 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{force_opengl11},
943 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
944 . "higher memory usage and slower performance. It will, however, help tremendously on "
945 . "cards that claim to support a feature but fall back to software rendering. "
946 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
947 . "but cards and drivers from other vendors (ATI) are often just as bad. "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
950 );
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
953 $table->add_at (1, $row++, new DC::UI::CheckBox
954 state => $CFG->{disable_alpha},
955 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
956 . "by disabling a number of textures and transparency effects. Normally, these "
957 . "effects do not cost a lot of resources, but some graphics cards might fall "
958 . "back to etxremely slow rendering if this is enabled. If disabling this option "
959 . "noticably improves the framerate of the client please report this! "
960 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
961 on_changed => sub {
962 my ($self, $value) = @_; 943 my ($self, $value) = @_;
944
945 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
946 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
947 });
948 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
949
950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
951 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
952 state => $CFG->{fullscreen},
953 tooltip => "Bring the client into fullscreen mode.",
954 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
955 );
956
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
958 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{force_opengl11},
960 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
961 . "higher memory usage and slower performance. It will, however, help tremendously on "
962 . "cards that claim to support a feature but fall back to software rendering. "
963 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
964 . "but cards and drivers from other vendors (ATI) are often just as bad. "
965 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
967 );
968
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
970 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{disable_alpha},
972 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
973 . "by disabling a number of textures and transparency effects. Normally, these "
974 . "effects do not cost a lot of resources, but some graphics cards might fall "
975 . "back to extremely slow rendering if this is enabled. If disabling this option "
976 . "noticably improves the framerate of the client please report this! "
977 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
978 on_changed => sub {
979 my ($self, $value) = @_;
963 $CFG->{disable_alpha} = $value; 980 $CFG->{disable_alpha} = $value;
964 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 981 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
982 0
965 0 983 }
966 } 984 );
967 );
968 985
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
970 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{texture_compression}, 988 state => $CFG->{texture_compression},
972 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 989 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
973 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 990 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
974 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 991 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
975 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 992 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
976 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 993 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
977 ); 994 );
978 995
979 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
980 $table->add_at (1, $row++, new DC::UI::CheckBox 997 $table->add_at (1, $row++, new DC::UI::CheckBox
981 state => $CFG->{fast}, 998 state => $CFG->{fast},
982 tooltip => "Lower the visual quality considerably to speed up rendering.", 999 tooltip => "Lower the visual quality considerably to speed up rendering.",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
984 ); 1001 );
985 1002
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
987 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1005 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
989 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1006 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
990 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1007 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
991 ); 1008 );
992 1009
993 $table->add_at (1, $row++, new DC::UI::Button 1010 $table->add_at (1, $row++, new DC::UI::Button
994 expand => 1, text => "Apply", 1011 expand => 1, text => "Apply",
995 tooltip => "Apply the video settings above.", 1012 tooltip => "Apply the video settings above.",
996 on_activate => sub { 1013 on_activate => sub {
997 video_shutdown (); 1014 video_shutdown ();
998 video_init (); 1015 video_init ();
1016 0
999 0 1017 }
1000 } 1018 );
1001 ); 1019 }
1002 1020
1021 {
1022 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1023
1024 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1025
1026 my $row = 0;
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1004 $table->add_at (1, $row++, new DC::UI::CheckBox 1028 $table->add_at (1, $row++, new DC::UI::CheckBox
1005 state => $CFG->{smooth_movement}, 1029 state => $CFG->{smooth_movement},
1006 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1030 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1007 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1008 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1010 ); 1034 );
1011 1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1045
1012 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1013 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1014 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1015 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1017 ); 1051 );
1018 1052
1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox 1054 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{map_smoothing}, 1055 state => $CFG->{map_smoothing},
1022 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1056 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1023 . "This increases load on the graphics subsystem and works only with TRT servers. " 1057 . "This increases load on the graphics subsystem and works only with TRT servers. "
1024 . "Changes take effect at next login only.", 1058 . "Changes take effect at next login only.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1026 ); 1060 );
1027 1061
1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1029 $table->add_at (1, $row++, new DC::UI::CheckBox 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
1030 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
1031 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1032 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1033 ); 1067 );
1034 1068
1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1070 $table->add_at (1, $row++, new DC::UI::ImageButton
1071 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1072 bg => [0.3, 0.3, 0.2],
1073 force_w => 64,
1074 force_h => 64,
1075 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.",
1076 on_activate => sub {
1077 my ($self) = @_;
1078 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1079 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1080 }
1081 );
1082
1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1083 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1084 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1085 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1038 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1086 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1039 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1087 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1040 ); 1088 );
1041 1089
1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1090 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1043 $table->add_at (1, $row++, new DC::UI::Slider 1091 $table->add_at (1, $row++, new DC::UI::Slider
1044 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1092 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1045 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1093 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1046 . "but you still need to press apply to correctly re-layout the widget.", 1094 . "but you still need to press apply to correctly re-layout the widget.",
1047 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1095 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1048 ); 1096 );
1049 1097
1050 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1051 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
1052 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1053 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1101 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1054 on_changed => sub { 1102 on_changed => sub {
1055 $CFG->{gauge_fontsize} = $_[1]; 1103 $CFG->{gauge_fontsize} = $_[1];
1056 &set_gauge_window_fontsize; 1104 &set_gauge_window_fontsize;
1105 0
1057 0 1106 }
1058 } 1107 );
1059 );
1060 1108
1061 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1109 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1062 $table->add_at (1, $row++, new DC::UI::Slider 1110 $table->add_at (1, $row++, new DC::UI::Slider
1063 range => [$CFG->{gauge_size}, 0.2, 0.8], 1111 range => [$CFG->{gauge_size}, 0.2, 0.8],
1064 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1112 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1065 on_changed => sub { 1113 on_changed => sub {
1066 $CFG->{gauge_size} = $_[1]; 1114 $CFG->{gauge_size} = $_[1];
1067 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1115 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1116 0
1068 0 1117 }
1069 } 1118 );
1070 ); 1119 }
1071 1120
1072 $vbox 1121 $vbox
1073} 1122}
1074 1123
1075our $AUDIO_HW_CHUNKSIZE; 1124our $AUDIO_HW_CHUNKSIZE;
… …
1238} 1287}
1239 1288
1240sub make_gauge_window { 1289sub make_gauge_window {
1241 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1290 my $gh = int $HEIGHT * $CFG->{gauge_size};
1242 1291
1243 my $win = new DC::UI::Frame ( 1292 $GAUGES->{win} = my $win = new DC::UI::Frame (
1244 force_x => 0, 1293 force_x => 0,
1245 force_y => "max", 1294 force_y => "max",
1246 force_w => $WIDTH, 1295 force_w => $WIDTH,
1247 force_h => $gh, 1296 force_h => $gh,
1248 ); 1297 );
… …
1264 (new DC::UI::Empty expand => 1), 1313 (new DC::UI::Empty expand => 1),
1265 (my $hb = new DC::UI::HBox), 1314 (my $hb = new DC::UI::HBox),
1266 ], 1315 ],
1267 ); 1316 );
1268 1317
1269 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1318 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1270 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1319 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1271 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1320 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1272 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1321 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1273
1274 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1275 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1276 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1277 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1278
1279 $GAUGES = {
1280 exp => $exp, prg => $prg, sklprg => $sklprg,
1281 win => $win, range => $rng,
1282 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1283 };
1284 1322
1285 &set_gauge_window_fontsize; 1323 &set_gauge_window_fontsize;
1286 1324
1287 $win 1325 $win
1288} 1326}
… …
1630 ); 1668 );
1631 1669
1632 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1670 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1633 $table->add_at (1, 4, new DC::UI::Entry 1671 $table->add_at (1, 4, new DC::UI::Entry
1634 text => $CFG->{profile}{default}{user}, 1672 text => $CFG->{profile}{default}{user},
1635 tooltip => "The name of your character on the server.", 1673 tooltip => "The name of your character on the server. The name is case-sensitive!",
1636 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1674 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1637 ); 1675 );
1638 1676
1639 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1677 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1640 $table->add_at (1, 5, new DC::UI::Entry 1678 $table->add_at (1, 5, new DC::UI::Entry
… …
1742 1780
1743 my $row = 0; 1781 my $row = 0;
1744 1782
1745 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1783 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1746 $table->add_at (1, $row++, new DC::UI::CheckBox 1784 $table->add_at (1, $row++, new DC::UI::CheckBox
1785 c_colspan => 2,
1747 state => $CFG->{show_tips}, 1786 state => $CFG->{show_tips},
1748 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1787 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1749 on_changed => sub { 1788 on_changed => sub {
1750 my ($self, $value) = @_; 1789 my ($self, $value) = @_;
1751 $CFG->{show_tips} = $value; 1790 $CFG->{show_tips} = $value;
… …
1753 } 1792 }
1754 ); 1793 );
1755 1794
1756 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1795 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1757 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1796 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1797 c_colspan => 2,
1758 text => $CFG->{logview_max_par}, 1798 text => $CFG->{logview_max_par},
1759 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1799 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1760 . "sends more messages than this number, older messages get removed to save memory and " 1800 . "sends more messages than this number, older messages get removed to save memory and "
1761 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1801 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1762 on_changed => sub { 1802 on_changed => sub {
… …
1764 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1804 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1765 0 1805 0
1766 }, 1806 },
1767 ); 1807 );
1768 1808
1809 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1810 $table->add_at (1, $row, new DC::UI::CheckBox
1811 state => $CFG->{config_autosave},
1812 tooltip => "Normally, configuration settings and the user interface layout "
1813 . "are saved on client exit. You can disable this behaviour by "
1814 . "unchecking this checkbox.",
1815 on_changed => sub {
1816 my ($self, $value) = @_;
1817 $CFG->{config_autosave} = $value;
1818 0
1819 }
1820 );
1821 $table->add_at (2, $row++, new DC::UI::Button
1822 text => "Save Now",
1823 tooltip => "Use this to manually save configuration and UI layout when "
1824 . "autosave is disabled.",
1825 on_activate => sub {
1826 DC::write_cfg;
1827 0
1828 }
1829 );
1830
1769 $table 1831 $table
1770} 1832}
1771 1833
1772sub autopickup_setup { 1834sub autopickup_setup {
1773 my $r = new DC::UI::ScrolledWindow ( 1835 my $r = new DC::UI::ScrolledWindow (
… …
1779 col_expand => [0, 1, 0, 1], 1841 col_expand => [0, 1, 0, 1],
1780 ); 1842 );
1781 1843
1782 for ( 1844 for (
1783 ["General", 0, 0, 1845 ["General", 0, 0,
1784 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1785 ["Inhibit autopickup" => PICKUP_INHIBIT], 1846# ["Inhibit autopickup" => PICKUP_INHIBIT],
1786 ["Stop before pickup" => PICKUP_STOP], 1847 ["Stop before pickup" => PICKUP_STOP],
1787 ["Debug autopickup" => PICKUP_DEBUG], 1848 ["Debug autopickup" => PICKUP_DEBUG],
1788 ], 1849 ],
1789 ["Weapons", 0, 6, 1850 ["Weapons", 0, 6,
1790 ["All weapons" => PICKUP_ALLWEAPON], 1851 ["All weapons" => PICKUP_ALLWEAPON],
… …
1838 $::CFG->{pickup} |= $mask; 1899 $::CFG->{pickup} |= $mask;
1839 } else { 1900 } else {
1840 $::CFG->{pickup} &= ~$mask; 1901 $::CFG->{pickup} &= ~$mask;
1841 } 1902 }
1842 1903
1843 $::CONN->send_command ("pickup $::CFG->{pickup}") 1904 $::CONN->send_pickup ($::CFG->{pickup})
1844 if defined $::CONN; 1905 if defined $::CONN;
1845 1906
1846 0 1907 0
1847 }); 1908 });
1848 1909
… …
1865 }); 1926 });
1866 1927
1867 $table->add_at (3, 18, new DC::UI::Button 1928 $table->add_at (3, 18, new DC::UI::Button
1868 text => "set", 1929 text => "set",
1869 on_activate => sub { 1930 on_activate => sub {
1870 $::CONN->send_command ("pickup $::CFG->{pickup}") 1931 $::CONN->send_pickup ($::CFG->{pickup})
1871 if defined $::CONN; 1932 if defined $::CONN;
1872 0 1933 0
1873 }); 1934 });
1874 1935
1875 $r 1936 $r
… …
1988 $PL_NOTEBOOK->set_current_page ($widget); 2049 $PL_NOTEBOOK->set_current_page ($widget);
1989 $PL_WINDOW->show; 2050 $PL_WINDOW->show;
1990 } 2051 }
1991} 2052}
1992 2053
1993sub player_window { 2054sub make_playerbook {
1994 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2055 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1995 x => "center", 2056 x => "center",
1996 y => "center", 2057 y => "center",
1997 force_w => $WIDTH * 9/10, 2058 force_w => $WIDTH * 9/10,
1998 force_h => $HEIGHT * 9/10, 2059 force_h => $HEIGHT * 9/10,
… …
2032 "License, Author and Source info for media sent by the server."); 2093 "License, Author and Source info for media sent by the server.");
2033 2094
2034 $ntb->set_current_page ($INVENTORY_PAGE); 2095 $ntb->set_current_page ($INVENTORY_PAGE);
2035 2096
2036 $plwin->add ($ntb); 2097 $plwin->add ($ntb);
2037 $plwin
2038} 2098}
2039 2099
2040sub keyboard_setup { 2100sub keyboard_setup {
2041 DC::Macro::keyboard_setup 2101 DC::Macro::keyboard_setup
2042} 2102}
2043 2103
2044sub help_window { 2104sub make_help_window {
2045 my $win = new DC::UI::Toplevel 2105 my $win = new DC::UI::Toplevel
2046 x => 'center', 2106 x => 'center',
2047 y => 'center', 2107 y => 'center',
2048 z => 4, 2108 z => 4,
2049 name => 'doc_browser', 2109 name => 'doc_browser',
… …
2138 2198
2139 $load_node->((DC::Pod::find @path)[0]); 2199 $load_node->((DC::Pod::find @path)[0]);
2140 $win->show; 2200 $win->show;
2141 }; 2201 };
2142 2202
2143 $win 2203 $HELP_WINDOW = $win;
2144}
2145
2146sub open_string_query {
2147 my ($title, $cb, $txt, $tooltip) = @_;
2148 my $dialog = new DC::UI::Toplevel
2149 x => "center",
2150 y => "center",
2151 z => 50,
2152 force_w => $WIDTH * 4/5,
2153 title => $title;
2154
2155 $dialog->add (
2156 my $e = new DC::UI::Entry
2157 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2158 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2159 tooltip => $tooltip
2160 );
2161
2162 $e->grab_focus;
2163 $e->set_text ($txt) if $txt;
2164 $dialog->show;
2165} 2204}
2166 2205
2167sub open_quit_dialog { 2206sub open_quit_dialog {
2168 unless ($QUIT_DIALOG) { 2207 unless ($QUIT_DIALOG) {
2169 $QUIT_DIALOG = new DC::UI::Toplevel 2208 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2202 2241
2203 $QUIT_DIALOG->show; 2242 $QUIT_DIALOG->show;
2204 $QUIT_DIALOG->grab_focus; 2243 $QUIT_DIALOG->grab_focus;
2205} 2244}
2206 2245
2246sub make_menubar {
2247 $MENUFRAME = new DC::UI::Toplevel
2248 border => 0,
2249 force_x => 0,
2250 force_y => 0,
2251 force_w => $::WIDTH,
2252 child => ($MENUBAR = new DC::UI::HBox),
2253 ;
2254
2255 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2256
2257 # 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
2258 make_gauge_window->show;
2259
2260# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2261# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2262
2263 make_playerbook;
2264
2265 $MENUPOPUP = DC::UI::Menu->new (items => [
2266 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2267 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2268 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2269 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2270 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2271 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2272 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2273 ["Quit…" , sub {
2274 if ($CONN) {
2275 open_quit_dialog;
2276 } else {
2277 EV::unloop EV::UNLOOP_ALL;
2278 }
2279 }],
2280 ]);
2281
2282 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2283 tooltip => "Shows the main menu",
2284 on_button_down => sub {
2285 my ($self, $ev) = @_;
2286 local $ev->{x} = 0;
2287 local $ev->{y} = 0;
2288 $MENUPOPUP->popup ($ev);
2289 },
2290 );
2291
2292 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2293 padding_x => 6,
2294 padding_y => 3,
2295 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2296 template => " Exp: 888,888,888,888 (lvl 188) ",
2297 );
2298
2299 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2300 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2301 . "will automatically pick up items as defined by your item pickup settings "
2302 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2303 . "disable autopickup by disabling this checkbox.",
2304 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2305 on_changed => sub {
2306 my ($self, $value) = @_;
2307 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2308 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2309 $CONN->send_pickup ($CFG->{pickup})
2310 if $CONN;
2311 },
2312 );
2313
2314 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2315 c_rescale => 1,
2316 padding_x => 6,
2317 padding_y => 3,
2318 force_w => $::WIDTH * 0.2,
2319 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2320 template => "two handed weapons 99%",
2321 );
2322
2323 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2324 expand => 1,
2325 align => 1, can_hover => 1, can_events => 1,
2326 text => "Range and Combat Slots",
2327 tooltip => "#stat_ranged",
2328 );
2329
2330 $MENUFRAME->show;
2331}
2332
2333sub open_string_query {
2334 my ($title, $cb, $txt, $tooltip) = @_;
2335 my $dialog = new DC::UI::Toplevel
2336 x => "center",
2337 y => "center",
2338 z => 50,
2339 force_w => $WIDTH * 4/5,
2340 title => $title;
2341
2342 $dialog->add (
2343 my $e = new DC::UI::Entry
2344 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2345 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2346 tooltip => $tooltip
2347 );
2348
2349 $e->grab_focus;
2350 $e->set_text ($txt) if $txt;
2351 $dialog->show;
2352}
2353
2207sub show_tip_of_the_day { 2354sub show_tip_of_the_day {
2208 # find all tips 2355 # find all tips
2209 my @tod = DC::Pod::find tip_of_the_day => "*"; 2356 my @tod = DC::Pod::find tip_of_the_day => "*";
2210 2357
2211 DC::DB::get state => "tip_of_the_day", sub { 2358 DC::DB::get state => "tip_of_the_day", sub {
… …
2350 2497
2351 (new DC::UI::Frame 2498 (new DC::UI::Frame
2352 bg => [0, 0, 0, 0.4], 2499 bg => [0, 0, 0, 0.4],
2353 force_x => 0, 2500 force_x => 0,
2354 force_y => "max", 2501 force_y => "max",
2355 child => (my $LR = new DC::UI::VBox), 2502 child => (my $LL = new DC::UI::VBox),
2356 )->show; 2503 )->show;
2357 2504
2358 $LR->add ($STATUSBOX); 2505 $LL->add ($STATUSBOX);
2359 $LR->add ($MODBOX); 2506 $LL->add ($MODBOX);
2360 $LR->add (new DC::UI::Label 2507 $LL->add (new DC::UI::Label
2361 align => 0, 2508 align => 0,
2362 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2509 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2363 fontsize => 0.5, 2510 fontsize => 0.5,
2364 fg => [1, 1, 0, 0.7], 2511 fg => [1, 1, 0, 0.7],
2365 ); 2512 );
2366 2513
2367 DC::UI::Toplevel->new ( 2514 DC::UI::Toplevel->new (
2368 title => "Minimap", 2515 title => "Minimap",
2369 name => "mapmap", 2516 name => "mapmap",
2370 x => 0, 2517 x => 0,
2371 y => $FONTSIZE + 8, 2518 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2372 border_bg => [1, 1, 1, 192/255], 2519 border_bg => [1, 1, 1, 192/255],
2373 bg => [1, 1, 1, 0], 2520 bg => [1, 1, 1, 0],
2374 child => ($MAPMAP = new DC::MapWidget::MapMap 2521 child => ($MAPMAP = new DC::MapWidget::MapMap
2375 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2522 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2376 ), 2523 ),
… …
2405 $METASERVER = metaserver_dialog; 2552 $METASERVER = metaserver_dialog;
2406 # the name is changed to not conflict with the older name as users could have hidden it 2553 # the name is changed to not conflict with the older name as users could have hidden it
2407 $MESSAGE_WINDOW = new DC::UI::Dockbar 2554 $MESSAGE_WINDOW = new DC::UI::Dockbar
2408 name => "message_window2", 2555 name => "message_window2",
2409 title => 'Messages', 2556 title => 'Messages',
2557 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2410 force_w => $::WIDTH * 0.6, 2558 force_w => $::WIDTH * 0.6,
2411 force_h => $::HEIGHT * 0.25, 2559 force_h => $::HEIGHT * 0.25,
2412 ; 2560 ;
2413 2561
2414 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2562 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2434 . "After pressing the combo the binding will be saved automatically and the " 2582 . "After pressing the combo the binding will be saved automatically and the "
2435 . "binding editor closes"); 2583 . "binding editor closes");
2436 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2584 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2437 "Some debuggin' options. Do not ask."); 2585 "Some debuggin' options. Do not ask.");
2438 2586
2439 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2587 make_help_window;
2588 make_menubar;
2440 2589
2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2442 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2443
2444# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2445# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2446
2447 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
2448
2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2450 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2451
2452 $BUTTONBAR->add (new DC::UI::Button
2453 text => "Save Config",
2454 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2455 on_activate => sub {
2456 $::CFG->{layout} = DC::UI::get_layout;
2457 DC::write_cfg;
2458 status "Configuration Saved";
2459 0
2460 },
2461 );
2462
2463 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2464 tooltip => "View Documentation");
2465
2466 $BUTTONBAR->add (new DC::UI::Button
2467 text => "Quit",
2468 tooltip => "Terminates the program",
2469 on_activate => sub {
2470 if ($CONN) {
2471 open_quit_dialog;
2472 } else {
2473 EV::unloop EV::UNLOOP_ALL;
2474 }
2475 0
2476 },
2477 );
2478
2479 $BUTTONBAR->show;
2480 $SETUP_DIALOG->show; 2590 $SETUP_DIALOG->show;
2481 $MESSAGE_WINDOW->show; 2591 $MESSAGE_WINDOW->show;
2482 } 2592 }
2483 2593
2484 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2594 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2485 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2595 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2486 2596
2487 $CAVEAT_LABEL->set_text ("None :)"); 2597 $CAVEAT_LABEL->set_text ("None :)");
2598 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2599 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2488 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2600 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2489 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2601 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2490 2602
2491 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2603 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2492} 2604}
… …
2520my $want_refresh = EV::prepare_ns \&force_refresh; 2632my $want_refresh = EV::prepare_ns \&force_refresh;
2521 2633
2522my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2634my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2523 $NOW = EV::now; 2635 $NOW = EV::now;
2524 2636
2525 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2637 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2526 for DC::poll_events; 2638 for DC::poll_events;
2527 2639
2528 if (%animate_object) { 2640 if (%animate_object) {
2529 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2641 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2530 $WANT_REFRESH = 1; 2642 $WANT_REFRESH = 1;
… …
2542sub animation_stop { 2654sub animation_stop {
2543 my ($widget) = @_; 2655 my ($widget) = @_;
2544 delete $animate_object{$widget}; 2656 delete $animate_object{$widget};
2545} 2657}
2546 2658
2547%SDL_CB = (
2548 DC::SDL_QUIT => sub { 2659$SDL_CB[DC::SDL_QUIT] = sub {
2549 crash "SDL_QUIT"; 2660 crash "SDL_QUIT";
2550 EV::unloop EV::UNLOOP_ALL; 2661 EV::unloop EV::UNLOOP_ALL;
2551 }, 2662};
2552 DC::SDL_VIDEORESIZE => sub { 2663$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2553 },
2554 DC::SDL_VIDEOEXPOSE => sub { 2664$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2555 DC::UI::full_refresh; 2665 DC::UI::full_refresh;
2556 }, 2666};
2557 DC::SDL_ACTIVEEVENT => sub { 2667$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2558# not useful, as APPACTIVE includes only iconified state, not unmapped 2668# not useful, as APPACTIVE includes only iconified state, not unmapped
2559# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2669# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2560# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2670# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2561# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2671# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2562# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2672# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2563# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2673# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2564 }, 2674};
2565 DC::SDL_KEYDOWN => sub { 2675$SDL_CB[DC::SDL_KEYDOWN] = sub {
2566 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2676 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2567 # alt-enter 2677 # alt-enter
2568 video_shutdown; 2678 video_shutdown;
2569 $FULLSCREEN_ENABLE->toggle; 2679 $FULLSCREEN_ENABLE->toggle;
2570 video_init; 2680 video_init;
2571 } else { 2681 } else {
2572 &DC::UI::feed_sdl_key_down_event; 2682 &DC::UI::feed_sdl_key_down_event;
2573 } 2683 }
2574 update_modbox; 2684 update_modbox;
2575 }, 2685};
2576 DC::SDL_KEYUP => sub { 2686$SDL_CB[DC::SDL_KEYUP] = sub {
2577 &DC::UI::feed_sdl_key_up_event; 2687 &DC::UI::feed_sdl_key_up_event;
2578 update_modbox; 2688 update_modbox;
2579 }, 2689};
2580 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2690$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2581 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2691$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2582 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2692$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2583 DC::SDL_USEREVENT => sub { 2693$SDL_CB[DC::SDL_USEREVENT] = sub {
2584 if ($_[0]{code} == 1) { 2694 if ($_[0]{code} == 1) {
2585 audio_channel_finished $_[0]{data1}; 2695 audio_channel_finished $_[0]{data1};
2586 } elsif ($_[0]{code} == 0) { 2696 } elsif ($_[0]{code} == 0) {
2587 audio_music_finished; 2697 audio_music_finished;
2588 }
2589 }, 2698 }
2590); 2699};
2591 2700
2592############################################################################# 2701#############################################################################
2593 2702
2594$SIG{INT} = $SIG{TERM} = sub { 2703$SIG{INT} = $SIG{TERM} = sub {
2595 EV::unloop; 2704 EV::unloop;
2596 #d# TODO calling exit here hangs the process in some futex 2705 #d# TODO calling exit here hangs the process in some futex
2597}; 2706};
2598 2707
2599# due to mac os x + sdl combined briandamage, we need this contortion 2708# due to mac os x + sdl combined braindamage, we need this contortion
2600sub main { 2709sub main {
2601 { 2710 {
2602 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2711 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2603 2712
2604 if (-e "$Deliantra::VARDIR/client.cf") { 2713 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2621 DC::DB::open_db; 2730 DC::DB::open_db;
2622 2731
2623 DC::UI::set_layout ($::CFG->{layout}); 2732 DC::UI::set_layout ($::CFG->{layout});
2624 2733
2625 my %DEF_CFG = ( 2734 my %DEF_CFG = (
2735 config_autosave => 1,
2626 sdl_mode => undef, 2736 sdl_mode => undef,
2627 fullscreen => 1, 2737 fullscreen => 1,
2628 fast => 0, 2738 fast => 0,
2629 force_opengl11 => undef, 2739 force_opengl11 => undef,
2630 disable_alpha => 0, 2740 disable_alpha => 0,
2631 smooth_movement => 1, 2741 smooth_movement => 1,
2742 smooth_transitions => 1,
2632 texture_compression => 1, 2743 texture_compression => 1,
2633 map_scale => 1, 2744 map_scale => 1,
2634 fow_enable => 1, 2745 fow_enable => 1,
2635 fow_intensity => 0, 2746 fow_intensity => 0,
2747 fow_texture => 0,
2636 map_smoothing => 1, 2748 map_smoothing => 1,
2637 gui_fontsize => 1, 2749 gui_fontsize => 1,
2638 log_fontsize => 0.7, 2750 log_fontsize => 0.7,
2639 gauge_fontsize => 1, 2751 gauge_fontsize => 1,
2640 gauge_size => 0.35, 2752 gauge_size => 0.35,
… …
2648 effects_enable => 1, 2760 effects_enable => 1,
2649 effects_volume => 1, 2761 effects_volume => 1,
2650 bgm_enable => 1, 2762 bgm_enable => 1,
2651 bgm_volume => 0.5, 2763 bgm_volume => 0.5,
2652 output_rate => "", 2764 output_rate => "",
2653 pickup => 0, 2765 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2654 inv_sort => "mtime", 2766 inv_sort => "mtime",
2655 default => "profile", # default profile 2767 default => "profile", # default profile
2656 show_tips => 1, 2768 show_tips => 1,
2657 logview_max_par => 1000, 2769 logview_max_par => 1000,
2658 shift_fire_stop => 0, 2770 shift_fire_stop => 0,
2659 uitheme => "wood", 2771 uitheme => "wood",
2772 map_shift_x => -24, # arbitrary
2773 map_shift_y => +24, # arbitrary
2660 ); 2774 );
2661 2775
2662 while (my ($k, $v) = each %DEF_CFG) { 2776 while (my ($k, $v) = each %DEF_CFG) {
2663 $CFG->{$k} = $v unless exists $CFG->{$k}; 2777 $CFG->{$k} = $v unless exists $CFG->{$k};
2664 } 2778 }
… …
2678 } 2792 }
2679 } 2793 }
2680 2794
2681 sdl_init; 2795 sdl_init;
2682 2796
2797 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2798 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2799
2683 { 2800 {
2684 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2801 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2685 DejaVuSans.ttf 2802 DejaVuSans.ttf
2686 DejaVuSansMono.ttf 2803 DejaVuSansMono.ttf
2687 DejaVuSans-Bold.ttf 2804 DejaVuSans-Bold.ttf
2688 DejaVuSansMono-Bold.ttf 2805 DejaVuSansMono-Bold.ttf
2689 DejaVuSans-Oblique.ttf 2806 DejaVuSans-Oblique.ttf
2690 DejaVuSansMono-Oblique.ttf 2807 DejaVuSansMono-Oblique.ttf
2691 DejaVuSans-BoldOblique.ttf 2808 DejaVuSans-BoldOblique.ttf
2692 DejaVuSansMono-BoldOblique.ttf 2809 DejaVuSansMono-BoldOblique.ttf
2810 mona.ttf
2693 ); 2811 );
2694 2812
2695 DC::add_font $_ for @fonts; 2813 DC::add_font $_ for @fonts;
2696 2814
2697 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2815 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2727 }; 2845 };
2728 2846
2729 delete $SIG{__DIE__}; 2847 delete $SIG{__DIE__};
2730 EV::loop; 2848 EV::loop;
2731 2849
2850 DC::write_cfg if $CFG->{config_autosave};
2851
2732#video_shutdown; 2852 #video_shutdown;
2733#audio_shutdown; 2853 #audio_shutdown;
2854
2734 DC::OpenGL::quit; 2855 DC::OpenGL::quit;
2735 DC::SDL_Quit; 2856 DC::SDL_Quit;
2736 DC::DB::Server::stop; 2857 DC::DB::Server::stop;
2737} 2858}
2738 2859

Diff Legend

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