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.65 by root, Sat Aug 30 06:49:05 2008 UTC vs.
Revision 1.101 by root, Thu Feb 4 20:01:09 2010 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;
… …
130 128
131$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
132$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
133 131
134$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
135 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
136}; 135};
137 136
138my $MAX_FPS = 60; 137my $MAX_FPS = 60;
139 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
140our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
141 142
142our $LAST_REFRESH; 143our $LAST_REFRESH;
143our $NOW; 144our $NOW;
144 145
145our $CFG; 146our $CFG;
146our $CONN;
147our $PROFILE; # current profile 147our $PROFILE; # current profile
148our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149 149
150our $WANT_REFRESH; 150our $WANT_REFRESH;
151 151
… …
160our $FONTSIZE; 160our $FONTSIZE;
161 161
162our $FONT_PROP; 162our $FONT_PROP;
163our $FONT_FIXED; 163our $FONT_FIXED;
164 164
165our $CONN;
166
165our $MAP; 167our $MAP;
166our $MAPMAP; 168our $MAPMAP;
167our $MAPWIDGET; 169our $MAPWIDGET;
168our $COMPLETER; 170our $COMPLETER;
169our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
170our $METASERVER; 175our $METASERVER;
171our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
172our $QUIT_DIALOG; 177our $QUIT_DIALOG;
173our $HOST_ENTRY; 178our $HOST_ENTRY;
174our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
200our $FLOORBOX; 205our $FLOORBOX;
201our $GAUGES; 206our $GAUGES;
202our $STATWIDS; 207our $STATWIDS;
203 208
204our $SDL_ACTIVE; 209our $SDL_ACTIVE;
205our %SDL_CB; 210our @SDL_CB;
206 211
207our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
208our $STATUSBOX; 213our $STATUSBOX;
209our $MODBOX; 214our $MODBOX;
210our $DEBUG_STATUS; 215our $DEBUG_STATUS;
211 216
212our $INV; 217our $INV;
213our $INVR; 218our $INVR;
214our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
215 260
216############################################################################# 261#############################################################################
217 262
218sub status { 263sub status {
219 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
301 or return; 346 or return;
302 347
303 $meta->{data} 348 $meta->{data}
304 or return; 349 or return;
305 350
306 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
307 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
308 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
309 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
310 &audio_music_push ($face); 355 &audio_music_push ($face);
311 } 356 }
312 } else { 357 } else {
313 # fetch from database 358 # fetch from database
314 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
315 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
316 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
317 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
318 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
319 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
320 365
321 audio_sound_push ($face); 366 audio_sound_push ($face);
322 }; 367 };
… …
369 414
370 audio_music_update_volume; 415 audio_music_update_volume;
371 416
372 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
373 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
374 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
375 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
376 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
377 425
378 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
379 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
380 428
381 my $NOW = time; 429 my $NOW = time;
382 430
383 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
384 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
493 sub audio_tab_update; 541 sub audio_tab_update;
494 audio_tab_update; 542 audio_tab_update;
495} 543}
496 544
497sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
498 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
499 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
500 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
501 554
502 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
742} 795}
743 796
744sub dc_connect { 797sub dc_connect {
745 my ($host, $port) = @_; 798 my ($host, $port) = @_;
746 799
747 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 800 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
801 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
748 802
749 $CONN = 803 $CONN =
750 new DC::Protocol 804 new DC::Protocol
751 host => $host, 805 host => $host,
752 port => $port, 806 port => $port,
753 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
754 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
755 mapw => $mapsize, 809 mapw => $mapw,
756 maph => $mapsize, 810 maph => $maph,
757 811
758 client => "$DC::VERSION $] $^O", 812 client => "$DC::VERSION $] $^O",
759 813
760 map_widget => $MAPWIDGET, 814 map_widget => $MAPWIDGET,
761 statusbox => $STATUSBOX, 815 statusbox => $STATUSBOX,
… …
769 823
770 on_connect => sub { 824 on_connect => sub {
771 if ($_[0]) { 825 if ($_[0]) {
772 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
773 827
774 status "login successful"; 828 status "successfully connected to the server";
775 } else { 829 } else {
776 undef $CONN; 830 undef $CONN;
777 status "unable to connect: $!"; 831 status "unable to connect: $!";
778 stop_game(); 832 stop_game();
779 } 833 }
… …
781 ; 835 ;
782} 836}
783 837
784sub start_game { 838sub start_game {
785 status "logging in..."; 839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
786 844
787 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
788 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
789
790 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
791 847
792 $MAP = new DC::Map; 848 $MAP = new DC::Map;
793 849
794 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
795 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
796 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
797 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
798 if ($_[0] ne "80.101.114.108") { # Perl 854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
799 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
800 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
801 } 861 }
802 862
803 dc_connect $host, $port; 863 dc_connect $host, $port;
804 }; 864 };
805 } else { 865 } else {
806 dc_connect $host, $port; 866 dc_connect $host, $port;
807 } 867 }
808} 868}
809 869
810sub stop_game { 870sub stop_game {
871 crash "stop_game";
872
811 $LOGIN_BUTTON->set_text ("Login / Register"); 873 $LOGIN_BUTTON->set_text ("Login / Register");
812 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 874 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
813 $SETUP_DIALOG->show; 875 $SETUP_DIALOG->show;
814 $PL_WINDOW->hide; 876 $PL_WINDOW->hide;
815 $SPELL_LIST->clear_spells; 877 $SPELL_LIST->clear_spells;
… …
829} 891}
830 892
831sub graphics_setup { 893sub graphics_setup {
832 my $vbox = new DC::UI::VBox; 894 my $vbox = new DC::UI::VBox;
833 895
896 {
897 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
898
834 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 899 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
835 900
836 my $row = 0; 901 my $row = 0;
837 902
838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
839 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 904 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
840 can_events => 1, 905 can_events => 1,
841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 906 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842 907
843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
844 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 909 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
845 can_events => 1, 910 can_events => 1,
846 tooltip => "This field shows any known issues with your config or driver, such as " 911 tooltip => "This field shows any known issues with your config or driver, such as "
847 . "a non-accelerated display format. You can try to work around these issues " 912 . "a non-accelerated display format. You can try to work around these issues "
848 . "by selecting a different video mode, changing the settings below or " 913 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card."); 914 . "by installing the right driver for your graphics card.");
850 915
916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
918 value => $CFG->{uitheme},
919 options => [
920 [wood => "Wood (the default)"],
921 [plain => "Plain (very)"],
922 [blue => "Blue (dark)"],
923 [metal => "Metal (light)"],
924 ],
925 tooltip => "Choose the User Interface theme that you like most :)",
926 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
927 );
928
851 my $vidmode_tooltip = 929 my $vidmode_tooltip =
852 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 930 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
853 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 931 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
854 932
855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
856 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
857 935
858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
937 c_rescale => 1,
859 force_w => $WIDTH * 0.1, expand => 1, 938 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ], 939 range => [ ($CFG->{sdl_mode}) x 3 ],
861 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
862 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
863 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
864 can_events => 1, tooltip => $vidmode_tooltip); 943 can_events => 1, tooltip => $vidmode_tooltip);
865 944
866 $MODE_SLIDER->connect (changed => sub { 945 $MODE_SLIDER->connect (changed => sub {
867 my ($self, $value) = @_;
868
869 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
870 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
871 });
872 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
875 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
876 state => $CFG->{fullscreen},
877 tooltip => "Bring the client into fullscreen mode.",
878 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
879 );
880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
882 $table->add_at (1, $row++, new DC::UI::CheckBox
883 state => $CFG->{force_opengl11},
884 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
885 . "higher memory usage and slower performance. It will, however, help tremendously on "
886 . "cards that claim to support a feature but fall back to software rendering. "
887 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
888 . "but cards and drivers from other vendors (ATI) are often just as bad. "
889 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
891 );
892
893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
894 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{disable_alpha},
896 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
897 . "by disabling a number of textures and transparency effects. Normally, these "
898 . "effects do not cost a lot of resources, but some graphics cards might fall "
899 . "back to etxremely slow rendering if this is enabled. If disabling this option "
900 . "noticably improves the framerate of the client please report this! "
901 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
902 on_changed => sub {
903 my ($self, $value) = @_; 946 my ($self, $value) = @_;
947
948 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
949 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
950 });
951 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
952
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
954 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
955 state => $CFG->{fullscreen},
956 tooltip => "Bring the client into fullscreen mode.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
958 );
959
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
961 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{force_opengl11},
963 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
964 . "higher memory usage and slower performance. It will, however, help tremendously on "
965 . "cards that claim to support a feature but fall back to software rendering. "
966 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
967 . "but cards and drivers from other vendors (ATI) are often just as bad. "
968 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
969 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
970 );
971
972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
973 $table->add_at (1, $row++, new DC::UI::CheckBox
974 state => $CFG->{disable_alpha},
975 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
976 . "by disabling a number of textures and transparency effects. Normally, these "
977 . "effects do not cost a lot of resources, but some graphics cards might fall "
978 . "back to extremely slow rendering if this is enabled. If disabling this option "
979 . "noticably improves the framerate of the client please report this! "
980 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
981 on_changed => sub {
982 my ($self, $value) = @_;
904 $CFG->{disable_alpha} = $value; 983 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 984 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
985 0
906 0 986 }
907 } 987 );
908 );
909 988
910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
911 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
912 state => $CFG->{texture_compression}, 991 state => $CFG->{texture_compression},
913 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 992 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
914 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 993 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
915 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 994 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
916 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 995 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
918 ); 997 );
919 998
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
921 $table->add_at (1, $row++, new DC::UI::CheckBox 1000 $table->add_at (1, $row++, new DC::UI::CheckBox
922 state => $CFG->{fast}, 1001 state => $CFG->{fast},
923 tooltip => "Lower the visual quality considerably to speed up rendering.", 1002 tooltip => "Lower the visual quality considerably to speed up rendering.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
925 ); 1004 );
926 1005
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
928 $table->add_at (1, $row++, new DC::UI::Slider 1007 $table->add_at (1, $row++, new DC::UI::Slider
929 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1008 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
930 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1009 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
931 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1010 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
932 ); 1011 );
933 1012
934 $table->add_at (1, $row++, new DC::UI::Button 1013 $table->add_at (1, $row++, new DC::UI::Button
935 expand => 1, text => "Apply", 1014 expand => 1, text => "Apply",
936 tooltip => "Apply the video settings above.", 1015 tooltip => "Apply the video settings above.",
937 on_activate => sub { 1016 on_activate => sub {
938 video_shutdown (); 1017 video_shutdown ();
939 video_init (); 1018 video_init ();
1019 0
940 0 1020 }
941 } 1021 );
942 ); 1022 }
943 1023
1024 {
1025 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1026
1027 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1028
1029 my $row = 0;
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1031 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement}, 1032 state => $CFG->{smooth_movement},
947 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1033 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
948 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
949 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
951 ); 1037 );
952 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
954 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
956 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
958 ); 1054 );
959 1055
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
961 $table->add_at (1, $row++, new DC::UI::CheckBox 1057 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{map_smoothing}, 1058 state => $CFG->{map_smoothing},
963 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1059 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
964 . "This increases load on the graphics subsystem and works only with TRT servers. " 1060 . "This increases load on the graphics subsystem and works only with TRT servers. "
965 . "Changes take effect at next login only.", 1061 . "Changes take effect at next login only.",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1062 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
967 ); 1063 );
968 1064
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
970 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
972 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
974 ); 1070 );
975 1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1085 );
1086
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
977 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
978 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
979 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1090 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1091 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
981 ); 1092 );
982 1093
983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1094 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
984 $table->add_at (1, $row++, new DC::UI::Slider 1095 $table->add_at (1, $row++, new DC::UI::Slider
985 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1096 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
986 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1097 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
987 . "but you still need to press apply to correctly re-layout the widget.", 1098 . "but you still need to press apply to correctly re-layout the widget.",
988 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1099 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
989 ); 1100 );
990 1101
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1102 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
992 $table->add_at (1, $row++, new DC::UI::Slider 1103 $table->add_at (1, $row++, new DC::UI::Slider
993 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1104 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
994 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1105 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
995 on_changed => sub { 1106 on_changed => sub {
996 $CFG->{gauge_fontsize} = $_[1]; 1107 $CFG->{gauge_fontsize} = $_[1];
997 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
1109 0
998 0 1110 }
999 } 1111 );
1000 );
1001 1112
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1113 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1114 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [$CFG->{gauge_size}, 0.2, 0.8], 1115 range => [$CFG->{gauge_size}, 0.2, 0.8],
1005 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1116 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1006 on_changed => sub { 1117 on_changed => sub {
1007 $CFG->{gauge_size} = $_[1]; 1118 $CFG->{gauge_size} = $_[1];
1008 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1119 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1120 0
1009 0 1121 }
1010 } 1122 );
1011 ); 1123 }
1012 1124
1013 $vbox 1125 $vbox
1014} 1126}
1015 1127
1016our $AUDIO_HW_CHUNKSIZE; 1128our $AUDIO_HW_CHUNKSIZE;
… …
1029 1141
1030 my $text = !$freq 1142 my $text = !$freq
1031 ? "audio is off" 1143 ? "audio is off"
1032 : "audio is enabled\n" 1144 : "audio is enabled\n"
1033 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1034 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1035 1149
1036 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1037} 1151}
1038 1152
1039sub audio_setup { 1153sub audio_setup {
… …
1179} 1293}
1180 1294
1181sub make_gauge_window { 1295sub make_gauge_window {
1182 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1183 1297
1184 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1185 force_x => 0, 1299 force_x => 0,
1186 force_y => "max", 1300 force_y => "max",
1187 force_w => $WIDTH, 1301 force_w => $WIDTH,
1188 force_h => $gh, 1302 force_h => $gh,
1189 ); 1303 );
… …
1205 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1206 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1207 ], 1321 ],
1208 ); 1322 );
1209 1323
1210 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1324 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1211 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1325 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1212 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1326 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1213 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1327 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1214
1215 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1216 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1217 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1218 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1219
1220 $GAUGES = {
1221 exp => $exp, prg => $prg, sklprg => $sklprg,
1222 win => $win, range => $rng,
1223 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1224 };
1225 1328
1226 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1227 1330
1228 $win 1331 $win
1229} 1332}
… …
1571 ); 1674 );
1572 1675
1573 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1676 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1574 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1575 text => $CFG->{profile}{default}{user}, 1678 text => $CFG->{profile}{default}{user},
1576 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1577 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1578 ); 1681 );
1579 1682
1580 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1683 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1581 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
… …
1683 1786
1684 my $row = 0; 1787 my $row = 0;
1685 1788
1686 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1789 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1687 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1688 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1689 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1793 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1690 on_changed => sub { 1794 on_changed => sub {
1691 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1692 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
… …
1694 } 1798 }
1695 ); 1799 );
1696 1800
1697 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1698 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1802 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1803 c_colspan => 2,
1699 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1700 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1805 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1701 . "sends more messages than this number, older messages get removed to save memory and " 1806 . "sends more messages than this number, older messages get removed to save memory and "
1702 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1807 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1703 on_changed => sub { 1808 on_changed => sub {
… …
1705 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1706 0 1811 0
1707 }, 1812 },
1708 ); 1813 );
1709 1814
1815 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1816 $table->add_at (1, $row, new DC::UI::CheckBox
1817 state => $CFG->{config_autosave},
1818 tooltip => "Normally, configuration settings and the user interface layout "
1819 . "are saved on client exit. You can disable this behaviour by "
1820 . "unchecking this checkbox.",
1821 on_changed => sub {
1822 my ($self, $value) = @_;
1823 $CFG->{config_autosave} = $value;
1824 0
1825 }
1826 );
1827 $table->add_at (2, $row++, new DC::UI::Button
1828 text => "Save Now",
1829 tooltip => "Use this to manually save configuration and UI layout when "
1830 . "autosave is disabled.",
1831 on_activate => sub {
1832 DC::write_cfg;
1833 0
1834 }
1835 );
1836
1710 $table 1837 $table
1711} 1838}
1712 1839
1713sub autopickup_setup { 1840sub autopickup_setup {
1714 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
… …
1720 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1721 ); 1848 );
1722 1849
1723 for ( 1850 for (
1724 ["General", 0, 0, 1851 ["General", 0, 0,
1725 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1726 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1727 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1728 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1729 ], 1855 ],
1730 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1731 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
… …
1779 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1780 } else { 1906 } else {
1781 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1782 } 1908 }
1783 1909
1784 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1785 if defined $::CONN; 1911 if defined $::CONN;
1786 1912
1787 0 1913 0
1788 }); 1914 });
1789 1915
… …
1806 }); 1932 });
1807 1933
1808 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1809 text => "set", 1935 text => "set",
1810 on_activate => sub { 1936 on_activate => sub {
1811 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1812 if defined $::CONN; 1938 if defined $::CONN;
1813 0 1939 0
1814 }); 1940 });
1815 1941
1816 $r 1942 $r
… …
1929 $PL_NOTEBOOK->set_current_page ($widget); 2055 $PL_NOTEBOOK->set_current_page ($widget);
1930 $PL_WINDOW->show; 2056 $PL_WINDOW->show;
1931 } 2057 }
1932} 2058}
1933 2059
1934sub player_window { 2060sub make_playerbook {
1935 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2061 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1936 x => "center", 2062 x => "center",
1937 y => "center", 2063 y => "center",
1938 force_w => $WIDTH * 9/10, 2064 force_w => $WIDTH * 9/10,
1939 force_h => $HEIGHT * 9/10, 2065 force_h => $HEIGHT * 9/10,
… …
1973 "License, Author and Source info for media sent by the server."); 2099 "License, Author and Source info for media sent by the server.");
1974 2100
1975 $ntb->set_current_page ($INVENTORY_PAGE); 2101 $ntb->set_current_page ($INVENTORY_PAGE);
1976 2102
1977 $plwin->add ($ntb); 2103 $plwin->add ($ntb);
1978 $plwin
1979} 2104}
1980 2105
1981sub keyboard_setup { 2106sub keyboard_setup {
1982 DC::Macro::keyboard_setup 2107 DC::Macro::keyboard_setup
1983} 2108}
1984 2109
1985sub help_window { 2110sub make_help_window {
1986 my $win = new DC::UI::Toplevel 2111 my $win = new DC::UI::Toplevel
1987 x => 'center', 2112 x => 'center',
1988 y => 'center', 2113 y => 'center',
1989 z => 4, 2114 z => 4,
1990 name => 'doc_browser', 2115 name => 'doc_browser',
… …
2079 2204
2080 $load_node->((DC::Pod::find @path)[0]); 2205 $load_node->((DC::Pod::find @path)[0]);
2081 $win->show; 2206 $win->show;
2082 }; 2207 };
2083 2208
2084 $win 2209 $HELP_WINDOW = $win;
2085}
2086
2087sub open_string_query {
2088 my ($title, $cb, $txt, $tooltip) = @_;
2089 my $dialog = new DC::UI::Toplevel
2090 x => "center",
2091 y => "center",
2092 z => 50,
2093 force_w => $WIDTH * 4/5,
2094 title => $title;
2095
2096 $dialog->add (
2097 my $e = new DC::UI::Entry
2098 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2099 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2100 tooltip => $tooltip
2101 );
2102
2103 $e->grab_focus;
2104 $e->set_text ($txt) if $txt;
2105 $dialog->show;
2106} 2210}
2107 2211
2108sub open_quit_dialog { 2212sub open_quit_dialog {
2109 unless ($QUIT_DIALOG) { 2213 unless ($QUIT_DIALOG) {
2110 $QUIT_DIALOG = new DC::UI::Toplevel 2214 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2132 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2236 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2133 ); 2237 );
2134 $hb->add (new DC::UI::Button 2238 $hb->add (new DC::UI::Button
2135 text => "Quit anyway", 2239 text => "Quit anyway",
2136 expand => 1, 2240 expand => 1,
2137 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2241 on_activate => sub {
2242 crash "Quit anyway";
2243 EV::unloop EV::UNLOOP_ALL;
2244 },
2138 ); 2245 );
2139 } 2246 }
2140 2247
2141 $QUIT_DIALOG->show; 2248 $QUIT_DIALOG->show;
2142 $QUIT_DIALOG->grab_focus; 2249 $QUIT_DIALOG->grab_focus;
2250}
2251
2252sub make_menubar {
2253 $MENUFRAME = new DC::UI::Toplevel
2254 border => 0,
2255 force_x => 0,
2256 force_y => 0,
2257 force_w => $::WIDTH,
2258 child => ($MENUBAR = new DC::UI::HBox),
2259 ;
2260
2261 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2262
2263 # 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
2264 make_gauge_window->show;
2265
2266# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2267# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2268
2269 make_playerbook;
2270
2271 $MENUPOPUP = DC::UI::Menu->new (items => [
2272 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2273 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2274 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2275 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2276 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2277 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2278 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2279 ["Quit…" , sub {
2280 if ($CONN) {
2281 open_quit_dialog;
2282 } else {
2283 EV::unloop EV::UNLOOP_ALL;
2284 }
2285 }],
2286 ]);
2287
2288 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2289 tooltip => "Shows the main menu",
2290 on_button_down => sub {
2291 my ($self, $ev) = @_;
2292 local $ev->{x} = 0;
2293 local $ev->{y} = 0;
2294 $MENUPOPUP->popup ($ev);
2295 },
2296 );
2297
2298 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2299 padding_x => 6,
2300 padding_y => 3,
2301 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2302 template => " Exp: 888,888,888,888 (lvl 188) ",
2303 );
2304
2305 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2306 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2307 . "will automatically pick up items as defined by your item pickup settings "
2308 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2309 . "disable autopickup by disabling this checkbox.",
2310 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2314 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2315 $CONN->send_pickup ($CFG->{pickup})
2316 if $CONN;
2317 },
2318 );
2319
2320 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2321 c_rescale => 1,
2322 padding_x => 6,
2323 padding_y => 3,
2324 force_w => $::WIDTH * 0.2,
2325 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2326 template => "two handed weapons 99%",
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2330 expand => 1,
2331 align => 1, can_hover => 1, can_events => 1,
2332 text => "Range and Combat Slots",
2333 tooltip => "#stat_ranged",
2334 );
2335
2336 $MENUFRAME->show;
2337}
2338
2339sub open_string_query {
2340 my ($title, $cb, $txt, $tooltip) = @_;
2341 my $dialog = new DC::UI::Toplevel
2342 x => "center",
2343 y => "center",
2344 z => 50,
2345 force_w => $WIDTH * 4/5,
2346 title => $title;
2347
2348 $dialog->add (
2349 my $e = new DC::UI::Entry
2350 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2351 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2352 tooltip => $tooltip
2353 );
2354
2355 $e->grab_focus;
2356 $e->set_text ($txt) if $txt;
2357 $dialog->show;
2143} 2358}
2144 2359
2145sub show_tip_of_the_day { 2360sub show_tip_of_the_day {
2146 # find all tips 2361 # find all tips
2147 my @tod = DC::Pod::find tip_of_the_day => "*"; 2362 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2415 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2201 and die "SDL::Init failed!\n"; 2416 and die "SDL::Init failed!\n";
2202} 2417}
2203 2418
2204sub video_init { 2419sub video_init {
2420 DC::set_theme $CFG->{uitheme};
2421
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2422 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0; 2423 $SDL_REINIT = 0;
2207 2424
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2425 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2426 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2430 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2214 2431
2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2432 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default 2433 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217 2434
2218 # now choose biggets mode <= 1024x768 2435 # now choose biggest mode <= 1024x768
2219 for (0 .. $#SDL_MODES) { 2436 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2437 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_; 2438 $CFG->{sdl_mode} = $_;
2222 } 2439 }
2223 } 2440 }
… …
2286 2503
2287 (new DC::UI::Frame 2504 (new DC::UI::Frame
2288 bg => [0, 0, 0, 0.4], 2505 bg => [0, 0, 0, 0.4],
2289 force_x => 0, 2506 force_x => 0,
2290 force_y => "max", 2507 force_y => "max",
2291 child => (my $LR = new DC::UI::VBox), 2508 child => (my $LL = new DC::UI::VBox),
2292 )->show; 2509 )->show;
2293 2510
2294 $LR->add ($STATUSBOX); 2511 $LL->add ($STATUSBOX);
2295 $LR->add ($MODBOX); 2512 $LL->add ($MODBOX);
2296 $LR->add (new DC::UI::Label 2513 $LL->add (new DC::UI::Label
2297 align => 0, 2514 align => 0,
2298 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2515 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2299 fontsize => 0.5, 2516 fontsize => 0.5,
2300 fg => [1, 1, 0, 0.7], 2517 fg => [1, 1, 0, 0.7],
2301 ); 2518 );
2302 2519
2303 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2304 title => "Minimap", 2521 title => "Minimap",
2305 name => "mapmap", 2522 name => "mapmap",
2306 x => 0, 2523 x => 0,
2307 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2308 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2309 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2310 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2311 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2312 ), 2529 ),
2313 )->show; 2530 )->show;
2314 2531
2315 $MAPWIDGET = new DC::MapWidget; 2532 $MAPWIDGET = new DC::MapWidget;
2316 $MAPWIDGET->connect (activate_console => sub { 2533 $MAPWIDGET->connect (activate_console => sub {
… …
2341 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2342 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2343 $MESSAGE_WINDOW = new DC::UI::Dockbar 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2344 name => "message_window2", 2561 name => "message_window2",
2345 title => 'Messages', 2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2346 force_w => $::WIDTH * 0.6, 2564 force_w => $::WIDTH * 0.6,
2347 force_h => $::HEIGHT * 0.25, 2565 force_h => $::HEIGHT * 0.25,
2348 ; 2566 ;
2349 2567
2350 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2370 . "After pressing the combo the binding will be saved automatically and the " 2588 . "After pressing the combo the binding will be saved automatically and the "
2371 . "binding editor closes"); 2589 . "binding editor closes");
2372 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2590 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2373 "Some debuggin' options. Do not ask."); 2591 "Some debuggin' options. Do not ask.");
2374 2592
2375 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2593 make_help_window;
2594 make_menubar;
2376 2595
2377 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2378 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2379
2380# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2381# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2382
2383 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
2384
2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2386 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2387
2388 $BUTTONBAR->add (new DC::UI::Button
2389 text => "Save Config",
2390 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2391 on_activate => sub {
2392 $::CFG->{layout} = DC::UI::get_layout;
2393 DC::write_cfg;
2394 status "Configuration Saved";
2395 0
2396 },
2397 );
2398
2399 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2400 tooltip => "View Documentation");
2401
2402 $BUTTONBAR->add (new DC::UI::Button
2403 text => "Quit",
2404 tooltip => "Terminates the program",
2405 on_activate => sub {
2406 if ($CONN) {
2407 open_quit_dialog;
2408 } else {
2409 EV::unloop EV::UNLOOP_ALL;
2410 }
2411 0
2412 },
2413 );
2414
2415 $BUTTONBAR->show;
2416 $SETUP_DIALOG->show; 2596 $SETUP_DIALOG->show;
2417 $MESSAGE_WINDOW->show; 2597 $MESSAGE_WINDOW->show;
2418 } 2598 }
2419 2599
2420 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422 2602
2423 $CAVEAT_LABEL->set_text ("None :)"); 2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2426 2608
2427 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2428} 2610}
… …
2456my $want_refresh = EV::prepare_ns \&force_refresh; 2638my $want_refresh = EV::prepare_ns \&force_refresh;
2457 2639
2458my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2640my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2459 $NOW = EV::now; 2641 $NOW = EV::now;
2460 2642
2461 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2643 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2462 for DC::poll_events; 2644 for DC::poll_events;
2463 2645
2464 if (%animate_object) { 2646 if (%animate_object) {
2465 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2647 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2466 $WANT_REFRESH = 1; 2648 $WANT_REFRESH = 1;
… …
2478sub animation_stop { 2660sub animation_stop {
2479 my ($widget) = @_; 2661 my ($widget) = @_;
2480 delete $animate_object{$widget}; 2662 delete $animate_object{$widget};
2481} 2663}
2482 2664
2483%SDL_CB = (
2484 DC::SDL_QUIT => sub { 2665$SDL_CB[DC::SDL_QUIT] = sub {
2666 crash "SDL_QUIT";
2485 EV::unloop EV::UNLOOP_ALL; 2667 EV::unloop EV::UNLOOP_ALL;
2486 }, 2668};
2487 DC::SDL_VIDEORESIZE => sub { 2669$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2488 },
2489 DC::SDL_VIDEOEXPOSE => sub { 2670$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2490 DC::UI::full_refresh; 2671 DC::UI::full_refresh;
2491 }, 2672};
2492 DC::SDL_ACTIVEEVENT => sub { 2673$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2493# not useful, as APPACTIVE includes only iconified state, not unmapped 2674# not useful, as APPACTIVE includes only iconified state, not unmapped
2494# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2675# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2495# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2676# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2496# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2677# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2497# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2678# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2498# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2679# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2499 }, 2680};
2500 DC::SDL_KEYDOWN => sub { 2681$SDL_CB[DC::SDL_KEYDOWN] = sub {
2501 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2682 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2502 # alt-enter 2683 # alt-enter
2503 video_shutdown; 2684 video_shutdown;
2504 $FULLSCREEN_ENABLE->toggle; 2685 $FULLSCREEN_ENABLE->toggle;
2505 video_init; 2686 video_init;
2506 } else { 2687 } else {
2507 &DC::UI::feed_sdl_key_down_event; 2688 &DC::UI::feed_sdl_key_down_event;
2508 } 2689 }
2509 update_modbox; 2690 update_modbox;
2510 }, 2691};
2511 DC::SDL_KEYUP => sub { 2692$SDL_CB[DC::SDL_KEYUP] = sub {
2512 &DC::UI::feed_sdl_key_up_event; 2693 &DC::UI::feed_sdl_key_up_event;
2513 update_modbox; 2694 update_modbox;
2514 }, 2695};
2515 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2696$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2516 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2517 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2698$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2518 DC::SDL_USEREVENT => sub { 2699$SDL_CB[DC::SDL_USEREVENT] = sub {
2519 if ($_[0]{code} == 1) { 2700 if ($_[0]{code} == 1) {
2520 audio_channel_finished $_[0]{data1}; 2701 audio_channel_finished $_[0]{data1};
2521 } elsif ($_[0]{code} == 0) { 2702 } elsif ($_[0]{code} == 0) {
2522 audio_music_finished; 2703 audio_music_finished;
2523 }
2524 }, 2704 }
2525); 2705};
2526 2706
2527############################################################################# 2707#############################################################################
2528 2708
2529$SIG{INT} = $SIG{TERM} = sub { 2709$SIG{INT} = $SIG{TERM} = sub {
2530 EV::unloop; 2710 EV::unloop;
2531 #d# TODO calling exit here hangs the process in some futex 2711 #d# TODO calling exit here hangs the process in some futex
2532}; 2712};
2533 2713
2534# due to mac os x + sdl combined briandamage, we need this contortion 2714# due to mac os x + sdl combined braindamage, we need this contortion
2535sub main { 2715sub main {
2536 { 2716 {
2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2717 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2538 2718
2539 if (-e "$Deliantra::VARDIR/client.cf") { 2719 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2556 DC::DB::open_db; 2736 DC::DB::open_db;
2557 2737
2558 DC::UI::set_layout ($::CFG->{layout}); 2738 DC::UI::set_layout ($::CFG->{layout});
2559 2739
2560 my %DEF_CFG = ( 2740 my %DEF_CFG = (
2741 config_autosave => 1,
2561 sdl_mode => undef, 2742 sdl_mode => undef,
2562 fullscreen => 1, 2743 fullscreen => 1,
2563 fast => 0, 2744 fast => 0,
2564 force_opengl11 => undef, 2745 force_opengl11 => undef,
2565 disable_alpha => 0, 2746 disable_alpha => 0,
2566 smooth_movement => 1, 2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2567 texture_compression => 1, 2749 texture_compression => 1,
2568 map_scale => 1, 2750 map_scale => 1,
2569 fow_enable => 1, 2751 fow_enable => 1,
2570 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2571 map_smoothing => 1, 2754 map_smoothing => 1,
2572 gui_fontsize => 1, 2755 gui_fontsize => 1,
2573 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2574 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2575 gauge_size => 0.35, 2758 gauge_size => 0.35,
… …
2583 effects_enable => 1, 2766 effects_enable => 1,
2584 effects_volume => 1, 2767 effects_volume => 1,
2585 bgm_enable => 1, 2768 bgm_enable => 1,
2586 bgm_volume => 0.5, 2769 bgm_volume => 0.5,
2587 output_rate => "", 2770 output_rate => "",
2588 pickup => 0, 2771 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2589 inv_sort => "mtime", 2772 inv_sort => "mtime",
2590 default => "profile", # default profile 2773 default => "profile", # default profile
2591 show_tips => 1, 2774 show_tips => 1,
2592 logview_max_par => 1000, 2775 logview_max_par => 1000,
2593 shift_fire_stop => 0, 2776 shift_fire_stop => 0,
2777 uitheme => "wood",
2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2594 ); 2780 );
2595 2781
2596 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2597 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2598 } 2784 }
… …
2612 } 2798 }
2613 } 2799 }
2614 2800
2615 sdl_init; 2801 sdl_init;
2616 2802
2803 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2804 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2805
2617 { 2806 {
2618 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2807 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2619 DejaVuSans.ttf 2808 DejaVuSans.ttf
2620 DejaVuSansMono.ttf 2809 DejaVuSansMono.ttf
2621 DejaVuSans-Bold.ttf 2810 DejaVuSans-Bold.ttf
2622 DejaVuSansMono-Bold.ttf 2811 DejaVuSansMono-Bold.ttf
2623 DejaVuSans-Oblique.ttf 2812 DejaVuSans-Oblique.ttf
2624 DejaVuSansMono-Oblique.ttf 2813 DejaVuSansMono-Oblique.ttf
2625 DejaVuSans-BoldOblique.ttf 2814 DejaVuSans-BoldOblique.ttf
2626 DejaVuSansMono-BoldOblique.ttf 2815 DejaVuSansMono-BoldOblique.ttf
2816 mona.ttf
2627 ); 2817 );
2628 2818
2629 DC::add_font $_ for @fonts; 2819 DC::add_font $_ for @fonts;
2630 2820
2631 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2821 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2661 }; 2851 };
2662 2852
2663 delete $SIG{__DIE__}; 2853 delete $SIG{__DIE__};
2664 EV::loop; 2854 EV::loop;
2665 2855
2856 DC::write_cfg if $CFG->{config_autosave};
2857
2666#video_shutdown; 2858 #video_shutdown;
2667#audio_shutdown; 2859 #audio_shutdown;
2860
2668 DC::OpenGL::quit; 2861 DC::OpenGL::quit;
2669 DC::SDL_Quit; 2862 DC::SDL_Quit;
2670 DC::DB::Server::stop; 2863 DC::DB::Server::stop;
2671} 2864}
2672 2865

Diff Legend

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