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.85 by root, Sun Jan 11 03:19:47 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??!?! 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 64 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 65 chdir $root; # for pango modules, maybe other things
81 } 66 }
82 67
… …
106 91
107use Deliantra; 92use Deliantra;
108use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
109 94
110use AnyEvent::Util (); 95use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
113 98
114use Compress::LZF; 99use Compress::LZF;
115use JSON::XS; 100use JSON::XS;
116 101
117use DC; 102use DC;
… …
121} 106}
122 107
123BEGIN { 108BEGIN {
124 $SIG{__DIE__} = sub { 109 $SIG{__DIE__} = sub {
125 return if $^S; 110 return if $^S;
126 crash ("CRASH/DIE: $_[0]" => 1); 111 crash "CRASH/DIE: $_[0]" => 1;
127 DC::fatal Carp::longmess "$_[0]"; 112 DC::fatal Carp::longmess "$_[0]";
128 } 113 }
129} 114}
130 115
131use DC::OpenGL (); 116use DC::OpenGL ();
… …
145 130
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
148 133
149$EV::DIED = sub { 134$EV::DIED = sub {
150 crash ("CRASH/EV::DIED: $@" => 1); 135 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
152}; 137};
153 138
154my $MAX_FPS = 60; 139my $MAX_FPS = 60;
155 140
… …
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;
… …
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};
… …
787} 790}
788 791
789sub dc_connect { 792sub dc_connect {
790 my ($host, $port) = @_; 793 my ($host, $port) = @_;
791 794
792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
793 797
794 $CONN = 798 $CONN =
795 new DC::Protocol 799 new DC::Protocol
796 host => $host, 800 host => $host,
797 port => $port, 801 port => $port,
798 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
799 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
800 mapw => $mapsize, 804 mapw => $mapw,
801 maph => $mapsize, 805 maph => $maph,
802 806
803 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
804 808
805 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
806 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
876} 880}
877 881
878sub graphics_setup { 882sub graphics_setup {
879 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
880 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
881 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 888 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
882 889
883 my $row = 0; 890 my $row = 0;
884 891
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 892 $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, 893 $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, 894 can_events => 1,
888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889 896
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 897 $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, 898 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1, 899 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as " 900 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 " 901 . "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 " 902 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card."); 903 . "by installing the right driver for your graphics card.");
897 904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
906 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
907 value => $CFG->{uitheme},
908 options => [
909 [wood => "Wood (the default)"],
910 [plain => "Plain (very)"],
911 [blue => "Blue (dark)"],
912 [metal => "Metal (light)"],
913 ],
914 tooltip => "Choose the User Interface theme that you like most :)",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
916 );
917
898 my $vidmode_tooltip = 918 my $vidmode_tooltip =
899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 919 "<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>."; 920 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
901 921
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 922 $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); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
904 924
905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
926 c_rescale => 1,
906 force_w => $WIDTH * 0.1, expand => 1, 927 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ], 928 range => [ ($CFG->{sdl_mode}) x 3 ],
908 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
909 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
910 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
911 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
912 933
913 $MODE_SLIDER->connect (changed => sub { 934 $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) = @_; 935 my ($self, $value) = @_;
936
937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
938 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
939 });
940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
941
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
944 state => $CFG->{fullscreen},
945 tooltip => "Bring the client into fullscreen mode.",
946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
947 );
948
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
950 $table->add_at (1, $row++, new DC::UI::CheckBox
951 state => $CFG->{force_opengl11},
952 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
953 . "higher memory usage and slower performance. It will, however, help tremendously on "
954 . "cards that claim to support a feature but fall back to software rendering. "
955 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
956 . "but cards and drivers from other vendors (ATI) are often just as bad. "
957 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
959 );
960
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
962 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{disable_alpha},
964 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
965 . "by disabling a number of textures and transparency effects. Normally, these "
966 . "effects do not cost a lot of resources, but some graphics cards might fall "
967 . "back to extremely slow rendering if this is enabled. If disabling this option "
968 . "noticably improves the framerate of the client please report this! "
969 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
970 on_changed => sub {
971 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value; 972 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
953 0 975 }
954 } 976 );
955 );
956 977
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
958 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 981 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). " 982 . "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 " 983 . "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.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
965 ); 986 );
966 987
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
968 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
969 state => $CFG->{fast}, 990 state => $CFG->{fast},
970 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
971 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
972 ); 993 );
973 994
974 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 995 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
975 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
976 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 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.", 998 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 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
979 ); 1000 );
980 1001
981 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
982 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
983 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
984 on_activate => sub { 1005 on_activate => sub {
985 video_shutdown (); 1006 video_shutdown ();
986 video_init (); 1007 video_init ();
1008 0
987 0 1009 }
988 } 1010 );
989 ); 1011 }
990 1012
1013 {
1014 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1015
1016 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1017
1018 my $row = 0;
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement}, 1021 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1022 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, " 1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.", 1024 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 ); 1026 );
999 1027
1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1001 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1005 ); 1033 );
1006 1034
1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1008 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
1009 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
1010 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1038 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. " 1039 . "This increases load on the graphics subsystem and works only with TRT servers. "
1012 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1014 ); 1042 );
1015 1043
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1044 $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 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1018 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
1019 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1047 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 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1021 ); 1049 );
1022 1050
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1024 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
1025 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 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.", 1054 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 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1028 ); 1056 );
1029 1057
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1058 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1031 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 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, " 1061 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.", 1062 . "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 }, 1063 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1036 ); 1064 );
1037 1065
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1039 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 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.", 1069 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1042 on_changed => sub { 1070 on_changed => sub {
1043 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
1044 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
1045 0 1074 }
1046 } 1075 );
1047 );
1048 1076
1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1050 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
1051 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
1052 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1080 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1053 on_changed => sub { 1081 on_changed => sub {
1054 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
1055 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
1056 0 1085 }
1057 } 1086 );
1058 ); 1087 }
1059 1088
1060 $vbox 1089 $vbox
1061} 1090}
1062 1091
1063our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1226} 1255}
1227 1256
1228sub make_gauge_window { 1257sub make_gauge_window {
1229 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1230 1259
1231 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1232 force_x => 0, 1261 force_x => 0,
1233 force_y => "max", 1262 force_y => "max",
1234 force_w => $WIDTH, 1263 force_w => $WIDTH,
1235 force_h => $gh, 1264 force_h => $gh,
1236 ); 1265 );
… …
1252 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1253 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1254 ], 1283 ],
1255 ); 1284 );
1256 1285
1257 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1286 $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"); 1287 $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"); 1288 $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"); 1289 $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 1290
1273 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1274 1292
1275 $win 1293 $win
1276} 1294}
… …
1730 1748
1731 my $row = 0; 1749 my $row = 0;
1732 1750
1733 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1751 $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 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1735 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1736 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1755 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1737 on_changed => sub { 1756 on_changed => sub {
1738 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1739 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1741 } 1760 }
1742 ); 1761 );
1743 1762
1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1763 $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 1764 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1765 c_colspan => 2,
1746 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1767 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 " 1768 . "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.", 1769 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1750 on_changed => sub { 1770 on_changed => sub {
1751 my ($self, $value) = @_; 1771 my ($self, $value) = @_;
1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1753 0 1773 0
1754 }, 1774 },
1775 );
1776
1777 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1778 $table->add_at (1, $row, new DC::UI::CheckBox
1779 state => $CFG->{config_autosave},
1780 tooltip => "Normally, configuration settings and the user interface layout "
1781 . "are saved on client exit. You can disable this behaviour by "
1782 . "unchecking this checkbox.",
1783 on_changed => sub {
1784 my ($self, $value) = @_;
1785 $CFG->{config_autosave} = $value;
1786 0
1787 }
1788 );
1789 $table->add_at (2, $row++, new DC::UI::Button
1790 text => "Save Now",
1791 tooltip => "Use this to manually save configuration and UI layout when "
1792 . "autosave is disabled.",
1793 on_activate => sub {
1794 DC::write_cfg;
1795 0
1796 }
1755 ); 1797 );
1756 1798
1757 $table 1799 $table
1758} 1800}
1759 1801
… …
1976 $PL_NOTEBOOK->set_current_page ($widget); 2018 $PL_NOTEBOOK->set_current_page ($widget);
1977 $PL_WINDOW->show; 2019 $PL_WINDOW->show;
1978 } 2020 }
1979} 2021}
1980 2022
1981sub player_window { 2023sub make_playerbook {
1982 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2024 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1983 x => "center", 2025 x => "center",
1984 y => "center", 2026 y => "center",
1985 force_w => $WIDTH * 9/10, 2027 force_w => $WIDTH * 9/10,
1986 force_h => $HEIGHT * 9/10, 2028 force_h => $HEIGHT * 9/10,
… …
2020 "License, Author and Source info for media sent by the server."); 2062 "License, Author and Source info for media sent by the server.");
2021 2063
2022 $ntb->set_current_page ($INVENTORY_PAGE); 2064 $ntb->set_current_page ($INVENTORY_PAGE);
2023 2065
2024 $plwin->add ($ntb); 2066 $plwin->add ($ntb);
2025 $plwin
2026} 2067}
2027 2068
2028sub keyboard_setup { 2069sub keyboard_setup {
2029 DC::Macro::keyboard_setup 2070 DC::Macro::keyboard_setup
2030} 2071}
… …
2127 $load_node->((DC::Pod::find @path)[0]); 2168 $load_node->((DC::Pod::find @path)[0]);
2128 $win->show; 2169 $win->show;
2129 }; 2170 };
2130 2171
2131 $win 2172 $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} 2173}
2154 2174
2155sub open_quit_dialog { 2175sub open_quit_dialog {
2156 unless ($QUIT_DIALOG) { 2176 unless ($QUIT_DIALOG) {
2157 $QUIT_DIALOG = new DC::UI::Toplevel 2177 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2190 2210
2191 $QUIT_DIALOG->show; 2211 $QUIT_DIALOG->show;
2192 $QUIT_DIALOG->grab_focus; 2212 $QUIT_DIALOG->grab_focus;
2193} 2213}
2194 2214
2215sub make_menuframe {
2216 $MENUFRAME = new DC::UI::Toplevel
2217 border => 0,
2218 force_x => 0,
2219 force_y => 0,
2220 force_w => $::WIDTH,
2221 child => ($MENUBAR = new DC::UI::HBox),
2222 ;
2223
2224 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2225
2226 # 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
2227 make_gauge_window->show;
2228
2229# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231
2232 make_playerbook;
2233
2234 $MENUPOPUP = DC::UI::Menu->new (items => [
2235 ["Setup…" , sub { $SETUP_DIALOG->toggle_visibility}],
2236 ["Playerbook…\tTab", sub { $PL_WINDOW ->toggle_visibility}],
2237 ["Help Browser…" , sub { $HELP_WINDOW ->toggle_visibility}],
2238 ["Quit…" , sub {
2239 if ($CONN) {
2240 open_quit_dialog;
2241 } else {
2242 EV::unloop EV::UNLOOP_ALL;
2243 }
2244 }],
2245 ]);
2246
2247 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2248 tooltip => "Shows the main menu",
2249 on_button_down => sub { $MENUPOPUP->popup ($_[1]) },
2250 );
2251
2252 $MENUBAR->add ($GAUGES->{prg} = new DC::UI::ExperienceProgress
2253 c_rescale => 1,
2254 padding_x => 6,
2255 padding_y => 3,
2256 force_w => $::WIDTH * 0.1,
2257 tooltip => "This progress bar shows your progress towards the next character level.",
2258 );
2259 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::Label
2260 align => 1, can_hover => 1, can_events => 1,
2261 text => "Total Experience",
2262 tooltip => "#stat_exp",
2263 fontsize => 0.8,
2264 );
2265 $MENUBAR->add ($GAUGES->{sklprg} = new DC::UI::ExperienceProgress
2266 c_rescale => 1,
2267 padding_x => 6,
2268 padding_y => 3,
2269 force_w => $::WIDTH * 0.2,
2270 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2271 );
2272 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2273 expand => 1,
2274 align => 1, can_hover => 1, can_events => 1,
2275 text => "Range and Combat Slots",
2276 tooltip => "#stat_ranged",
2277 );
2278
2279 $MENUFRAME->show;
2280}
2281
2282sub open_string_query {
2283 my ($title, $cb, $txt, $tooltip) = @_;
2284 my $dialog = new DC::UI::Toplevel
2285 x => "center",
2286 y => "center",
2287 z => 50,
2288 force_w => $WIDTH * 4/5,
2289 title => $title;
2290
2291 $dialog->add (
2292 my $e = new DC::UI::Entry
2293 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2294 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2295 tooltip => $tooltip
2296 );
2297
2298 $e->grab_focus;
2299 $e->set_text ($txt) if $txt;
2300 $dialog->show;
2301}
2302
2195sub show_tip_of_the_day { 2303sub show_tip_of_the_day {
2196 # find all tips 2304 # find all tips
2197 my @tod = DC::Pod::find tip_of_the_day => "*"; 2305 my @tod = DC::Pod::find tip_of_the_day => "*";
2198 2306
2199 DC::DB::get state => "tip_of_the_day", sub { 2307 DC::DB::get state => "tip_of_the_day", sub {
… …
2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2358 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2251 and die "SDL::Init failed!\n"; 2359 and die "SDL::Init failed!\n";
2252} 2360}
2253 2361
2254sub video_init { 2362sub video_init {
2363 DC::set_theme $CFG->{uitheme};
2364
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2365 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0; 2366 $SDL_REINIT = 0;
2257 2367
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2368 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2369 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2373 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264 2374
2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2375 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default 2376 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267 2377
2268 # now choose biggets mode <= 1024x768 2378 # now choose biggest mode <= 1024x768
2269 for (0 .. $#SDL_MODES) { 2379 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2380 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_; 2381 $CFG->{sdl_mode} = $_;
2272 } 2382 }
2273 } 2383 }
… …
2336 2446
2337 (new DC::UI::Frame 2447 (new DC::UI::Frame
2338 bg => [0, 0, 0, 0.4], 2448 bg => [0, 0, 0, 0.4],
2339 force_x => 0, 2449 force_x => 0,
2340 force_y => "max", 2450 force_y => "max",
2341 child => (my $LR = new DC::UI::VBox), 2451 child => (my $LL = new DC::UI::VBox),
2342 )->show; 2452 )->show;
2343 2453
2344 $LR->add ($STATUSBOX); 2454 $LL->add ($STATUSBOX);
2345 $LR->add ($MODBOX); 2455 $LL->add ($MODBOX);
2346 $LR->add (new DC::UI::Label 2456 $LL->add (new DC::UI::Label
2347 align => 0, 2457 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2458 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5, 2459 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7], 2460 fg => [1, 1, 0, 0.7],
2351 ); 2461 );
… …
2356 x => 0, 2466 x => 0,
2357 y => $FONTSIZE + 8, 2467 y => $FONTSIZE + 8,
2358 border_bg => [1, 1, 1, 192/255], 2468 border_bg => [1, 1, 1, 192/255],
2359 bg => [1, 1, 1, 0], 2469 bg => [1, 1, 1, 0],
2360 child => ($MAPMAP = new DC::MapWidget::MapMap 2470 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.", 2471 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2362 ), 2472 ),
2363 )->show; 2473 )->show;
2364 2474
2365 $MAPWIDGET = new DC::MapWidget; 2475 $MAPWIDGET = new DC::MapWidget;
2366 $MAPWIDGET->connect (activate_console => sub { 2476 $MAPWIDGET->connect (activate_console => sub {
… …
2420 . "After pressing the combo the binding will be saved automatically and the " 2530 . "After pressing the combo the binding will be saved automatically and the "
2421 . "binding editor closes"); 2531 . "binding editor closes");
2422 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2532 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2423 "Some debuggin' options. Do not ask."); 2533 "Some debuggin' options. Do not ask.");
2424 2534
2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2535 make_menuframe;
2426 2536
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; 2537 $SETUP_DIALOG->show;
2467 $MESSAGE_WINDOW->show; 2538 $MESSAGE_WINDOW->show;
2468 } 2539 }
2469 2540
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2541 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2542 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472 2543
2473 $CAVEAT_LABEL->set_text ("None :)"); 2544 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2545 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2546 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2580$SIG{INT} = $SIG{TERM} = sub { 2651$SIG{INT} = $SIG{TERM} = sub {
2581 EV::unloop; 2652 EV::unloop;
2582 #d# TODO calling exit here hangs the process in some futex 2653 #d# TODO calling exit here hangs the process in some futex
2583}; 2654};
2584 2655
2585# due to mac os x + sdl combined briandamage, we need this contortion 2656# due to mac os x + sdl combined braindamage, we need this contortion
2586sub main { 2657sub main {
2587 { 2658 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2659 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589 2660
2590 if (-e "$Deliantra::VARDIR/client.cf") { 2661 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2607 DC::DB::open_db; 2678 DC::DB::open_db;
2608 2679
2609 DC::UI::set_layout ($::CFG->{layout}); 2680 DC::UI::set_layout ($::CFG->{layout});
2610 2681
2611 my %DEF_CFG = ( 2682 my %DEF_CFG = (
2683 config_autosave => 1,
2612 sdl_mode => undef, 2684 sdl_mode => undef,
2613 fullscreen => 1, 2685 fullscreen => 1,
2614 fast => 0, 2686 fast => 0,
2615 force_opengl11 => undef, 2687 force_opengl11 => undef,
2616 disable_alpha => 0, 2688 disable_alpha => 0,
… …
2640 inv_sort => "mtime", 2712 inv_sort => "mtime",
2641 default => "profile", # default profile 2713 default => "profile", # default profile
2642 show_tips => 1, 2714 show_tips => 1,
2643 logview_max_par => 1000, 2715 logview_max_par => 1000,
2644 shift_fire_stop => 0, 2716 shift_fire_stop => 0,
2717 uitheme => "wood",
2645 ); 2718 );
2646 2719
2647 while (my ($k, $v) = each %DEF_CFG) { 2720 while (my ($k, $v) = each %DEF_CFG) {
2648 $CFG->{$k} = $v unless exists $CFG->{$k}; 2721 $CFG->{$k} = $v unless exists $CFG->{$k};
2649 } 2722 }
… …
2712 }; 2785 };
2713 2786
2714 delete $SIG{__DIE__}; 2787 delete $SIG{__DIE__};
2715 EV::loop; 2788 EV::loop;
2716 2789
2790 DC::write_cfg if $CFG->{config_autosave};
2791
2717#video_shutdown; 2792 #video_shutdown;
2718#audio_shutdown; 2793 #audio_shutdown;
2794
2719 DC::OpenGL::quit; 2795 DC::OpenGL::quit;
2720 DC::SDL_Quit; 2796 DC::SDL_Quit;
2721 DC::DB::Server::stop; 2797 DC::DB::Server::stop;
2722} 2798}
2723 2799

Diff Legend

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