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.98 by root, Mon Dec 21 03:30:23 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;
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
245 my $buf = delete $CONN->{wbuf}; 235 my $buf = delete $CONN->{wbuf};
246 236
247 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000]; 237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
248 238
249 AnyEvent::Util::fh_nonblocking $fh, 0; 239 AnyEvent::Util::fh_nonblocking $fh, 0;
250
251 syswrite $fh, $buf; 240 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1; 241 AnyEvent::Util::fh_nonblocking $fh, 1;
253 242
254 $msg =~ s/\s+$//; 243 $msg =~ s/\s+$//;
255 244
256 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
257 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace; 247 if $backtrace;
259}; 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}
260 260
261############################################################################# 261#############################################################################
262 262
263sub status { 263sub status {
264 $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]);
… …
346 or return; 346 or return;
347 347
348 $meta->{data} 348 $meta->{data}
349 or return; 349 or return;
350 350
351 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
352 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
353 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
354 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
355 &audio_music_push ($face); 355 &audio_music_push ($face);
356 } 356 }
357 } else { 357 } else {
358 # fetch from database 358 # fetch from database
359 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
360 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
361 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
362 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;
363 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
364 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
365 365
366 audio_sound_push ($face); 366 audio_sound_push ($face);
367 }; 367 };
… …
414 414
415 audio_music_update_volume; 415 audio_music_update_volume;
416 416
417 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
418 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
419 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
420 ? 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
421 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
422 425
423 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
424 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
425 428
426 my $NOW = time; 429 my $NOW = time;
427 430
428 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
429 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
547 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
548 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
549 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
550 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
551 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
552 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
553 undef $SDL_MIXER; 558 undef $SDL_MIXER;
554} 559}
555 560
556############################################################################# 561#############################################################################
… …
787} 792}
788 793
789sub dc_connect { 794sub dc_connect {
790 my ($host, $port) = @_; 795 my ($host, $port) = @_;
791 796
792 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;
793 799
794 $CONN = 800 $CONN =
795 new DC::Protocol 801 new DC::Protocol
796 host => $host, 802 host => $host,
797 port => $port, 803 port => $port,
798 user => $PROFILE->{user}, 804 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 805 pass => $PROFILE->{password},
800 mapw => $mapsize, 806 mapw => $mapw,
801 maph => $mapsize, 807 maph => $maph,
802 808
803 client => "$DC::VERSION $] $^O", 809 client => "$DC::VERSION $] $^O",
804 810
805 map_widget => $MAPWIDGET, 811 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 812 statusbox => $STATUSBOX,
… …
814 820
815 on_connect => sub { 821 on_connect => sub {
816 if ($_[0]) { 822 if ($_[0]) {
817 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
818 824
819 status "login successful"; 825 status "successfully connected to the server";
820 } else { 826 } else {
821 undef $CONN; 827 undef $CONN;
822 status "unable to connect: $!"; 828 status "unable to connect: $!";
823 stop_game(); 829 stop_game();
824 } 830 }
… …
826 ; 832 ;
827} 833}
828 834
829sub start_game { 835sub start_game {
830 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.";
831 841
832 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836 844
837 $MAP = new DC::Map; 845 $MAP = new DC::Map;
838 846
839 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 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) {
844 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
846 } 858 }
847 859
848 dc_connect $host, $port; 860 dc_connect $host, $port;
849 }; 861 };
850 } else { 862 } else {
… …
876} 888}
877 889
878sub graphics_setup { 890sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 891 my $vbox = new DC::UI::VBox;
880 892
893 {
894 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
895
881 $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]);
882 897
883 my $row = 0; 898 my $row = 0;
884 899
885 $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");
886 $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,
887 can_events => 1, 902 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 903 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 904
890 $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");
891 $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,
892 can_events => 1, 907 can_events => 1,
893 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 "
894 . "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 "
895 . "by selecting a different video mode, changing the settings below or " 910 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 911 . "by installing the right driver for your graphics card.");
897 912
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
914 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
915 value => $CFG->{uitheme},
916 options => [
917 [wood => "Wood (the default)"],
918 [plain => "Plain (very)"],
919 [blue => "Blue (dark)"],
920 [metal => "Metal (light)"],
921 ],
922 tooltip => "Choose the User Interface theme that you like most :)",
923 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
924 );
925
898 my $vidmode_tooltip = 926 my $vidmode_tooltip =
899 "<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). "
900 . "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>.";
901 929
902 $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");
903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 932
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
934 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 935 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 936 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 940 can_events => 1, tooltip => $vidmode_tooltip);
912 941
913 $MODE_SLIDER->connect (changed => sub { 942 $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) = @_; 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) = @_;
951 $CFG->{disable_alpha} = $value; 980 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 981 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
982 0
953 0 983 }
954 } 984 );
955 );
956 985
957 $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");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 988 state => $CFG->{texture_compression},
960 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 "
961 . "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). "
962 . "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 "
963 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 992 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 993 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 994 );
966 995
967 $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");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 997 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 998 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 999 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 1001 );
973 1002
974 $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");
975 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1005 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.", 1006 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 }, 1007 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1008 );
980 1009
981 $table->add_at (1, $row++, new DC::UI::Button 1010 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1011 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1012 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1013 on_activate => sub {
985 video_shutdown (); 1014 video_shutdown ();
986 video_init (); 1015 video_init ();
1016 0
987 0 1017 }
988 } 1018 );
989 ); 1019 }
990 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;
991 $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");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1028 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1029 state => $CFG->{smooth_movement},
994 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. "
995 . "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, "
996 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1034 );
999 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
1000 $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");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 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 }
1005 ); 1051 );
1006 1052
1007 $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");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1054 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1055 state => $CFG->{map_smoothing},
1010 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. "
1011 . "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. "
1012 . "Changes take effect at next login only.", 1058 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1060 );
1015 1061
1016 $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");
1017 $table->add_at (1, $row++, new DC::UI::CheckBox 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
1019 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.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1067 );
1022 1068
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1070 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1071 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.", 1072 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 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1074 );
1029 1075
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1077 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1078 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, " 1079 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.", 1080 . "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 }, 1081 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1082 );
1037 1083
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1084 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1085 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1086 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.", 1087 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1088 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1089 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1090 &set_gauge_window_fontsize;
1091 0
1045 0 1092 }
1046 } 1093 );
1047 );
1048 1094
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1095 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1096 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1097 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1098 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1099 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1100 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1101 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1102 0
1056 0 1103 }
1057 } 1104 );
1058 ); 1105 }
1059 1106
1060 $vbox 1107 $vbox
1061} 1108}
1062 1109
1063our $AUDIO_HW_CHUNKSIZE; 1110our $AUDIO_HW_CHUNKSIZE;
… …
1226} 1273}
1227 1274
1228sub make_gauge_window { 1275sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1276 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1277
1231 my $win = new DC::UI::Frame ( 1278 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1279 force_x => 0,
1233 force_y => "max", 1280 force_y => "max",
1234 force_w => $WIDTH, 1281 force_w => $WIDTH,
1235 force_h => $gh, 1282 force_h => $gh,
1236 ); 1283 );
… …
1252 (new DC::UI::Empty expand => 1), 1299 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1300 (my $hb = new DC::UI::HBox),
1254 ], 1301 ],
1255 ); 1302 );
1256 1303
1257 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1304 $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"); 1305 $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"); 1306 $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"); 1307 $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 1308
1273 &set_gauge_window_fontsize; 1309 &set_gauge_window_fontsize;
1274 1310
1275 $win 1311 $win
1276} 1312}
… …
1618 ); 1654 );
1619 1655
1620 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1656 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1621 $table->add_at (1, 4, new DC::UI::Entry 1657 $table->add_at (1, 4, new DC::UI::Entry
1622 text => $CFG->{profile}{default}{user}, 1658 text => $CFG->{profile}{default}{user},
1623 tooltip => "The name of your character on the server.", 1659 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 } 1660 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1625 ); 1661 );
1626 1662
1627 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1663 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1628 $table->add_at (1, 5, new DC::UI::Entry 1664 $table->add_at (1, 5, new DC::UI::Entry
… …
1730 1766
1731 my $row = 0; 1767 my $row = 0;
1732 1768
1733 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1769 $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 1770 $table->add_at (1, $row++, new DC::UI::CheckBox
1771 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1772 state => $CFG->{show_tips},
1736 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1773 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1737 on_changed => sub { 1774 on_changed => sub {
1738 my ($self, $value) = @_; 1775 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1776 $CFG->{show_tips} = $value;
… …
1741 } 1778 }
1742 ); 1779 );
1743 1780
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1781 $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 1782 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1783 c_colspan => 2,
1746 text => $CFG->{logview_max_par}, 1784 text => $CFG->{logview_max_par},
1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1785 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 " 1786 . "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.", 1787 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1750 on_changed => sub { 1788 on_changed => sub {
… …
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1790 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1791 0
1754 }, 1792 },
1755 ); 1793 );
1756 1794
1795 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1796 $table->add_at (1, $row, new DC::UI::CheckBox
1797 state => $CFG->{config_autosave},
1798 tooltip => "Normally, configuration settings and the user interface layout "
1799 . "are saved on client exit. You can disable this behaviour by "
1800 . "unchecking this checkbox.",
1801 on_changed => sub {
1802 my ($self, $value) = @_;
1803 $CFG->{config_autosave} = $value;
1804 0
1805 }
1806 );
1807 $table->add_at (2, $row++, new DC::UI::Button
1808 text => "Save Now",
1809 tooltip => "Use this to manually save configuration and UI layout when "
1810 . "autosave is disabled.",
1811 on_activate => sub {
1812 DC::write_cfg;
1813 0
1814 }
1815 );
1816
1757 $table 1817 $table
1758} 1818}
1759 1819
1760sub autopickup_setup { 1820sub autopickup_setup {
1761 my $r = new DC::UI::ScrolledWindow ( 1821 my $r = new DC::UI::ScrolledWindow (
… …
1767 col_expand => [0, 1, 0, 1], 1827 col_expand => [0, 1, 0, 1],
1768 ); 1828 );
1769 1829
1770 for ( 1830 for (
1771 ["General", 0, 0, 1831 ["General", 0, 0,
1772 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1773 ["Inhibit autopickup" => PICKUP_INHIBIT], 1832# ["Inhibit autopickup" => PICKUP_INHIBIT],
1774 ["Stop before pickup" => PICKUP_STOP], 1833 ["Stop before pickup" => PICKUP_STOP],
1775 ["Debug autopickup" => PICKUP_DEBUG], 1834 ["Debug autopickup" => PICKUP_DEBUG],
1776 ], 1835 ],
1777 ["Weapons", 0, 6, 1836 ["Weapons", 0, 6,
1778 ["All weapons" => PICKUP_ALLWEAPON], 1837 ["All weapons" => PICKUP_ALLWEAPON],
… …
1826 $::CFG->{pickup} |= $mask; 1885 $::CFG->{pickup} |= $mask;
1827 } else { 1886 } else {
1828 $::CFG->{pickup} &= ~$mask; 1887 $::CFG->{pickup} &= ~$mask;
1829 } 1888 }
1830 1889
1831 $::CONN->send_command ("pickup $::CFG->{pickup}") 1890 $::CONN->send_pickup ($::CFG->{pickup})
1832 if defined $::CONN; 1891 if defined $::CONN;
1833 1892
1834 0 1893 0
1835 }); 1894 });
1836 1895
… …
1853 }); 1912 });
1854 1913
1855 $table->add_at (3, 18, new DC::UI::Button 1914 $table->add_at (3, 18, new DC::UI::Button
1856 text => "set", 1915 text => "set",
1857 on_activate => sub { 1916 on_activate => sub {
1858 $::CONN->send_command ("pickup $::CFG->{pickup}") 1917 $::CONN->send_pickup ($::CFG->{pickup})
1859 if defined $::CONN; 1918 if defined $::CONN;
1860 0 1919 0
1861 }); 1920 });
1862 1921
1863 $r 1922 $r
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2035 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2036 $PL_WINDOW->show;
1978 } 2037 }
1979} 2038}
1980 2039
1981sub player_window { 2040sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2041 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2042 x => "center",
1984 y => "center", 2043 y => "center",
1985 force_w => $WIDTH * 9/10, 2044 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2045 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2079 "License, Author and Source info for media sent by the server.");
2021 2080
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2081 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2082
2024 $plwin->add ($ntb); 2083 $plwin->add ($ntb);
2025 $plwin
2026} 2084}
2027 2085
2028sub keyboard_setup { 2086sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2087 DC::Macro::keyboard_setup
2030} 2088}
2031 2089
2032sub help_window { 2090sub make_help_window {
2033 my $win = new DC::UI::Toplevel 2091 my $win = new DC::UI::Toplevel
2034 x => 'center', 2092 x => 'center',
2035 y => 'center', 2093 y => 'center',
2036 z => 4, 2094 z => 4,
2037 name => 'doc_browser', 2095 name => 'doc_browser',
… …
2126 2184
2127 $load_node->((DC::Pod::find @path)[0]); 2185 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2186 $win->show;
2129 }; 2187 };
2130 2188
2131 $win 2189 $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} 2190}
2154 2191
2155sub open_quit_dialog { 2192sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2193 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2194 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2227
2191 $QUIT_DIALOG->show; 2228 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2229 $QUIT_DIALOG->grab_focus;
2193} 2230}
2194 2231
2232sub make_menubar {
2233 $MENUFRAME = new DC::UI::Toplevel
2234 border => 0,
2235 force_x => 0,
2236 force_y => 0,
2237 force_w => $::WIDTH,
2238 child => ($MENUBAR = new DC::UI::HBox),
2239 ;
2240
2241 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2242
2243 # 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
2244 make_gauge_window->show;
2245
2246# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2247# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2248
2249 make_playerbook;
2250
2251 $MENUPOPUP = DC::UI::Menu->new (items => [
2252 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2253 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2254 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2255 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2256 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2257 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2258 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2259 ["Quit…" , sub {
2260 if ($CONN) {
2261 open_quit_dialog;
2262 } else {
2263 EV::unloop EV::UNLOOP_ALL;
2264 }
2265 }],
2266 ]);
2267
2268 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2269 tooltip => "Shows the main menu",
2270 on_button_down => sub {
2271 my ($self, $ev) = @_;
2272 local $ev->{x} = 0;
2273 local $ev->{y} = 0;
2274 $MENUPOPUP->popup ($ev);
2275 },
2276 );
2277
2278 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2279 padding_x => 6,
2280 padding_y => 3,
2281 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2282 template => " Exp: 888,888,888,888 (lvl 188) ",
2283 );
2284
2285 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2286 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2287 . "will automatically pick up items as defined by your item pickup settings "
2288 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2289 . "disable autopickup by disabling this checkbox.",
2290 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2291 on_changed => sub {
2292 my ($self, $value) = @_;
2293 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2294 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2295 $CONN->send_pickup ($CFG->{pickup})
2296 if $CONN;
2297 },
2298 );
2299
2300 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2301 c_rescale => 1,
2302 padding_x => 6,
2303 padding_y => 3,
2304 force_w => $::WIDTH * 0.2,
2305 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2306 template => "two handed weapons 99%",
2307 );
2308
2309 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2310 expand => 1,
2311 align => 1, can_hover => 1, can_events => 1,
2312 text => "Range and Combat Slots",
2313 tooltip => "#stat_ranged",
2314 );
2315
2316 $MENUFRAME->show;
2317}
2318
2319sub open_string_query {
2320 my ($title, $cb, $txt, $tooltip) = @_;
2321 my $dialog = new DC::UI::Toplevel
2322 x => "center",
2323 y => "center",
2324 z => 50,
2325 force_w => $WIDTH * 4/5,
2326 title => $title;
2327
2328 $dialog->add (
2329 my $e = new DC::UI::Entry
2330 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2331 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2332 tooltip => $tooltip
2333 );
2334
2335 $e->grab_focus;
2336 $e->set_text ($txt) if $txt;
2337 $dialog->show;
2338}
2339
2195sub show_tip_of_the_day { 2340sub show_tip_of_the_day {
2196 # find all tips 2341 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2342 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2343
2199 DC::DB::get state => "tip_of_the_day", sub { 2344 DC::DB::get state => "tip_of_the_day", sub {
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2395 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2396 and die "SDL::Init failed!\n";
2252} 2397}
2253 2398
2254sub video_init { 2399sub video_init {
2400 DC::set_theme $CFG->{uitheme};
2401
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2402 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2403 $SDL_REINIT = 0;
2257 2404
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2405 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2406 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2410 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2411
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2412 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2413 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2414
2268 # now choose biggets mode <= 1024x768 2415 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2416 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2417 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2418 $CFG->{sdl_mode} = $_;
2272 } 2419 }
2273 } 2420 }
… …
2336 2483
2337 (new DC::UI::Frame 2484 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2485 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2486 force_x => 0,
2340 force_y => "max", 2487 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2488 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2489 )->show;
2343 2490
2344 $LR->add ($STATUSBOX); 2491 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2492 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2493 $LL->add (new DC::UI::Label
2347 align => 0, 2494 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2495 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2496 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2497 fg => [1, 1, 0, 0.7],
2351 ); 2498 );
2352 2499
2353 DC::UI::Toplevel->new ( 2500 DC::UI::Toplevel->new (
2354 title => "Minimap", 2501 title => "Minimap",
2355 name => "mapmap", 2502 name => "mapmap",
2356 x => 0, 2503 x => 0,
2357 y => $FONTSIZE + 8, 2504 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2358 border_bg => [1, 1, 1, 192/255], 2505 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2506 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2507 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.", 2508 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2509 ),
2363 )->show; 2510 )->show;
2364 2511
2365 $MAPWIDGET = new DC::MapWidget; 2512 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2513 $MAPWIDGET->connect (activate_console => sub {
… …
2391 $METASERVER = metaserver_dialog; 2538 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it 2539 # the name is changed to not conflict with the older name as users could have hidden it
2393 $MESSAGE_WINDOW = new DC::UI::Dockbar 2540 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2", 2541 name => "message_window2",
2395 title => 'Messages', 2542 title => 'Messages',
2543 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2396 force_w => $::WIDTH * 0.6, 2544 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25, 2545 force_h => $::HEIGHT * 0.25,
2398 ; 2546 ;
2399 2547
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2548 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2420 . "After pressing the combo the binding will be saved automatically and the " 2568 . "After pressing the combo the binding will be saved automatically and the "
2421 . "binding editor closes"); 2569 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2570 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2571 "Some debuggin' options. Do not ask.");
2424 2572
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2573 make_help_window;
2574 make_menubar;
2426 2575
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; 2576 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2577 $MESSAGE_WINDOW->show;
2468 } 2578 }
2469 2579
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2580 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2581 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2582
2473 $CAVEAT_LABEL->set_text ("None :)"); 2583 $CAVEAT_LABEL->set_text ("None :)");
2584 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2585 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2586 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2587 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476 2588
2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2589 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2478} 2590}
… …
2506my $want_refresh = EV::prepare_ns \&force_refresh; 2618my $want_refresh = EV::prepare_ns \&force_refresh;
2507 2619
2508my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2620my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2509 $NOW = EV::now; 2621 $NOW = EV::now;
2510 2622
2511 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2623 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2512 for DC::poll_events; 2624 for DC::poll_events;
2513 2625
2514 if (%animate_object) { 2626 if (%animate_object) {
2515 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2627 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2516 $WANT_REFRESH = 1; 2628 $WANT_REFRESH = 1;
… …
2528sub animation_stop { 2640sub animation_stop {
2529 my ($widget) = @_; 2641 my ($widget) = @_;
2530 delete $animate_object{$widget}; 2642 delete $animate_object{$widget};
2531} 2643}
2532 2644
2533%SDL_CB = (
2534 DC::SDL_QUIT => sub { 2645$SDL_CB[DC::SDL_QUIT] = sub {
2535 crash "SDL_QUIT"; 2646 crash "SDL_QUIT";
2536 EV::unloop EV::UNLOOP_ALL; 2647 EV::unloop EV::UNLOOP_ALL;
2537 }, 2648};
2538 DC::SDL_VIDEORESIZE => sub { 2649$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2539 },
2540 DC::SDL_VIDEOEXPOSE => sub { 2650$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2541 DC::UI::full_refresh; 2651 DC::UI::full_refresh;
2542 }, 2652};
2543 DC::SDL_ACTIVEEVENT => sub { 2653$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2544# not useful, as APPACTIVE includes only iconified state, not unmapped 2654# 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# 2655# 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# 2656# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2547# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2657# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2548# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2658# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2659# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2550 }, 2660};
2551 DC::SDL_KEYDOWN => sub { 2661$SDL_CB[DC::SDL_KEYDOWN] = sub {
2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2662 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2553 # alt-enter 2663 # alt-enter
2554 video_shutdown; 2664 video_shutdown;
2555 $FULLSCREEN_ENABLE->toggle; 2665 $FULLSCREEN_ENABLE->toggle;
2556 video_init; 2666 video_init;
2557 } else { 2667 } else {
2558 &DC::UI::feed_sdl_key_down_event; 2668 &DC::UI::feed_sdl_key_down_event;
2559 } 2669 }
2560 update_modbox; 2670 update_modbox;
2561 }, 2671};
2562 DC::SDL_KEYUP => sub { 2672$SDL_CB[DC::SDL_KEYUP] = sub {
2563 &DC::UI::feed_sdl_key_up_event; 2673 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox; 2674 update_modbox;
2565 }, 2675};
2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2676$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2677$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2678$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2569 DC::SDL_USEREVENT => sub { 2679$SDL_CB[DC::SDL_USEREVENT] = sub {
2570 if ($_[0]{code} == 1) { 2680 if ($_[0]{code} == 1) {
2571 audio_channel_finished $_[0]{data1}; 2681 audio_channel_finished $_[0]{data1};
2572 } elsif ($_[0]{code} == 0) { 2682 } elsif ($_[0]{code} == 0) {
2573 audio_music_finished; 2683 audio_music_finished;
2574 }
2575 }, 2684 }
2576); 2685};
2577 2686
2578############################################################################# 2687#############################################################################
2579 2688
2580$SIG{INT} = $SIG{TERM} = sub { 2689$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2690 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2691 #d# TODO calling exit here hangs the process in some futex
2583}; 2692};
2584 2693
2585# due to mac os x + sdl combined briandamage, we need this contortion 2694# due to mac os x + sdl combined braindamage, we need this contortion
2586sub main { 2695sub main {
2587 { 2696 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2697 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2698
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2699 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2716 DC::DB::open_db;
2608 2717
2609 DC::UI::set_layout ($::CFG->{layout}); 2718 DC::UI::set_layout ($::CFG->{layout});
2610 2719
2611 my %DEF_CFG = ( 2720 my %DEF_CFG = (
2721 config_autosave => 1,
2612 sdl_mode => undef, 2722 sdl_mode => undef,
2613 fullscreen => 1, 2723 fullscreen => 1,
2614 fast => 0, 2724 fast => 0,
2615 force_opengl11 => undef, 2725 force_opengl11 => undef,
2616 disable_alpha => 0, 2726 disable_alpha => 0,
2617 smooth_movement => 1, 2727 smooth_movement => 1,
2728 smooth_transitions => 1,
2618 texture_compression => 1, 2729 texture_compression => 1,
2619 map_scale => 1, 2730 map_scale => 1,
2620 fow_enable => 1, 2731 fow_enable => 1,
2621 fow_intensity => 0, 2732 fow_intensity => 0,
2622 map_smoothing => 1, 2733 map_smoothing => 1,
… …
2634 effects_enable => 1, 2745 effects_enable => 1,
2635 effects_volume => 1, 2746 effects_volume => 1,
2636 bgm_enable => 1, 2747 bgm_enable => 1,
2637 bgm_volume => 0.5, 2748 bgm_volume => 0.5,
2638 output_rate => "", 2749 output_rate => "",
2639 pickup => 0, 2750 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2640 inv_sort => "mtime", 2751 inv_sort => "mtime",
2641 default => "profile", # default profile 2752 default => "profile", # default profile
2642 show_tips => 1, 2753 show_tips => 1,
2643 logview_max_par => 1000, 2754 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2755 shift_fire_stop => 0,
2756 uitheme => "wood",
2757 map_shift_x => -24, # arbitrary
2758 map_shift_y => +24, # arbitrary
2645 ); 2759 );
2646 2760
2647 while (my ($k, $v) = each %DEF_CFG) { 2761 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2762 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2763 }
… …
2663 } 2777 }
2664 } 2778 }
2665 2779
2666 sdl_init; 2780 sdl_init;
2667 2781
2782 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2783 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2784
2668 { 2785 {
2669 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2786 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2670 DejaVuSans.ttf 2787 DejaVuSans.ttf
2671 DejaVuSansMono.ttf 2788 DejaVuSansMono.ttf
2672 DejaVuSans-Bold.ttf 2789 DejaVuSans-Bold.ttf
2673 DejaVuSansMono-Bold.ttf 2790 DejaVuSansMono-Bold.ttf
2674 DejaVuSans-Oblique.ttf 2791 DejaVuSans-Oblique.ttf
2675 DejaVuSansMono-Oblique.ttf 2792 DejaVuSansMono-Oblique.ttf
2676 DejaVuSans-BoldOblique.ttf 2793 DejaVuSans-BoldOblique.ttf
2677 DejaVuSansMono-BoldOblique.ttf 2794 DejaVuSansMono-BoldOblique.ttf
2795 mona.ttf
2678 ); 2796 );
2679 2797
2680 DC::add_font $_ for @fonts; 2798 DC::add_font $_ for @fonts;
2681 2799
2682 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2800 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2712 }; 2830 };
2713 2831
2714 delete $SIG{__DIE__}; 2832 delete $SIG{__DIE__};
2715 EV::loop; 2833 EV::loop;
2716 2834
2835 DC::write_cfg if $CFG->{config_autosave};
2836
2717#video_shutdown; 2837 #video_shutdown;
2718#audio_shutdown; 2838 #audio_shutdown;
2839
2719 DC::OpenGL::quit; 2840 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2841 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2842 DC::DB::Server::stop;
2722} 2843}
2723 2844

Diff Legend

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