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.60 by root, Tue Aug 19 21:48:28 2008 UTC vs.
Revision 1.95 by root, Sun Apr 26 19:10:57 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 }
… …
795 # hack to make SURE we find the IP address all right 841 # hack to make SURE we find the IP address all right
796 # can be removed once AnyEvent::DNS is proven stable. 842 # can be removed once AnyEvent::DNS is proven stable.
797 if ($host eq "gameserver.deliantra.net") { 843 if ($host eq "gameserver.deliantra.net") {
798 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 844 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
799 if ($_[0] ne "80.101.114.108") { # Perl 845 if ($_[0] ne "80.101.114.108") { # Perl
846 status "dns failure, trying differently";
847 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
848 unless (defined $host) {
800 status "dns failure, using hardcoded address"; 849 status "dns failure, using hardcoded address";
801 $host = "129.13.162.95"; 850 $host = "129.13.162.95";
851 }
802 } 852 }
803 853
804 dc_connect $host, $port; 854 dc_connect $host, $port;
805 }; 855 };
806 } else { 856 } else {
807 dc_connect $host, $port; 857 dc_connect $host, $port;
808 } 858 }
809} 859}
810 860
811sub stop_game { 861sub stop_game {
862 crash "stop_game";
863
812 $LOGIN_BUTTON->set_text ("Login / Register"); 864 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 865 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 866 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 867 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 868 $SPELL_LIST->clear_spells;
… …
830} 882}
831 883
832sub graphics_setup { 884sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 885 my $vbox = new DC::UI::VBox;
834 886
887 {
888 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
889
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 890 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 891
837 my $row = 0; 892 my $row = 0;
838 893
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 894 $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, 895 $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, 896 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 897 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 898
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 899 $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, 900 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 901 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 902 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 " 903 . "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 " 904 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 905 . "by installing the right driver for your graphics card.");
851 906
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
908 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
909 value => $CFG->{uitheme},
910 options => [
911 [wood => "Wood (the default)"],
912 [plain => "Plain (very)"],
913 [blue => "Blue (dark)"],
914 [metal => "Metal (light)"],
915 ],
916 tooltip => "Choose the User Interface theme that you like most :)",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
918 );
919
852 my $vidmode_tooltip = 920 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 921 "<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>."; 922 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 923
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 924 $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); 925 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 926
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 927 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
928 c_rescale => 1,
860 force_w => $WIDTH * 0.1, expand => 1, 929 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 930 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 931 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 932 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 933 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 934 can_events => 1, tooltip => $vidmode_tooltip);
866 935
867 $MODE_SLIDER->connect (changed => sub { 936 $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) = @_; 937 my ($self, $value) = @_;
938
939 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
940 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
941 });
942 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
943
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
945 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
946 state => $CFG->{fullscreen},
947 tooltip => "Bring the client into fullscreen mode.",
948 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
949 );
950
951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
952 $table->add_at (1, $row++, new DC::UI::CheckBox
953 state => $CFG->{force_opengl11},
954 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
955 . "higher memory usage and slower performance. It will, however, help tremendously on "
956 . "cards that claim to support a feature but fall back to software rendering. "
957 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
958 . "but cards and drivers from other vendors (ATI) are often just as bad. "
959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
961 );
962
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
964 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{disable_alpha},
966 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
967 . "by disabling a number of textures and transparency effects. Normally, these "
968 . "effects do not cost a lot of resources, but some graphics cards might fall "
969 . "back to extremely slow rendering if this is enabled. If disabling this option "
970 . "noticably improves the framerate of the client please report this! "
971 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
972 on_changed => sub {
973 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 974 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 975 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
976 0
907 0 977 }
908 } 978 );
909 );
910 979
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 980 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 981 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 982 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 983 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 " 984 . "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 " 985 . "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.", 986 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 987 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 988 );
920 989
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 991 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 992 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 993 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 995 );
927 996
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 998 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 999 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.", 1000 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 }, 1001 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 1002 );
934 1003
935 $table->add_at (1, $row++, new DC::UI::Button 1004 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 1005 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 1006 tooltip => "Apply the video settings above.",
938 on_activate => sub { 1007 on_activate => sub {
939 video_shutdown (); 1008 video_shutdown ();
940 video_init (); 1009 video_init ();
1010 0
941 0 1011 }
942 } 1012 );
943 ); 1013 }
944 1014
1015 {
1016 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1017
1018 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1019
1020 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1022 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1023 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1024 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, " 1025 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1026 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1027 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1028 );
953 1029
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1031 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1032 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1033 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1035 );
960 1036
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1039 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1040 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. " 1041 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1042 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1044 );
969 1045
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1046 $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 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1048 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1049 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 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1051 );
976 1052
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1055 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.", 1056 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 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1058 );
983 1059
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1061 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1062 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, " 1063 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.", 1064 . "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 }, 1065 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1066 );
991 1067
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1068 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1069 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1070 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.", 1071 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1072 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1073 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1074 &set_gauge_window_fontsize;
1075 0
999 0 1076 }
1000 } 1077 );
1001 );
1002 1078
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1080 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1081 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1082 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1083 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1084 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1085 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1086 0
1010 0 1087 }
1011 } 1088 );
1012 ); 1089 }
1013 1090
1014 $vbox 1091 $vbox
1015} 1092}
1016 1093
1017our $AUDIO_HW_CHUNKSIZE; 1094our $AUDIO_HW_CHUNKSIZE;
… …
1180} 1257}
1181 1258
1182sub make_gauge_window { 1259sub make_gauge_window {
1183 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1260 my $gh = int $HEIGHT * $CFG->{gauge_size};
1184 1261
1185 my $win = new DC::UI::Frame ( 1262 $GAUGES->{win} = my $win = new DC::UI::Frame (
1186 force_x => 0, 1263 force_x => 0,
1187 force_y => "max", 1264 force_y => "max",
1188 force_w => $WIDTH, 1265 force_w => $WIDTH,
1189 force_h => $gh, 1266 force_h => $gh,
1190 ); 1267 );
… …
1206 (new DC::UI::Empty expand => 1), 1283 (new DC::UI::Empty expand => 1),
1207 (my $hb = new DC::UI::HBox), 1284 (my $hb = new DC::UI::HBox),
1208 ], 1285 ],
1209 ); 1286 );
1210 1287
1211 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1288 $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"); 1289 $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"); 1290 $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"); 1291 $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 1292
1227 &set_gauge_window_fontsize; 1293 &set_gauge_window_fontsize;
1228 1294
1229 $win 1295 $win
1230} 1296}
… …
1572 ); 1638 );
1573 1639
1574 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1640 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1575 $table->add_at (1, 4, new DC::UI::Entry 1641 $table->add_at (1, 4, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{user}, 1642 text => $CFG->{profile}{default}{user},
1577 tooltip => "The name of your character on the server.", 1643 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 } 1644 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1579 ); 1645 );
1580 1646
1581 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1647 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1582 $table->add_at (1, 5, new DC::UI::Entry 1648 $table->add_at (1, 5, new DC::UI::Entry
… …
1596 1 1662 1
1597 }, 1663 },
1598 ); 1664 );
1599 1665
1600 $vbox->add (new DC::UI::FancyFrame 1666 $vbox->add (new DC::UI::FancyFrame
1601 label => "Registering", 1667 label => "How to Play",
1602 min_h => 200, 1668 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1669 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1670 markup =>
1671 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1672 . "Then register a new account (or use an existing one if you have one). "
1605 "To register a new account, choose a username that hasn't been taken yet and " 1673 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1606 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1674 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1607 ), 1675 ),
1608 ); 1676 );
1609 1677
1610 $vbox 1678 $vbox
… …
1682 1750
1683 my $row = 0; 1751 my $row = 0;
1684 1752
1685 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1753 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1686 $table->add_at (1, $row++, new DC::UI::CheckBox 1754 $table->add_at (1, $row++, new DC::UI::CheckBox
1755 c_colspan => 2,
1687 state => $CFG->{show_tips}, 1756 state => $CFG->{show_tips},
1688 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1757 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1689 on_changed => sub { 1758 on_changed => sub {
1690 my ($self, $value) = @_; 1759 my ($self, $value) = @_;
1691 $CFG->{show_tips} = $value; 1760 $CFG->{show_tips} = $value;
… …
1693 } 1762 }
1694 ); 1763 );
1695 1764
1696 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1765 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1697 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1766 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1767 c_colspan => 2,
1698 text => $CFG->{logview_max_par}, 1768 text => $CFG->{logview_max_par},
1699 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1769 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1700 . "sends more messages than this number, older messages get removed to save memory and " 1770 . "sends more messages than this number, older messages get removed to save memory and "
1701 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1771 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1702 on_changed => sub { 1772 on_changed => sub {
… …
1704 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1774 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1705 0 1775 0
1706 }, 1776 },
1707 ); 1777 );
1708 1778
1779 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1780 $table->add_at (1, $row, new DC::UI::CheckBox
1781 state => $CFG->{config_autosave},
1782 tooltip => "Normally, configuration settings and the user interface layout "
1783 . "are saved on client exit. You can disable this behaviour by "
1784 . "unchecking this checkbox.",
1785 on_changed => sub {
1786 my ($self, $value) = @_;
1787 $CFG->{config_autosave} = $value;
1788 0
1789 }
1790 );
1791 $table->add_at (2, $row++, new DC::UI::Button
1792 text => "Save Now",
1793 tooltip => "Use this to manually save configuration and UI layout when "
1794 . "autosave is disabled.",
1795 on_activate => sub {
1796 DC::write_cfg;
1797 0
1798 }
1799 );
1800
1709 $table 1801 $table
1710} 1802}
1711 1803
1712sub autopickup_setup { 1804sub autopickup_setup {
1713 my $r = new DC::UI::ScrolledWindow ( 1805 my $r = new DC::UI::ScrolledWindow (
… …
1719 col_expand => [0, 1, 0, 1], 1811 col_expand => [0, 1, 0, 1],
1720 ); 1812 );
1721 1813
1722 for ( 1814 for (
1723 ["General", 0, 0, 1815 ["General", 0, 0,
1724 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1725 ["Inhibit autopickup" => PICKUP_INHIBIT], 1816# ["Inhibit autopickup" => PICKUP_INHIBIT],
1726 ["Stop before pickup" => PICKUP_STOP], 1817 ["Stop before pickup" => PICKUP_STOP],
1727 ["Debug autopickup" => PICKUP_DEBUG], 1818 ["Debug autopickup" => PICKUP_DEBUG],
1728 ], 1819 ],
1729 ["Weapons", 0, 6, 1820 ["Weapons", 0, 6,
1730 ["All weapons" => PICKUP_ALLWEAPON], 1821 ["All weapons" => PICKUP_ALLWEAPON],
… …
1778 $::CFG->{pickup} |= $mask; 1869 $::CFG->{pickup} |= $mask;
1779 } else { 1870 } else {
1780 $::CFG->{pickup} &= ~$mask; 1871 $::CFG->{pickup} &= ~$mask;
1781 } 1872 }
1782 1873
1783 $::CONN->send_command ("pickup $::CFG->{pickup}") 1874 $::CONN->send_pickup ($::CFG->{pickup})
1784 if defined $::CONN; 1875 if defined $::CONN;
1785 1876
1786 0 1877 0
1787 }); 1878 });
1788 1879
… …
1805 }); 1896 });
1806 1897
1807 $table->add_at (3, 18, new DC::UI::Button 1898 $table->add_at (3, 18, new DC::UI::Button
1808 text => "set", 1899 text => "set",
1809 on_activate => sub { 1900 on_activate => sub {
1810 $::CONN->send_command ("pickup $::CFG->{pickup}") 1901 $::CONN->send_pickup ($::CFG->{pickup})
1811 if defined $::CONN; 1902 if defined $::CONN;
1812 0 1903 0
1813 }); 1904 });
1814 1905
1815 $r 1906 $r
… …
1928 $PL_NOTEBOOK->set_current_page ($widget); 2019 $PL_NOTEBOOK->set_current_page ($widget);
1929 $PL_WINDOW->show; 2020 $PL_WINDOW->show;
1930 } 2021 }
1931} 2022}
1932 2023
1933sub player_window { 2024sub make_playerbook {
1934 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2025 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1935 x => "center", 2026 x => "center",
1936 y => "center", 2027 y => "center",
1937 force_w => $WIDTH * 9/10, 2028 force_w => $WIDTH * 9/10,
1938 force_h => $HEIGHT * 9/10, 2029 force_h => $HEIGHT * 9/10,
… …
1972 "License, Author and Source info for media sent by the server."); 2063 "License, Author and Source info for media sent by the server.");
1973 2064
1974 $ntb->set_current_page ($INVENTORY_PAGE); 2065 $ntb->set_current_page ($INVENTORY_PAGE);
1975 2066
1976 $plwin->add ($ntb); 2067 $plwin->add ($ntb);
1977 $plwin
1978} 2068}
1979 2069
1980sub keyboard_setup { 2070sub keyboard_setup {
1981 DC::Macro::keyboard_setup 2071 DC::Macro::keyboard_setup
1982} 2072}
1983 2073
1984sub help_window { 2074sub make_help_window {
1985 my $win = new DC::UI::Toplevel 2075 my $win = new DC::UI::Toplevel
1986 x => 'center', 2076 x => 'center',
1987 y => 'center', 2077 y => 'center',
1988 z => 4, 2078 z => 4,
1989 name => 'doc_browser', 2079 name => 'doc_browser',
… …
2078 2168
2079 $load_node->((DC::Pod::find @path)[0]); 2169 $load_node->((DC::Pod::find @path)[0]);
2080 $win->show; 2170 $win->show;
2081 }; 2171 };
2082 2172
2083 $win 2173 $HELP_WINDOW = $win;
2084}
2085
2086sub open_string_query {
2087 my ($title, $cb, $txt, $tooltip) = @_;
2088 my $dialog = new DC::UI::Toplevel
2089 x => "center",
2090 y => "center",
2091 z => 50,
2092 force_w => $WIDTH * 4/5,
2093 title => $title;
2094
2095 $dialog->add (
2096 my $e = new DC::UI::Entry
2097 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2098 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2099 tooltip => $tooltip
2100 );
2101
2102 $e->grab_focus;
2103 $e->set_text ($txt) if $txt;
2104 $dialog->show;
2105} 2174}
2106 2175
2107sub open_quit_dialog { 2176sub open_quit_dialog {
2108 unless ($QUIT_DIALOG) { 2177 unless ($QUIT_DIALOG) {
2109 $QUIT_DIALOG = new DC::UI::Toplevel 2178 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2131 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2200 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2132 ); 2201 );
2133 $hb->add (new DC::UI::Button 2202 $hb->add (new DC::UI::Button
2134 text => "Quit anyway", 2203 text => "Quit anyway",
2135 expand => 1, 2204 expand => 1,
2136 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2205 on_activate => sub {
2206 crash "Quit anyway";
2207 EV::unloop EV::UNLOOP_ALL;
2208 },
2137 ); 2209 );
2138 } 2210 }
2139 2211
2140 $QUIT_DIALOG->show; 2212 $QUIT_DIALOG->show;
2141 $QUIT_DIALOG->grab_focus; 2213 $QUIT_DIALOG->grab_focus;
2214}
2215
2216sub make_menubar {
2217 $MENUFRAME = new DC::UI::Toplevel
2218 border => 0,
2219 force_x => 0,
2220 force_y => 0,
2221 force_w => $::WIDTH,
2222 child => ($MENUBAR = new DC::UI::HBox),
2223 ;
2224
2225 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2226
2227 # 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
2228 make_gauge_window->show;
2229
2230# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 make_playerbook;
2234
2235 $MENUPOPUP = DC::UI::Menu->new (items => [
2236 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2237 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2238 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2239 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2240 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2241 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2242 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2243 ["Quit…" , sub {
2244 if ($CONN) {
2245 open_quit_dialog;
2246 } else {
2247 EV::unloop EV::UNLOOP_ALL;
2248 }
2249 }],
2250 ]);
2251
2252 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2253 tooltip => "Shows the main menu",
2254 on_button_down => sub {
2255 my ($self, $ev) = @_;
2256 local $ev->{x} = 0;
2257 local $ev->{y} = 0;
2258 $MENUPOPUP->popup ($ev);
2259 },
2260 );
2261
2262 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2263 padding_x => 6,
2264 padding_y => 3,
2265 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2266 template => " Exp: 888,888,888,888 (lvl 188) ",
2267 );
2268
2269 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2270 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2271 . "will automatically pick up items as defined by your item pickup settings "
2272 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2273 . "disable autopickup by disabling this checkbox.",
2274 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2275 on_changed => sub {
2276 my ($self, $value) = @_;
2277 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2278 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2279 $CONN->send_pickup ($CFG->{pickup})
2280 if $CONN;
2281 },
2282 );
2283
2284 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2285 c_rescale => 1,
2286 padding_x => 6,
2287 padding_y => 3,
2288 force_w => $::WIDTH * 0.2,
2289 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2290 template => "two handed weapons 99%",
2291 );
2292
2293 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2294 expand => 1,
2295 align => 1, can_hover => 1, can_events => 1,
2296 text => "Range and Combat Slots",
2297 tooltip => "#stat_ranged",
2298 );
2299
2300 $MENUFRAME->show;
2301}
2302
2303sub open_string_query {
2304 my ($title, $cb, $txt, $tooltip) = @_;
2305 my $dialog = new DC::UI::Toplevel
2306 x => "center",
2307 y => "center",
2308 z => 50,
2309 force_w => $WIDTH * 4/5,
2310 title => $title;
2311
2312 $dialog->add (
2313 my $e = new DC::UI::Entry
2314 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2315 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2316 tooltip => $tooltip
2317 );
2318
2319 $e->grab_focus;
2320 $e->set_text ($txt) if $txt;
2321 $dialog->show;
2142} 2322}
2143 2323
2144sub show_tip_of_the_day { 2324sub show_tip_of_the_day {
2145 # find all tips 2325 # find all tips
2146 my @tod = DC::Pod::find tip_of_the_day => "*"; 2326 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2199 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2379 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2200 and die "SDL::Init failed!\n"; 2380 and die "SDL::Init failed!\n";
2201} 2381}
2202 2382
2203sub video_init { 2383sub video_init {
2384 DC::set_theme $CFG->{uitheme};
2385
2204 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2386 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2205 $SDL_REINIT = 0; 2387 $SDL_REINIT = 0;
2206 2388
2207 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2389 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2208 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2390 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2209 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2391 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2210 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2392 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2211 2393
2212 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2394 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2213 2395
2214 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2396 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2215 $CFG->{sdl_mode} = 0; 2397 $CFG->{sdl_mode} = 0; # lowest resolution by default
2398
2399 # now choose biggest mode <= 1024x768
2216 for (reverse 0 .. $#SDL_MODES) { 2400 for (0 .. $#SDL_MODES) {
2217 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2401 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2402 $CFG->{sdl_mode} = $_;
2403 }
2218 } 2404 }
2219 } 2405 }
2220 2406
2221 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2407 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2222 2408
… …
2281 2467
2282 (new DC::UI::Frame 2468 (new DC::UI::Frame
2283 bg => [0, 0, 0, 0.4], 2469 bg => [0, 0, 0, 0.4],
2284 force_x => 0, 2470 force_x => 0,
2285 force_y => "max", 2471 force_y => "max",
2286 child => (my $LR = new DC::UI::VBox), 2472 child => (my $LL = new DC::UI::VBox),
2287 )->show; 2473 )->show;
2288 2474
2289 $LR->add ($STATUSBOX); 2475 $LL->add ($STATUSBOX);
2290 $LR->add ($MODBOX); 2476 $LL->add ($MODBOX);
2291 $LR->add (new DC::UI::Label 2477 $LL->add (new DC::UI::Label
2292 align => 0, 2478 align => 0,
2293 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2479 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2294 fontsize => 0.5, 2480 fontsize => 0.5,
2295 fg => [1, 1, 0, 0.7], 2481 fg => [1, 1, 0, 0.7],
2296 ); 2482 );
2297 2483
2298 DC::UI::Toplevel->new ( 2484 DC::UI::Toplevel->new (
2299 title => "Minimap", 2485 title => "Minimap",
2300 name => "mapmap", 2486 name => "mapmap",
2301 x => 0, 2487 x => 0,
2302 y => $FONTSIZE + 8, 2488 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2303 border_bg => [1, 1, 1, 192/255], 2489 border_bg => [1, 1, 1, 192/255],
2304 bg => [1, 1, 1, 0], 2490 bg => [1, 1, 1, 0],
2305 child => ($MAPMAP = new DC::MapWidget::MapMap 2491 child => ($MAPMAP = new DC::MapWidget::MapMap
2306 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2492 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2307 ), 2493 ),
2308 )->show; 2494 )->show;
2309 2495
2310 $MAPWIDGET = new DC::MapWidget; 2496 $MAPWIDGET = new DC::MapWidget;
2311 $MAPWIDGET->connect (activate_console => sub { 2497 $MAPWIDGET->connect (activate_console => sub {
… …
2336 $METASERVER = metaserver_dialog; 2522 $METASERVER = metaserver_dialog;
2337 # the name is changed to not conflict with the older name as users could have hidden it 2523 # the name is changed to not conflict with the older name as users could have hidden it
2338 $MESSAGE_WINDOW = new DC::UI::Dockbar 2524 $MESSAGE_WINDOW = new DC::UI::Dockbar
2339 name => "message_window2", 2525 name => "message_window2",
2340 title => 'Messages', 2526 title => 'Messages',
2527 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2341 force_w => $::WIDTH * 0.6, 2528 force_w => $::WIDTH * 0.6,
2342 force_h => $::HEIGHT * 0.25, 2529 force_h => $::HEIGHT * 0.25,
2343 ; 2530 ;
2344 2531
2345 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2532 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2365 . "After pressing the combo the binding will be saved automatically and the " 2552 . "After pressing the combo the binding will be saved automatically and the "
2366 . "binding editor closes"); 2553 . "binding editor closes");
2367 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2554 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2368 "Some debuggin' options. Do not ask."); 2555 "Some debuggin' options. Do not ask.");
2369 2556
2370 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2557 make_help_window;
2558 make_menubar;
2371 2559
2372 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2373 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2374
2375# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2376# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2377
2378 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
2379
2380 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2381 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2382
2383 $BUTTONBAR->add (new DC::UI::Button
2384 text => "Save Config",
2385 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2386 on_activate => sub {
2387 $::CFG->{layout} = DC::UI::get_layout;
2388 DC::write_cfg;
2389 status "Configuration Saved";
2390 0
2391 },
2392 );
2393
2394 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2395 tooltip => "View Documentation");
2396
2397 $BUTTONBAR->add (new DC::UI::Button
2398 text => "Quit",
2399 tooltip => "Terminates the program",
2400 on_activate => sub {
2401 if ($CONN) {
2402 open_quit_dialog;
2403 } else {
2404 EV::unloop EV::UNLOOP_ALL;
2405 }
2406 0
2407 },
2408 );
2409
2410 $BUTTONBAR->show;
2411 $SETUP_DIALOG->show; 2560 $SETUP_DIALOG->show;
2412 $MESSAGE_WINDOW->show; 2561 $MESSAGE_WINDOW->show;
2413 } 2562 }
2414 2563
2415 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2564 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2416 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2565 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2417 2566
2418 $CAVEAT_LABEL->set_text ("None :)"); 2567 $CAVEAT_LABEL->set_text ("None :)");
2419 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2568 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2420 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2569 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2451my $want_refresh = EV::prepare_ns \&force_refresh; 2600my $want_refresh = EV::prepare_ns \&force_refresh;
2452 2601
2453my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2602my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2454 $NOW = EV::now; 2603 $NOW = EV::now;
2455 2604
2456 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2605 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2457 for DC::poll_events; 2606 for DC::poll_events;
2458 2607
2459 if (%animate_object) { 2608 if (%animate_object) {
2460 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2609 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2461 $WANT_REFRESH = 1; 2610 $WANT_REFRESH = 1;
… …
2473sub animation_stop { 2622sub animation_stop {
2474 my ($widget) = @_; 2623 my ($widget) = @_;
2475 delete $animate_object{$widget}; 2624 delete $animate_object{$widget};
2476} 2625}
2477 2626
2478%SDL_CB = (
2479 DC::SDL_QUIT => sub { 2627$SDL_CB[DC::SDL_QUIT] = sub {
2628 crash "SDL_QUIT";
2480 EV::unloop EV::UNLOOP_ALL; 2629 EV::unloop EV::UNLOOP_ALL;
2481 }, 2630};
2482 DC::SDL_VIDEORESIZE => sub { 2631$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2483 },
2484 DC::SDL_VIDEOEXPOSE => sub { 2632$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2485 DC::UI::full_refresh; 2633 DC::UI::full_refresh;
2486 }, 2634};
2487 DC::SDL_ACTIVEEVENT => sub { 2635$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2488# not useful, as APPACTIVE includes only iconified state, not unmapped 2636# not useful, as APPACTIVE includes only iconified state, not unmapped
2489# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2637# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2490# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2638# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2491# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2639# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2492# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2640# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2493# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2641# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2494 }, 2642};
2495 DC::SDL_KEYDOWN => sub { 2643$SDL_CB[DC::SDL_KEYDOWN] = sub {
2496 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2644 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2497 # alt-enter 2645 # alt-enter
2498 video_shutdown; 2646 video_shutdown;
2499 $FULLSCREEN_ENABLE->toggle; 2647 $FULLSCREEN_ENABLE->toggle;
2500 video_init; 2648 video_init;
2501 } else { 2649 } else {
2502 &DC::UI::feed_sdl_key_down_event; 2650 &DC::UI::feed_sdl_key_down_event;
2503 } 2651 }
2504 update_modbox; 2652 update_modbox;
2505 }, 2653};
2506 DC::SDL_KEYUP => sub { 2654$SDL_CB[DC::SDL_KEYUP] = sub {
2507 &DC::UI::feed_sdl_key_up_event; 2655 &DC::UI::feed_sdl_key_up_event;
2508 update_modbox; 2656 update_modbox;
2509 }, 2657};
2510 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2658$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2511 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2659$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2512 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2660$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2513 DC::SDL_USEREVENT => sub { 2661$SDL_CB[DC::SDL_USEREVENT] = sub {
2514 if ($_[0]{code} == 1) { 2662 if ($_[0]{code} == 1) {
2515 audio_channel_finished $_[0]{data1}; 2663 audio_channel_finished $_[0]{data1};
2516 } elsif ($_[0]{code} == 0) { 2664 } elsif ($_[0]{code} == 0) {
2517 audio_music_finished; 2665 audio_music_finished;
2518 }
2519 }, 2666 }
2520); 2667};
2521 2668
2522############################################################################# 2669#############################################################################
2523 2670
2524$SIG{INT} = $SIG{TERM} = sub { 2671$SIG{INT} = $SIG{TERM} = sub {
2525 EV::unloop; 2672 EV::unloop;
2526 #d# TODO calling exit here hangs the process in some futex 2673 #d# TODO calling exit here hangs the process in some futex
2527}; 2674};
2528 2675
2529# due to mac os x + sdl combined briandamage, we need this contortion 2676# due to mac os x + sdl combined braindamage, we need this contortion
2530sub main { 2677sub main {
2531 { 2678 {
2532 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2679 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2533 2680
2534 if (-e "$Deliantra::VARDIR/client.cf") { 2681 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2551 DC::DB::open_db; 2698 DC::DB::open_db;
2552 2699
2553 DC::UI::set_layout ($::CFG->{layout}); 2700 DC::UI::set_layout ($::CFG->{layout});
2554 2701
2555 my %DEF_CFG = ( 2702 my %DEF_CFG = (
2703 config_autosave => 1,
2556 sdl_mode => 0, 2704 sdl_mode => undef,
2557 fullscreen => 1, 2705 fullscreen => 1,
2558 fast => 0, 2706 fast => 0,
2559 force_opengl11 => undef, 2707 force_opengl11 => undef,
2560 disable_alpha => 0, 2708 disable_alpha => 0,
2561 smooth_movement => 1, 2709 smooth_movement => 1,
… …
2578 effects_enable => 1, 2726 effects_enable => 1,
2579 effects_volume => 1, 2727 effects_volume => 1,
2580 bgm_enable => 1, 2728 bgm_enable => 1,
2581 bgm_volume => 0.5, 2729 bgm_volume => 0.5,
2582 output_rate => "", 2730 output_rate => "",
2583 pickup => 0, 2731 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2584 inv_sort => "mtime", 2732 inv_sort => "mtime",
2585 default => "profile", # default profile 2733 default => "profile", # default profile
2586 show_tips => 1, 2734 show_tips => 1,
2587 logview_max_par => 1000, 2735 logview_max_par => 1000,
2588 shift_fire_stop => 0, 2736 shift_fire_stop => 0,
2737 uitheme => "wood",
2738 map_shift_x => -24, # arbitrary
2739 map_shift_y => +24, # arbitrary
2589 ); 2740 );
2590 2741
2591 while (my ($k, $v) = each %DEF_CFG) { 2742 while (my ($k, $v) = each %DEF_CFG) {
2592 $CFG->{$k} = $v unless exists $CFG->{$k}; 2743 $CFG->{$k} = $v unless exists $CFG->{$k};
2593 } 2744 }
… …
2607 } 2758 }
2608 } 2759 }
2609 2760
2610 sdl_init; 2761 sdl_init;
2611 2762
2763 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2764 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2765
2612 { 2766 {
2613 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2767 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2614 DejaVuSans.ttf 2768 DejaVuSans.ttf
2615 DejaVuSansMono.ttf 2769 DejaVuSansMono.ttf
2616 DejaVuSans-Bold.ttf 2770 DejaVuSans-Bold.ttf
2617 DejaVuSansMono-Bold.ttf 2771 DejaVuSansMono-Bold.ttf
2618 DejaVuSans-Oblique.ttf 2772 DejaVuSans-Oblique.ttf
2619 DejaVuSansMono-Oblique.ttf 2773 DejaVuSansMono-Oblique.ttf
2620 DejaVuSans-BoldOblique.ttf 2774 DejaVuSans-BoldOblique.ttf
2621 DejaVuSansMono-BoldOblique.ttf 2775 DejaVuSansMono-BoldOblique.ttf
2776 mona.ttf
2622 ); 2777 );
2623 2778
2624 DC::add_font $_ for @fonts; 2779 DC::add_font $_ for @fonts;
2625 2780
2626 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2781 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2656 }; 2811 };
2657 2812
2658 delete $SIG{__DIE__}; 2813 delete $SIG{__DIE__};
2659 EV::loop; 2814 EV::loop;
2660 2815
2816 DC::write_cfg if $CFG->{config_autosave};
2817
2661#video_shutdown; 2818 #video_shutdown;
2662#audio_shutdown; 2819 #audio_shutdown;
2820
2663 DC::OpenGL::quit; 2821 DC::OpenGL::quit;
2664 DC::SDL_Quit; 2822 DC::SDL_Quit;
2665 DC::DB::Server::stop; 2823 DC::DB::Server::stop;
2666} 2824}
2667 2825

Diff Legend

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