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.62 by root, Fri Aug 22 21:53:07 2008 UTC vs.
Revision 1.94 by root, Sun Mar 29 22:28:13 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;
… …
97 80
98# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 83 if %PAR::LibCache;
101 84
102use Time::HiRes 'time';
103use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
104use List::Util qw(max min); 88use List::Util qw(max min);
105 89
106use Deliantra; 90use Deliantra;
107use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
108 92
109use AnyEvent::DNS; 93use AnyEvent::Util ();
110use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
111 96
112use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
113 99
114use DC; 100use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
116use DC::OpenGL (); 114use DC::OpenGL ();
117use DC::Protocol; 115use DC::Protocol;
118use DC::DB; 116use DC::DB;
119use DC::UI; 117use DC::UI;
120use DC::UI::Canvas; 118use DC::UI::Canvas;
121use DC::UI::Inventory; 119use DC::UI::Inventory;
122use DC::UI::SpellList; 120use DC::UI::SpellList;
123use DC::UI::Dockable; 121use DC::UI::Dockable;
124use DC::UI::Dockbar; 122use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 123use DC::UI::ChatView;
127use DC::MessageDistributor; 124use DC::MessageDistributor;
128use DC::Pod; 125use DC::Pod;
129use DC::MapWidget; 126use DC::MapWidget;
130use DC::Macro; 127use DC::Macro;
131 128
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
134 131
135$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
137}; 135};
138 136
139my $MAX_FPS = 60; 137my $MAX_FPS = 60;
140 138
… …
142 140
143our $LAST_REFRESH; 141our $LAST_REFRESH;
144our $NOW; 142our $NOW;
145 143
146our $CFG; 144our $CFG;
147our $CONN;
148our $PROFILE; # current profile 145our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
150 147
151our $WANT_REFRESH; 148our $WANT_REFRESH;
152 149
… …
161our $FONTSIZE; 158our $FONTSIZE;
162 159
163our $FONT_PROP; 160our $FONT_PROP;
164our $FONT_FIXED; 161our $FONT_FIXED;
165 162
163our $CONN;
164
166our $MAP; 165our $MAP;
167our $MAPMAP; 166our $MAPMAP;
168our $MAPWIDGET; 167our $MAPWIDGET;
169our $COMPLETER; 168our $COMPLETER;
170our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
171our $METASERVER; 173our $METASERVER;
172our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
173our $QUIT_DIALOG; 175our $QUIT_DIALOG;
174our $HOST_ENTRY; 176our $HOST_ENTRY;
175our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
201our $FLOORBOX; 203our $FLOORBOX;
202our $GAUGES; 204our $GAUGES;
203our $STATWIDS; 205our $STATWIDS;
204 206
205our $SDL_ACTIVE; 207our $SDL_ACTIVE;
206our %SDL_CB; 208our @SDL_CB;
207 209
208our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
209our $STATUSBOX; 211our $STATUSBOX;
210our $MODBOX; 212our $MODBOX;
211our $DEBUG_STATUS; 213our $DEBUG_STATUS;
212 214
213our $INV; 215our $INV;
214our $INVR; 216our $INVR;
215our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
216 258
217############################################################################# 259#############################################################################
218 260
219sub status { 261sub status {
220 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
302 or return; 344 or return;
303 345
304 $meta->{data} 346 $meta->{data}
305 or return; 347 or return;
306 348
307 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
308 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
309 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
310 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
311 &audio_music_push ($face); 353 &audio_music_push ($face);
312 } 354 }
313 } else { 355 } else {
314 # fetch from database 356 # fetch from database
315 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
316 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
317 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
318 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
319 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
320 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
321 363
322 audio_sound_push ($face); 364 audio_sound_push ($face);
323 }; 365 };
… …
370 412
371 audio_music_update_volume; 413 audio_music_update_volume;
372 414
373 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
374 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
375 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
376 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
377 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
378 423
379 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
380 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
381 426
382 my $NOW = time; 427 my $NOW = time;
383 428
384 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
385 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
743} 788}
744 789
745sub dc_connect { 790sub dc_connect {
746 my ($host, $port) = @_; 791 my ($host, $port) = @_;
747 792
748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 793 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
794 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
749 795
750 $CONN = 796 $CONN =
751 new DC::Protocol 797 new DC::Protocol
752 host => $host, 798 host => $host,
753 port => $port, 799 port => $port,
754 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
755 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
756 mapw => $mapsize, 802 mapw => $mapw,
757 maph => $mapsize, 803 maph => $maph,
758 804
759 client => "$DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
760 806
761 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
762 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
… …
770 816
771 on_connect => sub { 817 on_connect => sub {
772 if ($_[0]) { 818 if ($_[0]) {
773 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
774 820
775 status "login successful"; 821 status "successfully connected to the server";
776 } else { 822 } else {
777 undef $CONN; 823 undef $CONN;
778 status "unable to connect: $!"; 824 status "unable to connect: $!";
779 stop_game(); 825 stop_game();
780 } 826 }
… …
807 dc_connect $host, $port; 853 dc_connect $host, $port;
808 } 854 }
809} 855}
810 856
811sub stop_game { 857sub stop_game {
858 crash "stop_game";
859
812 $LOGIN_BUTTON->set_text ("Login / Register"); 860 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 861 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 862 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 863 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 864 $SPELL_LIST->clear_spells;
… …
830} 878}
831 879
832sub graphics_setup { 880sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 881 my $vbox = new DC::UI::VBox;
834 882
883 {
884 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
885
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 886 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 887
837 my $row = 0; 888 my $row = 0;
838 889
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
840 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 891 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
841 can_events => 1, 892 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 893 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 894
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 896 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 897 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 898 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues " 899 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or " 900 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 901 . "by installing the right driver for your graphics card.");
851 902
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
904 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
905 value => $CFG->{uitheme},
906 options => [
907 [wood => "Wood (the default)"],
908 [plain => "Plain (very)"],
909 [blue => "Blue (dark)"],
910 [metal => "Metal (light)"],
911 ],
912 tooltip => "Choose the User Interface theme that you like most :)",
913 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
914 );
915
852 my $vidmode_tooltip = 916 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 917 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 918 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 919
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 921 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 922
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 923 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
924 c_rescale => 1,
860 force_w => $WIDTH * 0.1, expand => 1, 925 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 926 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 927 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 928 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 929 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 930 can_events => 1, tooltip => $vidmode_tooltip);
866 931
867 $MODE_SLIDER->connect (changed => sub { 932 $MODE_SLIDER->connect (changed => sub {
868 my ($self, $value) = @_;
869
870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
872 });
873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
877 state => $CFG->{fullscreen},
878 tooltip => "Bring the client into fullscreen mode.",
879 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
880 );
881
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
883 $table->add_at (1, $row++, new DC::UI::CheckBox
884 state => $CFG->{force_opengl11},
885 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
886 . "higher memory usage and slower performance. It will, however, help tremendously on "
887 . "cards that claim to support a feature but fall back to software rendering. "
888 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
889 . "but cards and drivers from other vendors (ATI) are often just as bad. "
890 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_; 933 my ($self, $value) = @_;
934
935 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
936 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
937 });
938 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
941 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
942 state => $CFG->{fullscreen},
943 tooltip => "Bring the client into fullscreen mode.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
945 );
946
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
948 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{force_opengl11},
950 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
951 . "higher memory usage and slower performance. It will, however, help tremendously on "
952 . "cards that claim to support a feature but fall back to software rendering. "
953 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
954 . "but cards and drivers from other vendors (ATI) are often just as bad. "
955 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
956 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
957 );
958
959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{disable_alpha},
962 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
963 . "by disabling a number of textures and transparency effects. Normally, these "
964 . "effects do not cost a lot of resources, but some graphics cards might fall "
965 . "back to extremely slow rendering if this is enabled. If disabling this option "
966 . "noticably improves the framerate of the client please report this! "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub {
969 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 970 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 971 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
972 0
907 0 973 }
908 } 974 );
909 );
910 975
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 978 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 979 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
915 . "will save a lot of memory and increase performance. The compression algorithm " 980 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
916 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 981 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
917 . "forced OpenGL 1.1 mode.", 982 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 983 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 984 );
920 985
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 988 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 989 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 991 );
927 992
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 994 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 995 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
931 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 996 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
932 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 997 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 998 );
934 999
935 $table->add_at (1, $row++, new DC::UI::Button 1000 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 1001 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 1002 tooltip => "Apply the video settings above.",
938 on_activate => sub { 1003 on_activate => sub {
939 video_shutdown (); 1004 video_shutdown ();
940 video_init (); 1005 video_init ();
1006 0
941 0 1007 }
942 } 1008 );
943 ); 1009 }
944 1010
1011 {
1012 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1013
1014 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1015
1016 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1018 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1019 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1020 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1021 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1022 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1024 );
953 1025
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1028 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1029 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1031 );
960 1032
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1035 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1036 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
965 . "This increases load on the graphics subsystem and works only with TRT servers. " 1037 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1038 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1039 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1040 );
969 1041
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
971 $table->add_at (1, $row++, new DC::UI::CheckBox 1043 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1044 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1045 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1046 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1047 );
976 1048
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1051 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
980 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1052 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
981 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1054 );
983 1055
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1057 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1058 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
987 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1059 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
988 . "but you still need to press apply to correctly re-layout the widget.", 1060 . "but you still need to press apply to correctly re-layout the widget.",
989 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1061 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1062 );
991 1063
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1065 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1066 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
995 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1067 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1068 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1069 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1070 &set_gauge_window_fontsize;
1071 0
999 0 1072 }
1000 } 1073 );
1001 );
1002 1074
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1075 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1076 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1077 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1078 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1079 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1080 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1081 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1082 0
1010 0 1083 }
1011 } 1084 );
1012 ); 1085 }
1013 1086
1014 $vbox 1087 $vbox
1015} 1088}
1016 1089
1017our $AUDIO_HW_CHUNKSIZE; 1090our $AUDIO_HW_CHUNKSIZE;
… …
1180} 1253}
1181 1254
1182sub make_gauge_window { 1255sub make_gauge_window {
1183 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1256 my $gh = int $HEIGHT * $CFG->{gauge_size};
1184 1257
1185 my $win = new DC::UI::Frame ( 1258 $GAUGES->{win} = my $win = new DC::UI::Frame (
1186 force_x => 0, 1259 force_x => 0,
1187 force_y => "max", 1260 force_y => "max",
1188 force_w => $WIDTH, 1261 force_w => $WIDTH,
1189 force_h => $gh, 1262 force_h => $gh,
1190 ); 1263 );
… …
1206 (new DC::UI::Empty expand => 1), 1279 (new DC::UI::Empty expand => 1),
1207 (my $hb = new DC::UI::HBox), 1280 (my $hb = new DC::UI::HBox),
1208 ], 1281 ],
1209 ); 1282 );
1210 1283
1211 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1284 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1212 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1285 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1213 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1286 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1214 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1287 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1215
1216 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1217 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1218 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1219 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1220
1221 $GAUGES = {
1222 exp => $exp, prg => $prg, sklprg => $sklprg,
1223 win => $win, range => $rng,
1224 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1225 };
1226 1288
1227 &set_gauge_window_fontsize; 1289 &set_gauge_window_fontsize;
1228 1290
1229 $win 1291 $win
1230} 1292}
… …
1572 ); 1634 );
1573 1635
1574 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1636 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1575 $table->add_at (1, 4, new DC::UI::Entry 1637 $table->add_at (1, 4, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{user}, 1638 text => $CFG->{profile}{default}{user},
1577 tooltip => "The name of your character on the server.", 1639 tooltip => "The name of your character on the server. The name is case-sensitive!",
1578 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1640 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1579 ); 1641 );
1580 1642
1581 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1643 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1582 $table->add_at (1, 5, new DC::UI::Entry 1644 $table->add_at (1, 5, new DC::UI::Entry
… …
1597 }, 1659 },
1598 ); 1660 );
1599 1661
1600 $vbox->add (new DC::UI::FancyFrame 1662 $vbox->add (new DC::UI::FancyFrame
1601 label => "How to Play", 1663 label => "How to Play",
1602 min_h => 200, 1664 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1665 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1666 markup =>
1605 "First select a suitable video resolution in the Graphics tab, above.\n\n" 1667 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1606 . "Then register a new account (or use an existing one if you have one). " 1668 . "Then register a new account (or use an existing one if you have one). "
1607 . "To register an account, choose a username that hasn't been taken yet (just guess) and " 1669 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1608 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1670 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1609 ), 1671 ),
1610 ); 1672 );
… …
1684 1746
1685 my $row = 0; 1747 my $row = 0;
1686 1748
1687 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1749 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1688 $table->add_at (1, $row++, new DC::UI::CheckBox 1750 $table->add_at (1, $row++, new DC::UI::CheckBox
1751 c_colspan => 2,
1689 state => $CFG->{show_tips}, 1752 state => $CFG->{show_tips},
1690 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1753 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1691 on_changed => sub { 1754 on_changed => sub {
1692 my ($self, $value) = @_; 1755 my ($self, $value) = @_;
1693 $CFG->{show_tips} = $value; 1756 $CFG->{show_tips} = $value;
… …
1695 } 1758 }
1696 ); 1759 );
1697 1760
1698 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1699 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1763 c_colspan => 2,
1700 text => $CFG->{logview_max_par}, 1764 text => $CFG->{logview_max_par},
1701 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1702 . "sends more messages than this number, older messages get removed to save memory and " 1766 . "sends more messages than this number, older messages get removed to save memory and "
1703 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1704 on_changed => sub { 1768 on_changed => sub {
… …
1706 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1707 0 1771 0
1708 }, 1772 },
1709 ); 1773 );
1710 1774
1775 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1776 $table->add_at (1, $row, new DC::UI::CheckBox
1777 state => $CFG->{config_autosave},
1778 tooltip => "Normally, configuration settings and the user interface layout "
1779 . "are saved on client exit. You can disable this behaviour by "
1780 . "unchecking this checkbox.",
1781 on_changed => sub {
1782 my ($self, $value) = @_;
1783 $CFG->{config_autosave} = $value;
1784 0
1785 }
1786 );
1787 $table->add_at (2, $row++, new DC::UI::Button
1788 text => "Save Now",
1789 tooltip => "Use this to manually save configuration and UI layout when "
1790 . "autosave is disabled.",
1791 on_activate => sub {
1792 DC::write_cfg;
1793 0
1794 }
1795 );
1796
1711 $table 1797 $table
1712} 1798}
1713 1799
1714sub autopickup_setup { 1800sub autopickup_setup {
1715 my $r = new DC::UI::ScrolledWindow ( 1801 my $r = new DC::UI::ScrolledWindow (
… …
1721 col_expand => [0, 1, 0, 1], 1807 col_expand => [0, 1, 0, 1],
1722 ); 1808 );
1723 1809
1724 for ( 1810 for (
1725 ["General", 0, 0, 1811 ["General", 0, 0,
1726 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1727 ["Inhibit autopickup" => PICKUP_INHIBIT], 1812# ["Inhibit autopickup" => PICKUP_INHIBIT],
1728 ["Stop before pickup" => PICKUP_STOP], 1813 ["Stop before pickup" => PICKUP_STOP],
1729 ["Debug autopickup" => PICKUP_DEBUG], 1814 ["Debug autopickup" => PICKUP_DEBUG],
1730 ], 1815 ],
1731 ["Weapons", 0, 6, 1816 ["Weapons", 0, 6,
1732 ["All weapons" => PICKUP_ALLWEAPON], 1817 ["All weapons" => PICKUP_ALLWEAPON],
… …
1780 $::CFG->{pickup} |= $mask; 1865 $::CFG->{pickup} |= $mask;
1781 } else { 1866 } else {
1782 $::CFG->{pickup} &= ~$mask; 1867 $::CFG->{pickup} &= ~$mask;
1783 } 1868 }
1784 1869
1785 $::CONN->send_command ("pickup $::CFG->{pickup}") 1870 $::CONN->send_pickup ($::CFG->{pickup})
1786 if defined $::CONN; 1871 if defined $::CONN;
1787 1872
1788 0 1873 0
1789 }); 1874 });
1790 1875
… …
1807 }); 1892 });
1808 1893
1809 $table->add_at (3, 18, new DC::UI::Button 1894 $table->add_at (3, 18, new DC::UI::Button
1810 text => "set", 1895 text => "set",
1811 on_activate => sub { 1896 on_activate => sub {
1812 $::CONN->send_command ("pickup $::CFG->{pickup}") 1897 $::CONN->send_pickup ($::CFG->{pickup})
1813 if defined $::CONN; 1898 if defined $::CONN;
1814 0 1899 0
1815 }); 1900 });
1816 1901
1817 $r 1902 $r
… …
1930 $PL_NOTEBOOK->set_current_page ($widget); 2015 $PL_NOTEBOOK->set_current_page ($widget);
1931 $PL_WINDOW->show; 2016 $PL_WINDOW->show;
1932 } 2017 }
1933} 2018}
1934 2019
1935sub player_window { 2020sub make_playerbook {
1936 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2021 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1937 x => "center", 2022 x => "center",
1938 y => "center", 2023 y => "center",
1939 force_w => $WIDTH * 9/10, 2024 force_w => $WIDTH * 9/10,
1940 force_h => $HEIGHT * 9/10, 2025 force_h => $HEIGHT * 9/10,
… …
1974 "License, Author and Source info for media sent by the server."); 2059 "License, Author and Source info for media sent by the server.");
1975 2060
1976 $ntb->set_current_page ($INVENTORY_PAGE); 2061 $ntb->set_current_page ($INVENTORY_PAGE);
1977 2062
1978 $plwin->add ($ntb); 2063 $plwin->add ($ntb);
1979 $plwin
1980} 2064}
1981 2065
1982sub keyboard_setup { 2066sub keyboard_setup {
1983 DC::Macro::keyboard_setup 2067 DC::Macro::keyboard_setup
1984} 2068}
1985 2069
1986sub help_window { 2070sub make_help_window {
1987 my $win = new DC::UI::Toplevel 2071 my $win = new DC::UI::Toplevel
1988 x => 'center', 2072 x => 'center',
1989 y => 'center', 2073 y => 'center',
1990 z => 4, 2074 z => 4,
1991 name => 'doc_browser', 2075 name => 'doc_browser',
… …
2080 2164
2081 $load_node->((DC::Pod::find @path)[0]); 2165 $load_node->((DC::Pod::find @path)[0]);
2082 $win->show; 2166 $win->show;
2083 }; 2167 };
2084 2168
2085 $win 2169 $HELP_WINDOW = $win;
2086}
2087
2088sub open_string_query {
2089 my ($title, $cb, $txt, $tooltip) = @_;
2090 my $dialog = new DC::UI::Toplevel
2091 x => "center",
2092 y => "center",
2093 z => 50,
2094 force_w => $WIDTH * 4/5,
2095 title => $title;
2096
2097 $dialog->add (
2098 my $e = new DC::UI::Entry
2099 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2100 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2101 tooltip => $tooltip
2102 );
2103
2104 $e->grab_focus;
2105 $e->set_text ($txt) if $txt;
2106 $dialog->show;
2107} 2170}
2108 2171
2109sub open_quit_dialog { 2172sub open_quit_dialog {
2110 unless ($QUIT_DIALOG) { 2173 unless ($QUIT_DIALOG) {
2111 $QUIT_DIALOG = new DC::UI::Toplevel 2174 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2133 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2134 ); 2197 );
2135 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2136 text => "Quit anyway", 2199 text => "Quit anyway",
2137 expand => 1, 2200 expand => 1,
2138 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2139 ); 2205 );
2140 } 2206 }
2141 2207
2142 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2143 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
2210}
2211
2212sub make_menubar {
2213 $MENUFRAME = new DC::UI::Toplevel
2214 border => 0,
2215 force_x => 0,
2216 force_y => 0,
2217 force_w => $::WIDTH,
2218 child => ($MENUBAR = new DC::UI::HBox),
2219 ;
2220
2221 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2222
2223 # 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
2224 make_gauge_window->show;
2225
2226# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228
2229 make_playerbook;
2230
2231 $MENUPOPUP = DC::UI::Menu->new (items => [
2232 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2233 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2234 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2235 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2236 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2237 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2238 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2239 ["Quit…" , sub {
2240 if ($CONN) {
2241 open_quit_dialog;
2242 } else {
2243 EV::unloop EV::UNLOOP_ALL;
2244 }
2245 }],
2246 ]);
2247
2248 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2249 tooltip => "Shows the main menu",
2250 on_button_down => sub {
2251 my ($self, $ev) = @_;
2252 local $ev->{x} = 0;
2253 local $ev->{y} = 0;
2254 $MENUPOPUP->popup ($ev);
2255 },
2256 );
2257
2258 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2259 padding_x => 6,
2260 padding_y => 3,
2261 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2262 template => " Exp: 888,888,888,888 (lvl 188) ",
2263 );
2264
2265 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2266 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2267 . "will automatically pick up items as defined by your item pickup settings "
2268 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2269 . "disable autopickup by disabling this checkbox.",
2270 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2271 on_changed => sub {
2272 my ($self, $value) = @_;
2273 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2274 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2275 $CONN->send_pickup ($CFG->{pickup})
2276 if $CONN;
2277 },
2278 );
2279
2280 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2281 c_rescale => 1,
2282 padding_x => 6,
2283 padding_y => 3,
2284 force_w => $::WIDTH * 0.2,
2285 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2286 template => "two handed weapons 99%",
2287 );
2288
2289 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2290 expand => 1,
2291 align => 1, can_hover => 1, can_events => 1,
2292 text => "Range and Combat Slots",
2293 tooltip => "#stat_ranged",
2294 );
2295
2296 $MENUFRAME->show;
2297}
2298
2299sub open_string_query {
2300 my ($title, $cb, $txt, $tooltip) = @_;
2301 my $dialog = new DC::UI::Toplevel
2302 x => "center",
2303 y => "center",
2304 z => 50,
2305 force_w => $WIDTH * 4/5,
2306 title => $title;
2307
2308 $dialog->add (
2309 my $e = new DC::UI::Entry
2310 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2311 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2312 tooltip => $tooltip
2313 );
2314
2315 $e->grab_focus;
2316 $e->set_text ($txt) if $txt;
2317 $dialog->show;
2144} 2318}
2145 2319
2146sub show_tip_of_the_day { 2320sub show_tip_of_the_day {
2147 # find all tips 2321 # find all tips
2148 my @tod = DC::Pod::find tip_of_the_day => "*"; 2322 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2375 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2202 and die "SDL::Init failed!\n"; 2376 and die "SDL::Init failed!\n";
2203} 2377}
2204 2378
2205sub video_init { 2379sub video_init {
2380 DC::set_theme $CFG->{uitheme};
2381
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2382 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0; 2383 $SDL_REINIT = 0;
2208 2384
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2385 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2386 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2390 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215 2391
2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2392 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default 2393 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218 2394
2219 # now choose biggets mode <= 1024x768 2395 # now choose biggest mode <= 1024x768
2220 for (0 .. $#SDL_MODES) { 2396 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2397 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_; 2398 $CFG->{sdl_mode} = $_;
2223 } 2399 }
2224 } 2400 }
… …
2287 2463
2288 (new DC::UI::Frame 2464 (new DC::UI::Frame
2289 bg => [0, 0, 0, 0.4], 2465 bg => [0, 0, 0, 0.4],
2290 force_x => 0, 2466 force_x => 0,
2291 force_y => "max", 2467 force_y => "max",
2292 child => (my $LR = new DC::UI::VBox), 2468 child => (my $LL = new DC::UI::VBox),
2293 )->show; 2469 )->show;
2294 2470
2295 $LR->add ($STATUSBOX); 2471 $LL->add ($STATUSBOX);
2296 $LR->add ($MODBOX); 2472 $LL->add ($MODBOX);
2297 $LR->add (new DC::UI::Label 2473 $LL->add (new DC::UI::Label
2298 align => 0, 2474 align => 0,
2299 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2475 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2300 fontsize => 0.5, 2476 fontsize => 0.5,
2301 fg => [1, 1, 0, 0.7], 2477 fg => [1, 1, 0, 0.7],
2302 ); 2478 );
2303 2479
2304 DC::UI::Toplevel->new ( 2480 DC::UI::Toplevel->new (
2305 title => "Minimap", 2481 title => "Minimap",
2306 name => "mapmap", 2482 name => "mapmap",
2307 x => 0, 2483 x => 0,
2308 y => $FONTSIZE + 8, 2484 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2309 border_bg => [1, 1, 1, 192/255], 2485 border_bg => [1, 1, 1, 192/255],
2310 bg => [1, 1, 1, 0], 2486 bg => [1, 1, 1, 0],
2311 child => ($MAPMAP = new DC::MapWidget::MapMap 2487 child => ($MAPMAP = new DC::MapWidget::MapMap
2312 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2488 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2313 ), 2489 ),
2314 )->show; 2490 )->show;
2315 2491
2316 $MAPWIDGET = new DC::MapWidget; 2492 $MAPWIDGET = new DC::MapWidget;
2317 $MAPWIDGET->connect (activate_console => sub { 2493 $MAPWIDGET->connect (activate_console => sub {
… …
2342 $METASERVER = metaserver_dialog; 2518 $METASERVER = metaserver_dialog;
2343 # the name is changed to not conflict with the older name as users could have hidden it 2519 # the name is changed to not conflict with the older name as users could have hidden it
2344 $MESSAGE_WINDOW = new DC::UI::Dockbar 2520 $MESSAGE_WINDOW = new DC::UI::Dockbar
2345 name => "message_window2", 2521 name => "message_window2",
2346 title => 'Messages', 2522 title => 'Messages',
2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2347 force_w => $::WIDTH * 0.6, 2524 force_w => $::WIDTH * 0.6,
2348 force_h => $::HEIGHT * 0.25, 2525 force_h => $::HEIGHT * 0.25,
2349 ; 2526 ;
2350 2527
2351 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2528 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2371 . "After pressing the combo the binding will be saved automatically and the " 2548 . "After pressing the combo the binding will be saved automatically and the "
2372 . "binding editor closes"); 2549 . "binding editor closes");
2373 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2550 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2374 "Some debuggin' options. Do not ask."); 2551 "Some debuggin' options. Do not ask.");
2375 2552
2376 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2553 make_help_window;
2554 make_menubar;
2377 2555
2378 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2379 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2380
2381# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2382# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2383
2384 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
2385
2386 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2387 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2388
2389 $BUTTONBAR->add (new DC::UI::Button
2390 text => "Save Config",
2391 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2392 on_activate => sub {
2393 $::CFG->{layout} = DC::UI::get_layout;
2394 DC::write_cfg;
2395 status "Configuration Saved";
2396 0
2397 },
2398 );
2399
2400 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2401 tooltip => "View Documentation");
2402
2403 $BUTTONBAR->add (new DC::UI::Button
2404 text => "Quit",
2405 tooltip => "Terminates the program",
2406 on_activate => sub {
2407 if ($CONN) {
2408 open_quit_dialog;
2409 } else {
2410 EV::unloop EV::UNLOOP_ALL;
2411 }
2412 0
2413 },
2414 );
2415
2416 $BUTTONBAR->show;
2417 $SETUP_DIALOG->show; 2556 $SETUP_DIALOG->show;
2418 $MESSAGE_WINDOW->show; 2557 $MESSAGE_WINDOW->show;
2419 } 2558 }
2420 2559
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2560 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2561 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423 2562
2424 $CAVEAT_LABEL->set_text ("None :)"); 2563 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2564 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2565 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2457my $want_refresh = EV::prepare_ns \&force_refresh; 2596my $want_refresh = EV::prepare_ns \&force_refresh;
2458 2597
2459my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2598my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2460 $NOW = EV::now; 2599 $NOW = EV::now;
2461 2600
2462 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2601 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2463 for DC::poll_events; 2602 for DC::poll_events;
2464 2603
2465 if (%animate_object) { 2604 if (%animate_object) {
2466 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2605 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2467 $WANT_REFRESH = 1; 2606 $WANT_REFRESH = 1;
… …
2479sub animation_stop { 2618sub animation_stop {
2480 my ($widget) = @_; 2619 my ($widget) = @_;
2481 delete $animate_object{$widget}; 2620 delete $animate_object{$widget};
2482} 2621}
2483 2622
2484%SDL_CB = (
2485 DC::SDL_QUIT => sub { 2623$SDL_CB[DC::SDL_QUIT] = sub {
2624 crash "SDL_QUIT";
2486 EV::unloop EV::UNLOOP_ALL; 2625 EV::unloop EV::UNLOOP_ALL;
2487 }, 2626};
2488 DC::SDL_VIDEORESIZE => sub { 2627$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2489 },
2490 DC::SDL_VIDEOEXPOSE => sub { 2628$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2491 DC::UI::full_refresh; 2629 DC::UI::full_refresh;
2492 }, 2630};
2493 DC::SDL_ACTIVEEVENT => sub { 2631$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2494# not useful, as APPACTIVE includes only iconified state, not unmapped 2632# not useful, as APPACTIVE includes only iconified state, not unmapped
2495# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2633# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2496# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2634# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2497# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2635# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2498# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2636# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2499# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2637# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2500 }, 2638};
2501 DC::SDL_KEYDOWN => sub { 2639$SDL_CB[DC::SDL_KEYDOWN] = sub {
2502 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2640 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2503 # alt-enter 2641 # alt-enter
2504 video_shutdown; 2642 video_shutdown;
2505 $FULLSCREEN_ENABLE->toggle; 2643 $FULLSCREEN_ENABLE->toggle;
2506 video_init; 2644 video_init;
2507 } else { 2645 } else {
2508 &DC::UI::feed_sdl_key_down_event; 2646 &DC::UI::feed_sdl_key_down_event;
2509 } 2647 }
2510 update_modbox; 2648 update_modbox;
2511 }, 2649};
2512 DC::SDL_KEYUP => sub { 2650$SDL_CB[DC::SDL_KEYUP] = sub {
2513 &DC::UI::feed_sdl_key_up_event; 2651 &DC::UI::feed_sdl_key_up_event;
2514 update_modbox; 2652 update_modbox;
2515 }, 2653};
2516 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2654$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2517 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2655$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2518 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2519 DC::SDL_USEREVENT => sub { 2657$SDL_CB[DC::SDL_USEREVENT] = sub {
2520 if ($_[0]{code} == 1) { 2658 if ($_[0]{code} == 1) {
2521 audio_channel_finished $_[0]{data1}; 2659 audio_channel_finished $_[0]{data1};
2522 } elsif ($_[0]{code} == 0) { 2660 } elsif ($_[0]{code} == 0) {
2523 audio_music_finished; 2661 audio_music_finished;
2524 }
2525 }, 2662 }
2526); 2663};
2527 2664
2528############################################################################# 2665#############################################################################
2529 2666
2530$SIG{INT} = $SIG{TERM} = sub { 2667$SIG{INT} = $SIG{TERM} = sub {
2531 EV::unloop; 2668 EV::unloop;
2532 #d# TODO calling exit here hangs the process in some futex 2669 #d# TODO calling exit here hangs the process in some futex
2533}; 2670};
2534 2671
2535# due to mac os x + sdl combined briandamage, we need this contortion 2672# due to mac os x + sdl combined braindamage, we need this contortion
2536sub main { 2673sub main {
2537 { 2674 {
2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2675 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2539 2676
2540 if (-e "$Deliantra::VARDIR/client.cf") { 2677 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2557 DC::DB::open_db; 2694 DC::DB::open_db;
2558 2695
2559 DC::UI::set_layout ($::CFG->{layout}); 2696 DC::UI::set_layout ($::CFG->{layout});
2560 2697
2561 my %DEF_CFG = ( 2698 my %DEF_CFG = (
2699 config_autosave => 1,
2562 sdl_mode => undef, 2700 sdl_mode => undef,
2563 fullscreen => 1, 2701 fullscreen => 1,
2564 fast => 0, 2702 fast => 0,
2565 force_opengl11 => undef, 2703 force_opengl11 => undef,
2566 disable_alpha => 0, 2704 disable_alpha => 0,
… …
2584 effects_enable => 1, 2722 effects_enable => 1,
2585 effects_volume => 1, 2723 effects_volume => 1,
2586 bgm_enable => 1, 2724 bgm_enable => 1,
2587 bgm_volume => 0.5, 2725 bgm_volume => 0.5,
2588 output_rate => "", 2726 output_rate => "",
2589 pickup => 0, 2727 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2590 inv_sort => "mtime", 2728 inv_sort => "mtime",
2591 default => "profile", # default profile 2729 default => "profile", # default profile
2592 show_tips => 1, 2730 show_tips => 1,
2593 logview_max_par => 1000, 2731 logview_max_par => 1000,
2594 shift_fire_stop => 0, 2732 shift_fire_stop => 0,
2733 uitheme => "wood",
2734 map_shift_x => -24, # arbitrary
2735 map_shift_y => +24, # arbitrary
2595 ); 2736 );
2596 2737
2597 while (my ($k, $v) = each %DEF_CFG) { 2738 while (my ($k, $v) = each %DEF_CFG) {
2598 $CFG->{$k} = $v unless exists $CFG->{$k}; 2739 $CFG->{$k} = $v unless exists $CFG->{$k};
2599 } 2740 }
… …
2613 } 2754 }
2614 } 2755 }
2615 2756
2616 sdl_init; 2757 sdl_init;
2617 2758
2759 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2760 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2761
2618 { 2762 {
2619 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2763 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2620 DejaVuSans.ttf 2764 DejaVuSans.ttf
2621 DejaVuSansMono.ttf 2765 DejaVuSansMono.ttf
2622 DejaVuSans-Bold.ttf 2766 DejaVuSans-Bold.ttf
2623 DejaVuSansMono-Bold.ttf 2767 DejaVuSansMono-Bold.ttf
2624 DejaVuSans-Oblique.ttf 2768 DejaVuSans-Oblique.ttf
2625 DejaVuSansMono-Oblique.ttf 2769 DejaVuSansMono-Oblique.ttf
2626 DejaVuSans-BoldOblique.ttf 2770 DejaVuSans-BoldOblique.ttf
2627 DejaVuSansMono-BoldOblique.ttf 2771 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf
2628 ); 2773 );
2629 2774
2630 DC::add_font $_ for @fonts; 2775 DC::add_font $_ for @fonts;
2631 2776
2632 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2777 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2662 }; 2807 };
2663 2808
2664 delete $SIG{__DIE__}; 2809 delete $SIG{__DIE__};
2665 EV::loop; 2810 EV::loop;
2666 2811
2812 DC::write_cfg if $CFG->{config_autosave};
2813
2667#video_shutdown; 2814 #video_shutdown;
2668#audio_shutdown; 2815 #audio_shutdown;
2816
2669 DC::OpenGL::quit; 2817 DC::OpenGL::quit;
2670 DC::SDL_Quit; 2818 DC::SDL_Quit;
2671 DC::DB::Server::stop; 2819 DC::DB::Server::stop;
2672} 2820}
2673 2821

Diff Legend

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