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.77 by root, Fri Sep 26 04:45:48 2008 UTC vs.
Revision 1.97 by root, Thu Nov 26 07:19:12 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
… …
106 89
107use Deliantra; 90use Deliantra;
108use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
109 92
110use AnyEvent::Util (); 93use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
113 96
114use Compress::LZF; 97use Compress::LZF;
115use JSON::XS; 98use JSON::XS;
116 99
117use DC; 100use DC;
… …
145 128
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
148 131
149$EV::DIED = sub { 132$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 133 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
152}; 135};
153 136
154my $MAX_FPS = 60; 137my $MAX_FPS = 60;
155 138
… …
181 164
182our $MAP; 165our $MAP;
183our $MAPMAP; 166our $MAPMAP;
184our $MAPWIDGET; 167our $MAPWIDGET;
185our $COMPLETER; 168our $COMPLETER;
186our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
187our $METASERVER; 173our $METASERVER;
188our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 175our $QUIT_DIALOG;
190our $HOST_ENTRY; 176our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 203our $FLOORBOX;
218our $GAUGES; 204our $GAUGES;
219our $STATWIDS; 205our $STATWIDS;
220 206
221our $SDL_ACTIVE; 207our $SDL_ACTIVE;
222our %SDL_CB; 208our @SDL_CB;
223 209
224our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 211our $STATUSBOX;
226our $MODBOX; 212our $MODBOX;
227our $DEBUG_STATUS; 213our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 221# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 222# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 223*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 224 my ($msg, $backtrace) = @_;
239 225
226 warn $msg;
227
240 return unless $CONN; 228 return unless $CONN;
241 229
242 my $fh = $CONN->{fh} 230 my $fh = $CONN->{fh}
243 or return; 231 or return;
244 232
… …
254 242
255 # backtrace as second step, in case it crashes, too 243 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 245 if $backtrace;
258}; 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}
259 258
260############################################################################# 259#############################################################################
261 260
262sub status { 261sub status {
263 $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]);
… …
345 or return; 344 or return;
346 345
347 $meta->{data} 346 $meta->{data}
348 or return; 347 or return;
349 348
350 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 353 &audio_music_push ($face);
355 } 354 }
356 } else { 355 } else {
357 # fetch from database 356 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
364 363
365 audio_sound_push ($face); 364 audio_sound_push ($face);
366 }; 365 };
… …
413 412
414 audio_music_update_volume; 413 audio_music_update_volume;
415 414
416 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
417 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
418 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
421 423
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 426
425 my $NOW = time; 427 my $NOW = time;
426 428
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
546 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
547 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
548 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
549 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
550 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
551 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
552 undef $SDL_MIXER; 556 undef $SDL_MIXER;
553} 557}
554 558
555############################################################################# 559#############################################################################
… …
786} 790}
787 791
788sub dc_connect { 792sub dc_connect {
789 my ($host, $port) = @_; 793 my ($host, $port) = @_;
790 794
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 797
793 $CONN = 798 $CONN =
794 new DC::Protocol 799 new DC::Protocol
795 host => $host, 800 host => $host,
796 port => $port, 801 port => $port,
797 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
799 mapw => $mapsize, 804 mapw => $mapw,
800 maph => $mapsize, 805 maph => $maph,
801 806
802 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
803 808
804 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
813 818
814 on_connect => sub { 819 on_connect => sub {
815 if ($_[0]) { 820 if ($_[0]) {
816 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
817 822
818 status "login successful"; 823 status "successfully connected to the server";
819 } else { 824 } else {
820 undef $CONN; 825 undef $CONN;
821 status "unable to connect: $!"; 826 status "unable to connect: $!";
822 stop_game(); 827 stop_game();
823 } 828 }
… …
838 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
843 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
845 } 854 }
846 855
847 dc_connect $host, $port; 856 dc_connect $host, $port;
848 }; 857 };
849 } else { 858 } else {
… …
916 925
917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
918 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
919 928
920 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
930 c_rescale => 1,
921 force_w => $WIDTH * 0.1, expand => 1, 931 force_w => $WIDTH * 0.1, expand => 1,
922 range => [ ($CFG->{sdl_mode}) x 3 ], 932 range => [ ($CFG->{sdl_mode}) x 3 ],
923 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
924 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
925 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
… …
953 ); 963 );
954 964
955 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
956 $table->add_at (1, $row++, new DC::UI::CheckBox 966 $table->add_at (1, $row++, new DC::UI::CheckBox
957 state => $CFG->{disable_alpha}, 967 state => $CFG->{disable_alpha},
958 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 968 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
959 . "by disabling a number of textures and transparency effects. Normally, these " 969 . "by disabling a number of textures and transparency effects. Normally, these "
960 . "effects do not cost a lot of resources, but some graphics cards might fall " 970 . "effects do not cost a lot of resources, but some graphics cards might fall "
961 . "back to extremely slow rendering if this is enabled. If disabling this option " 971 . "back to extremely slow rendering if this is enabled. If disabling this option "
962 . "noticably improves the framerate of the client please report this! " 972 . "noticably improves the framerate of the client please report this! "
963 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>", 973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
… …
1249} 1259}
1250 1260
1251sub make_gauge_window { 1261sub make_gauge_window {
1252 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1253 1263
1254 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1255 force_x => 0, 1265 force_x => 0,
1256 force_y => "max", 1266 force_y => "max",
1257 force_w => $WIDTH, 1267 force_w => $WIDTH,
1258 force_h => $gh, 1268 force_h => $gh,
1259 ); 1269 );
… …
1275 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1276 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1277 ], 1287 ],
1278 ); 1288 );
1279 1289
1280 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1281 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1291 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1282 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1292 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1283 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1293 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1284
1285 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1286 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1287 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1288 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1289
1290 $GAUGES = {
1291 exp => $exp, prg => $prg, sklprg => $sklprg,
1292 win => $win, range => $rng,
1293 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1294 };
1295 1294
1296 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1297 1296
1298 $win 1297 $win
1299} 1298}
… …
1641 ); 1640 );
1642 1641
1643 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1644 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1645 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1646 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1647 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1648 ); 1647 );
1649 1648
1650 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1651 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1753 1752
1754 my $row = 0; 1753 my $row = 0;
1755 1754
1756 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1757 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1758 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1759 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1760 on_changed => sub { 1760 on_changed => sub {
1761 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1762 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1764 } 1764 }
1765 ); 1765 );
1766 1766
1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1769 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1770 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1771 . "sends more messages than this number, older messages get removed to save memory and " 1772 . "sends more messages than this number, older messages get removed to save memory and "
1772 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1773 on_changed => sub { 1774 on_changed => sub {
… …
1775 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1776 0 1777 0
1777 }, 1778 },
1778 ); 1779 );
1779 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1780 $table 1803 $table
1781} 1804}
1782 1805
1783sub autopickup_setup { 1806sub autopickup_setup {
1784 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1790 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1791 ); 1814 );
1792 1815
1793 for ( 1816 for (
1794 ["General", 0, 0, 1817 ["General", 0, 0,
1795 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1796 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1797 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1798 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1799 ], 1821 ],
1800 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1801 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1849 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1850 } else { 1872 } else {
1851 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1852 } 1874 }
1853 1875
1854 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1855 if defined $::CONN; 1877 if defined $::CONN;
1856 1878
1857 0 1879 0
1858 }); 1880 });
1859 1881
… …
1876 }); 1898 });
1877 1899
1878 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1879 text => "set", 1901 text => "set",
1880 on_activate => sub { 1902 on_activate => sub {
1881 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1882 if defined $::CONN; 1904 if defined $::CONN;
1883 0 1905 0
1884 }); 1906 });
1885 1907
1886 $r 1908 $r
… …
1999 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
2000 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
2001 } 2023 }
2002} 2024}
2003 2025
2004sub player_window { 2026sub make_playerbook {
2005 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2006 x => "center", 2028 x => "center",
2007 y => "center", 2029 y => "center",
2008 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
2009 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
2043 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
2044 2066
2045 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
2046 2068
2047 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
2048 $plwin
2049} 2070}
2050 2071
2051sub keyboard_setup { 2072sub keyboard_setup {
2052 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
2053} 2074}
2054 2075
2055sub help_window { 2076sub make_help_window {
2056 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
2057 x => 'center', 2078 x => 'center',
2058 y => 'center', 2079 y => 'center',
2059 z => 4, 2080 z => 4,
2060 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2149 2170
2150 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2151 $win->show; 2172 $win->show;
2152 }; 2173 };
2153 2174
2154 $win 2175 $HELP_WINDOW = $win;
2155}
2156
2157sub open_string_query {
2158 my ($title, $cb, $txt, $tooltip) = @_;
2159 my $dialog = new DC::UI::Toplevel
2160 x => "center",
2161 y => "center",
2162 z => 50,
2163 force_w => $WIDTH * 4/5,
2164 title => $title;
2165
2166 $dialog->add (
2167 my $e = new DC::UI::Entry
2168 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2169 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2170 tooltip => $tooltip
2171 );
2172
2173 $e->grab_focus;
2174 $e->set_text ($txt) if $txt;
2175 $dialog->show;
2176} 2176}
2177 2177
2178sub open_quit_dialog { 2178sub open_quit_dialog {
2179 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2180 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2213 2213
2214 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2215 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2216} 2216}
2217 2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # 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
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2324}
2325
2218sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2219 # find all tips 2327 # find all tips
2220 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
2221 2329
2222 DC::DB::get state => "tip_of_the_day", sub { 2330 DC::DB::get state => "tip_of_the_day", sub {
… …
2361 2469
2362 (new DC::UI::Frame 2470 (new DC::UI::Frame
2363 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2364 force_x => 0, 2472 force_x => 0,
2365 force_y => "max", 2473 force_y => "max",
2366 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2367 )->show; 2475 )->show;
2368 2476
2369 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2370 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2371 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2372 align => 0, 2480 align => 0,
2373 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2374 fontsize => 0.5, 2482 fontsize => 0.5,
2375 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2376 ); 2484 );
2377 2485
2378 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2379 title => "Minimap", 2487 title => "Minimap",
2380 name => "mapmap", 2488 name => "mapmap",
2381 x => 0, 2489 x => 0,
2382 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2383 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2384 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2385 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2386 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2387 ), 2495 ),
… …
2416 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2417 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2418 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2419 name => "message_window2", 2527 name => "message_window2",
2420 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2421 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2422 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2423 ; 2532 ;
2424 2533
2425 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2445 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2446 . "binding editor closes"); 2555 . "binding editor closes");
2447 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2448 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2449 2558
2450 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2451 2561
2452 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2453 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2454
2455# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2456# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2457
2458 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
2459
2460 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2461 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2462
2463 $BUTTONBAR->add (new DC::UI::Button
2464 text => "Save Config",
2465 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2466 on_activate => sub {
2467 $::CFG->{layout} = DC::UI::get_layout;
2468 DC::write_cfg;
2469 status "Configuration Saved";
2470 0
2471 },
2472 );
2473
2474 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2475 tooltip => "View Documentation");
2476
2477 $BUTTONBAR->add (new DC::UI::Button
2478 text => "Quit",
2479 tooltip => "Terminates the program",
2480 on_activate => sub {
2481 if ($CONN) {
2482 open_quit_dialog;
2483 } else {
2484 EV::unloop EV::UNLOOP_ALL;
2485 }
2486 0
2487 },
2488 );
2489
2490 $BUTTONBAR->show;
2491 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2492 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2493 } 2564 }
2494 2565
2495 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2496 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2497 2568
2498 $CAVEAT_LABEL->set_text ("None :)"); 2569 $CAVEAT_LABEL->set_text ("None :)");
2570 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2571 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2499 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2572 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2500 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2573 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2501 2574
2502 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2575 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2503} 2576}
… …
2531my $want_refresh = EV::prepare_ns \&force_refresh; 2604my $want_refresh = EV::prepare_ns \&force_refresh;
2532 2605
2533my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2606my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2534 $NOW = EV::now; 2607 $NOW = EV::now;
2535 2608
2536 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2609 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2537 for DC::poll_events; 2610 for DC::poll_events;
2538 2611
2539 if (%animate_object) { 2612 if (%animate_object) {
2540 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2613 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2541 $WANT_REFRESH = 1; 2614 $WANT_REFRESH = 1;
… …
2553sub animation_stop { 2626sub animation_stop {
2554 my ($widget) = @_; 2627 my ($widget) = @_;
2555 delete $animate_object{$widget}; 2628 delete $animate_object{$widget};
2556} 2629}
2557 2630
2558%SDL_CB = (
2559 DC::SDL_QUIT => sub { 2631$SDL_CB[DC::SDL_QUIT] = sub {
2560 crash "SDL_QUIT"; 2632 crash "SDL_QUIT";
2561 EV::unloop EV::UNLOOP_ALL; 2633 EV::unloop EV::UNLOOP_ALL;
2562 }, 2634};
2563 DC::SDL_VIDEORESIZE => sub { 2635$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2564 },
2565 DC::SDL_VIDEOEXPOSE => sub { 2636$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2566 DC::UI::full_refresh; 2637 DC::UI::full_refresh;
2567 }, 2638};
2568 DC::SDL_ACTIVEEVENT => sub { 2639$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2569# not useful, as APPACTIVE includes only iconified state, not unmapped 2640# not useful, as APPACTIVE includes only iconified state, not unmapped
2570# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2641# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2571# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2642# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2572# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2643# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2573# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2644# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2574# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2645# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2575 }, 2646};
2576 DC::SDL_KEYDOWN => sub { 2647$SDL_CB[DC::SDL_KEYDOWN] = sub {
2577 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2648 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2578 # alt-enter 2649 # alt-enter
2579 video_shutdown; 2650 video_shutdown;
2580 $FULLSCREEN_ENABLE->toggle; 2651 $FULLSCREEN_ENABLE->toggle;
2581 video_init; 2652 video_init;
2582 } else { 2653 } else {
2583 &DC::UI::feed_sdl_key_down_event; 2654 &DC::UI::feed_sdl_key_down_event;
2584 } 2655 }
2585 update_modbox; 2656 update_modbox;
2586 }, 2657};
2587 DC::SDL_KEYUP => sub { 2658$SDL_CB[DC::SDL_KEYUP] = sub {
2588 &DC::UI::feed_sdl_key_up_event; 2659 &DC::UI::feed_sdl_key_up_event;
2589 update_modbox; 2660 update_modbox;
2590 }, 2661};
2591 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2662$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2592 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2663$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2593 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2664$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2594 DC::SDL_USEREVENT => sub { 2665$SDL_CB[DC::SDL_USEREVENT] = sub {
2595 if ($_[0]{code} == 1) { 2666 if ($_[0]{code} == 1) {
2596 audio_channel_finished $_[0]{data1}; 2667 audio_channel_finished $_[0]{data1};
2597 } elsif ($_[0]{code} == 0) { 2668 } elsif ($_[0]{code} == 0) {
2598 audio_music_finished; 2669 audio_music_finished;
2599 }
2600 }, 2670 }
2601); 2671};
2602 2672
2603############################################################################# 2673#############################################################################
2604 2674
2605$SIG{INT} = $SIG{TERM} = sub { 2675$SIG{INT} = $SIG{TERM} = sub {
2606 EV::unloop; 2676 EV::unloop;
2607 #d# TODO calling exit here hangs the process in some futex 2677 #d# TODO calling exit here hangs the process in some futex
2608}; 2678};
2609 2679
2610# due to mac os x + sdl combined briandamage, we need this contortion 2680# due to mac os x + sdl combined braindamage, we need this contortion
2611sub main { 2681sub main {
2612 { 2682 {
2613 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2683 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2614 2684
2615 if (-e "$Deliantra::VARDIR/client.cf") { 2685 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2632 DC::DB::open_db; 2702 DC::DB::open_db;
2633 2703
2634 DC::UI::set_layout ($::CFG->{layout}); 2704 DC::UI::set_layout ($::CFG->{layout});
2635 2705
2636 my %DEF_CFG = ( 2706 my %DEF_CFG = (
2707 config_autosave => 1,
2637 sdl_mode => undef, 2708 sdl_mode => undef,
2638 fullscreen => 1, 2709 fullscreen => 1,
2639 fast => 0, 2710 fast => 0,
2640 force_opengl11 => undef, 2711 force_opengl11 => undef,
2641 disable_alpha => 0, 2712 disable_alpha => 0,
… …
2659 effects_enable => 1, 2730 effects_enable => 1,
2660 effects_volume => 1, 2731 effects_volume => 1,
2661 bgm_enable => 1, 2732 bgm_enable => 1,
2662 bgm_volume => 0.5, 2733 bgm_volume => 0.5,
2663 output_rate => "", 2734 output_rate => "",
2664 pickup => 0, 2735 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2665 inv_sort => "mtime", 2736 inv_sort => "mtime",
2666 default => "profile", # default profile 2737 default => "profile", # default profile
2667 show_tips => 1, 2738 show_tips => 1,
2668 logview_max_par => 1000, 2739 logview_max_par => 1000,
2669 shift_fire_stop => 0, 2740 shift_fire_stop => 0,
2670 uitheme => "wood", 2741 uitheme => "wood",
2742 map_shift_x => -24, # arbitrary
2743 map_shift_y => +24, # arbitrary
2671 ); 2744 );
2672 2745
2673 while (my ($k, $v) = each %DEF_CFG) { 2746 while (my ($k, $v) = each %DEF_CFG) {
2674 $CFG->{$k} = $v unless exists $CFG->{$k}; 2747 $CFG->{$k} = $v unless exists $CFG->{$k};
2675 } 2748 }
… …
2689 } 2762 }
2690 } 2763 }
2691 2764
2692 sdl_init; 2765 sdl_init;
2693 2766
2767 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2768 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2769
2694 { 2770 {
2695 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2771 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2696 DejaVuSans.ttf 2772 DejaVuSans.ttf
2697 DejaVuSansMono.ttf 2773 DejaVuSansMono.ttf
2698 DejaVuSans-Bold.ttf 2774 DejaVuSans-Bold.ttf
2699 DejaVuSansMono-Bold.ttf 2775 DejaVuSansMono-Bold.ttf
2700 DejaVuSans-Oblique.ttf 2776 DejaVuSans-Oblique.ttf
2701 DejaVuSansMono-Oblique.ttf 2777 DejaVuSansMono-Oblique.ttf
2702 DejaVuSans-BoldOblique.ttf 2778 DejaVuSans-BoldOblique.ttf
2703 DejaVuSansMono-BoldOblique.ttf 2779 DejaVuSansMono-BoldOblique.ttf
2780 mona.ttf
2704 ); 2781 );
2705 2782
2706 DC::add_font $_ for @fonts; 2783 DC::add_font $_ for @fonts;
2707 2784
2708 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2785 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2738 }; 2815 };
2739 2816
2740 delete $SIG{__DIE__}; 2817 delete $SIG{__DIE__};
2741 EV::loop; 2818 EV::loop;
2742 2819
2820 DC::write_cfg if $CFG->{config_autosave};
2821
2743#video_shutdown; 2822 #video_shutdown;
2744#audio_shutdown; 2823 #audio_shutdown;
2824
2745 DC::OpenGL::quit; 2825 DC::OpenGL::quit;
2746 DC::SDL_Quit; 2826 DC::SDL_Quit;
2747 DC::DB::Server::stop; 2827 DC::DB::Server::stop;
2748} 2828}
2749 2829

Diff Legend

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