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.82 by root, Wed Dec 24 04:09:27 2008 UTC vs.
Revision 1.100 by root, Tue Dec 22 01:37:42 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 {
… …
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 } else { 59 } else {
55 # OS X 60 # OS X
56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
61 } 64 }
62 65
63 unshift @INC, $root; 66 unshift @INC, $root;
64 } 67 }
65} 68}
66 69
67# prepend private library directory 70# prepend private library directory and prepare env
68BEGIN { 71BEGIN {
69 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 74 if (-d $path) {
72 unshift @INC, $path; 75 unshift @INC, $path;
… …
86 89
87use Deliantra; 90use Deliantra;
88use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
89 92
90use AnyEvent::Util (); 93use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
93 96
94use Compress::LZF; 97use Compress::LZF;
95use JSON::XS; 98use JSON::XS;
96 99
97use DC; 100use DC;
… …
131 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
132}; 135};
133 136
134my $MAX_FPS = 60; 137my $MAX_FPS = 60;
135 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 142
138our $LAST_REFRESH; 143our $LAST_REFRESH;
139our $NOW; 144our $NOW;
140 145
… …
161 166
162our $MAP; 167our $MAP;
163our $MAPMAP; 168our $MAPMAP;
164our $MAPWIDGET; 169our $MAPWIDGET;
165our $COMPLETER; 170our $COMPLETER;
166our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
167our $METASERVER; 175our $METASERVER;
168our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 177our $QUIT_DIALOG;
170our $HOST_ENTRY; 178our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
197our $FLOORBOX; 205our $FLOORBOX;
198our $GAUGES; 206our $GAUGES;
199our $STATWIDS; 207our $STATWIDS;
200 208
201our $SDL_ACTIVE; 209our $SDL_ACTIVE;
202our %SDL_CB; 210our @SDL_CB;
203 211
204our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 213our $STATUSBOX;
206our $MODBOX; 214our $MODBOX;
207our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
338 or return; 346 or return;
339 347
340 $meta->{data} 348 $meta->{data}
341 or return; 349 or return;
342 350
343 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
344 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
345 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
346 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
347 &audio_music_push ($face); 355 &audio_music_push ($face);
348 } 356 }
349 } else { 357 } else {
350 # fetch from database 358 # fetch from database
351 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
352 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
353 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
354 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;
355 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
356 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
357 365
358 audio_sound_push ($face); 366 audio_sound_push ($face);
359 }; 367 };
… …
406 414
407 audio_music_update_volume; 415 audio_music_update_volume;
408 416
409 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
410 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
411 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
412 ? 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
413 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
414 425
415 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
417 428
… …
539 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
540 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
541 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
542 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
543 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
544 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
545 undef $SDL_MIXER; 558 undef $SDL_MIXER;
546} 559}
547 560
548############################################################################# 561#############################################################################
… …
807 820
808 on_connect => sub { 821 on_connect => sub {
809 if ($_[0]) { 822 if ($_[0]) {
810 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
811 824
812 status "login successful"; 825 status "successfully connected to the server";
813 } else { 826 } else {
814 undef $CONN; 827 undef $CONN;
815 status "unable to connect: $!"; 828 status "unable to connect: $!";
816 stop_game(); 829 stop_game();
817 } 830 }
… …
819 ; 832 ;
820} 833}
821 834
822sub start_game { 835sub start_game {
823 status "logging in..."; 836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
824 841
825 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
826 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
827
828 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
829 844
830 $MAP = new DC::Map; 845 $MAP = new DC::Map;
831 846
832 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
833 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
834 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
835 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
836 if ($_[0] ne "80.101.114.108") { # Perl 851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
837 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
838 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
839 } 858 }
840 859
841 dc_connect $host, $port; 860 dc_connect $host, $port;
842 }; 861 };
843 } else { 862 } else {
… …
910 929
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
913 932
914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
934 c_rescale => 1,
915 force_w => $WIDTH * 0.1, expand => 1, 935 force_w => $WIDTH * 0.1, expand => 1,
916 range => [ ($CFG->{sdl_mode}) x 3 ], 936 range => [ ($CFG->{sdl_mode}) x 3 ],
917 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
918 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
919 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
… …
1011 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1012 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1014 ); 1034 );
1015 1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1045
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1017 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1033 $table->add_at (1, $row++, new DC::UI::CheckBox 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
1034 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
1035 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1067 );
1068
1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1070 $table->add_at (1, $row++, new DC::UI::ImageButton
1071 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1072 bg => [0.3, 0.3, 0.2],
1073 force_w => 64,
1074 force_h => 64,
1075 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.",
1076 on_activate => sub {
1077 my ($self) = @_;
1078 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1079 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1080 $MAPWIDGET->update;
1081 }
1037 ); 1082 );
1038 1083
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1084 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1040 $table->add_at (1, $row++, new DC::UI::Slider 1085 $table->add_at (1, $row++, new DC::UI::Slider
1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1086 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1243} 1288}
1244 1289
1245sub make_gauge_window { 1290sub make_gauge_window {
1246 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1291 my $gh = int $HEIGHT * $CFG->{gauge_size};
1247 1292
1248 my $win = new DC::UI::Frame ( 1293 $GAUGES->{win} = my $win = new DC::UI::Frame (
1249 force_x => 0, 1294 force_x => 0,
1250 force_y => "max", 1295 force_y => "max",
1251 force_w => $WIDTH, 1296 force_w => $WIDTH,
1252 force_h => $gh, 1297 force_h => $gh,
1253 ); 1298 );
… …
1269 (new DC::UI::Empty expand => 1), 1314 (new DC::UI::Empty expand => 1),
1270 (my $hb = new DC::UI::HBox), 1315 (my $hb = new DC::UI::HBox),
1271 ], 1316 ],
1272 ); 1317 );
1273 1318
1274 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1319 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1275 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1320 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1276 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1321 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1277 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1322 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1278
1279 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1280 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1281 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1282 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1283
1284 $GAUGES = {
1285 exp => $exp, prg => $prg, sklprg => $sklprg,
1286 win => $win, range => $rng,
1287 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1288 };
1289 1323
1290 &set_gauge_window_fontsize; 1324 &set_gauge_window_fontsize;
1291 1325
1292 $win 1326 $win
1293} 1327}
… …
1635 ); 1669 );
1636 1670
1637 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1671 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1638 $table->add_at (1, 4, new DC::UI::Entry 1672 $table->add_at (1, 4, new DC::UI::Entry
1639 text => $CFG->{profile}{default}{user}, 1673 text => $CFG->{profile}{default}{user},
1640 tooltip => "The name of your character on the server.", 1674 tooltip => "The name of your character on the server. The name is case-sensitive!",
1641 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1675 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1642 ); 1676 );
1643 1677
1644 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1678 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1645 $table->add_at (1, 5, new DC::UI::Entry 1679 $table->add_at (1, 5, new DC::UI::Entry
… …
1747 1781
1748 my $row = 0; 1782 my $row = 0;
1749 1783
1750 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1784 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1751 $table->add_at (1, $row++, new DC::UI::CheckBox 1785 $table->add_at (1, $row++, new DC::UI::CheckBox
1786 c_colspan => 2,
1752 state => $CFG->{show_tips}, 1787 state => $CFG->{show_tips},
1753 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1788 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1754 on_changed => sub { 1789 on_changed => sub {
1755 my ($self, $value) = @_; 1790 my ($self, $value) = @_;
1756 $CFG->{show_tips} = $value; 1791 $CFG->{show_tips} = $value;
… …
1758 } 1793 }
1759 ); 1794 );
1760 1795
1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1796 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1797 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1798 c_colspan => 2,
1763 text => $CFG->{logview_max_par}, 1799 text => $CFG->{logview_max_par},
1764 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1800 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1765 . "sends more messages than this number, older messages get removed to save memory and " 1801 . "sends more messages than this number, older messages get removed to save memory and "
1766 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1802 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1767 on_changed => sub { 1803 on_changed => sub {
… …
1769 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1805 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1770 0 1806 0
1771 }, 1807 },
1772 ); 1808 );
1773 1809
1810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1811 $table->add_at (1, $row, new DC::UI::CheckBox
1812 state => $CFG->{config_autosave},
1813 tooltip => "Normally, configuration settings and the user interface layout "
1814 . "are saved on client exit. You can disable this behaviour by "
1815 . "unchecking this checkbox.",
1816 on_changed => sub {
1817 my ($self, $value) = @_;
1818 $CFG->{config_autosave} = $value;
1819 0
1820 }
1821 );
1822 $table->add_at (2, $row++, new DC::UI::Button
1823 text => "Save Now",
1824 tooltip => "Use this to manually save configuration and UI layout when "
1825 . "autosave is disabled.",
1826 on_activate => sub {
1827 DC::write_cfg;
1828 0
1829 }
1830 );
1831
1774 $table 1832 $table
1775} 1833}
1776 1834
1777sub autopickup_setup { 1835sub autopickup_setup {
1778 my $r = new DC::UI::ScrolledWindow ( 1836 my $r = new DC::UI::ScrolledWindow (
… …
1784 col_expand => [0, 1, 0, 1], 1842 col_expand => [0, 1, 0, 1],
1785 ); 1843 );
1786 1844
1787 for ( 1845 for (
1788 ["General", 0, 0, 1846 ["General", 0, 0,
1789 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1790 ["Inhibit autopickup" => PICKUP_INHIBIT], 1847# ["Inhibit autopickup" => PICKUP_INHIBIT],
1791 ["Stop before pickup" => PICKUP_STOP], 1848 ["Stop before pickup" => PICKUP_STOP],
1792 ["Debug autopickup" => PICKUP_DEBUG], 1849 ["Debug autopickup" => PICKUP_DEBUG],
1793 ], 1850 ],
1794 ["Weapons", 0, 6, 1851 ["Weapons", 0, 6,
1795 ["All weapons" => PICKUP_ALLWEAPON], 1852 ["All weapons" => PICKUP_ALLWEAPON],
… …
1843 $::CFG->{pickup} |= $mask; 1900 $::CFG->{pickup} |= $mask;
1844 } else { 1901 } else {
1845 $::CFG->{pickup} &= ~$mask; 1902 $::CFG->{pickup} &= ~$mask;
1846 } 1903 }
1847 1904
1848 $::CONN->send_command ("pickup $::CFG->{pickup}") 1905 $::CONN->send_pickup ($::CFG->{pickup})
1849 if defined $::CONN; 1906 if defined $::CONN;
1850 1907
1851 0 1908 0
1852 }); 1909 });
1853 1910
… …
1870 }); 1927 });
1871 1928
1872 $table->add_at (3, 18, new DC::UI::Button 1929 $table->add_at (3, 18, new DC::UI::Button
1873 text => "set", 1930 text => "set",
1874 on_activate => sub { 1931 on_activate => sub {
1875 $::CONN->send_command ("pickup $::CFG->{pickup}") 1932 $::CONN->send_pickup ($::CFG->{pickup})
1876 if defined $::CONN; 1933 if defined $::CONN;
1877 0 1934 0
1878 }); 1935 });
1879 1936
1880 $r 1937 $r
… …
1993 $PL_NOTEBOOK->set_current_page ($widget); 2050 $PL_NOTEBOOK->set_current_page ($widget);
1994 $PL_WINDOW->show; 2051 $PL_WINDOW->show;
1995 } 2052 }
1996} 2053}
1997 2054
1998sub player_window { 2055sub make_playerbook {
1999 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2056 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2000 x => "center", 2057 x => "center",
2001 y => "center", 2058 y => "center",
2002 force_w => $WIDTH * 9/10, 2059 force_w => $WIDTH * 9/10,
2003 force_h => $HEIGHT * 9/10, 2060 force_h => $HEIGHT * 9/10,
… …
2037 "License, Author and Source info for media sent by the server."); 2094 "License, Author and Source info for media sent by the server.");
2038 2095
2039 $ntb->set_current_page ($INVENTORY_PAGE); 2096 $ntb->set_current_page ($INVENTORY_PAGE);
2040 2097
2041 $plwin->add ($ntb); 2098 $plwin->add ($ntb);
2042 $plwin
2043} 2099}
2044 2100
2045sub keyboard_setup { 2101sub keyboard_setup {
2046 DC::Macro::keyboard_setup 2102 DC::Macro::keyboard_setup
2047} 2103}
2048 2104
2049sub help_window { 2105sub make_help_window {
2050 my $win = new DC::UI::Toplevel 2106 my $win = new DC::UI::Toplevel
2051 x => 'center', 2107 x => 'center',
2052 y => 'center', 2108 y => 'center',
2053 z => 4, 2109 z => 4,
2054 name => 'doc_browser', 2110 name => 'doc_browser',
… …
2143 2199
2144 $load_node->((DC::Pod::find @path)[0]); 2200 $load_node->((DC::Pod::find @path)[0]);
2145 $win->show; 2201 $win->show;
2146 }; 2202 };
2147 2203
2148 $win 2204 $HELP_WINDOW = $win;
2149}
2150
2151sub open_string_query {
2152 my ($title, $cb, $txt, $tooltip) = @_;
2153 my $dialog = new DC::UI::Toplevel
2154 x => "center",
2155 y => "center",
2156 z => 50,
2157 force_w => $WIDTH * 4/5,
2158 title => $title;
2159
2160 $dialog->add (
2161 my $e = new DC::UI::Entry
2162 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2163 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2164 tooltip => $tooltip
2165 );
2166
2167 $e->grab_focus;
2168 $e->set_text ($txt) if $txt;
2169 $dialog->show;
2170} 2205}
2171 2206
2172sub open_quit_dialog { 2207sub open_quit_dialog {
2173 unless ($QUIT_DIALOG) { 2208 unless ($QUIT_DIALOG) {
2174 $QUIT_DIALOG = new DC::UI::Toplevel 2209 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2207 2242
2208 $QUIT_DIALOG->show; 2243 $QUIT_DIALOG->show;
2209 $QUIT_DIALOG->grab_focus; 2244 $QUIT_DIALOG->grab_focus;
2210} 2245}
2211 2246
2247sub make_menubar {
2248 $MENUFRAME = new DC::UI::Toplevel
2249 border => 0,
2250 force_x => 0,
2251 force_y => 0,
2252 force_w => $::WIDTH,
2253 child => ($MENUBAR = new DC::UI::HBox),
2254 ;
2255
2256 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2257
2258 # 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
2259 make_gauge_window->show;
2260
2261# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2262# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2263
2264 make_playerbook;
2265
2266 $MENUPOPUP = DC::UI::Menu->new (items => [
2267 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2268 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2269 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2270 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2271 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2272 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2273 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2274 ["Quit…" , sub {
2275 if ($CONN) {
2276 open_quit_dialog;
2277 } else {
2278 EV::unloop EV::UNLOOP_ALL;
2279 }
2280 }],
2281 ]);
2282
2283 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2284 tooltip => "Shows the main menu",
2285 on_button_down => sub {
2286 my ($self, $ev) = @_;
2287 local $ev->{x} = 0;
2288 local $ev->{y} = 0;
2289 $MENUPOPUP->popup ($ev);
2290 },
2291 );
2292
2293 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2294 padding_x => 6,
2295 padding_y => 3,
2296 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2297 template => " Exp: 888,888,888,888 (lvl 188) ",
2298 );
2299
2300 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2301 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2302 . "will automatically pick up items as defined by your item pickup settings "
2303 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2304 . "disable autopickup by disabling this checkbox.",
2305 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2306 on_changed => sub {
2307 my ($self, $value) = @_;
2308 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2309 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2310 $CONN->send_pickup ($CFG->{pickup})
2311 if $CONN;
2312 },
2313 );
2314
2315 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2316 c_rescale => 1,
2317 padding_x => 6,
2318 padding_y => 3,
2319 force_w => $::WIDTH * 0.2,
2320 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2321 template => "two handed weapons 99%",
2322 );
2323
2324 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2325 expand => 1,
2326 align => 1, can_hover => 1, can_events => 1,
2327 text => "Range and Combat Slots",
2328 tooltip => "#stat_ranged",
2329 );
2330
2331 $MENUFRAME->show;
2332}
2333
2334sub open_string_query {
2335 my ($title, $cb, $txt, $tooltip) = @_;
2336 my $dialog = new DC::UI::Toplevel
2337 x => "center",
2338 y => "center",
2339 z => 50,
2340 force_w => $WIDTH * 4/5,
2341 title => $title;
2342
2343 $dialog->add (
2344 my $e = new DC::UI::Entry
2345 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2346 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2347 tooltip => $tooltip
2348 );
2349
2350 $e->grab_focus;
2351 $e->set_text ($txt) if $txt;
2352 $dialog->show;
2353}
2354
2212sub show_tip_of_the_day { 2355sub show_tip_of_the_day {
2213 # find all tips 2356 # find all tips
2214 my @tod = DC::Pod::find tip_of_the_day => "*"; 2357 my @tod = DC::Pod::find tip_of_the_day => "*";
2215 2358
2216 DC::DB::get state => "tip_of_the_day", sub { 2359 DC::DB::get state => "tip_of_the_day", sub {
… …
2355 2498
2356 (new DC::UI::Frame 2499 (new DC::UI::Frame
2357 bg => [0, 0, 0, 0.4], 2500 bg => [0, 0, 0, 0.4],
2358 force_x => 0, 2501 force_x => 0,
2359 force_y => "max", 2502 force_y => "max",
2360 child => (my $LR = new DC::UI::VBox), 2503 child => (my $LL = new DC::UI::VBox),
2361 )->show; 2504 )->show;
2362 2505
2363 $LR->add ($STATUSBOX); 2506 $LL->add ($STATUSBOX);
2364 $LR->add ($MODBOX); 2507 $LL->add ($MODBOX);
2365 $LR->add (new DC::UI::Label 2508 $LL->add (new DC::UI::Label
2366 align => 0, 2509 align => 0,
2367 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2510 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2368 fontsize => 0.5, 2511 fontsize => 0.5,
2369 fg => [1, 1, 0, 0.7], 2512 fg => [1, 1, 0, 0.7],
2370 ); 2513 );
2371 2514
2372 DC::UI::Toplevel->new ( 2515 DC::UI::Toplevel->new (
2373 title => "Minimap", 2516 title => "Minimap",
2374 name => "mapmap", 2517 name => "mapmap",
2375 x => 0, 2518 x => 0,
2376 y => $FONTSIZE + 8, 2519 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2377 border_bg => [1, 1, 1, 192/255], 2520 border_bg => [1, 1, 1, 192/255],
2378 bg => [1, 1, 1, 0], 2521 bg => [1, 1, 1, 0],
2379 child => ($MAPMAP = new DC::MapWidget::MapMap 2522 child => ($MAPMAP = new DC::MapWidget::MapMap
2380 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2523 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2381 ), 2524 ),
… …
2410 $METASERVER = metaserver_dialog; 2553 $METASERVER = metaserver_dialog;
2411 # the name is changed to not conflict with the older name as users could have hidden it 2554 # the name is changed to not conflict with the older name as users could have hidden it
2412 $MESSAGE_WINDOW = new DC::UI::Dockbar 2555 $MESSAGE_WINDOW = new DC::UI::Dockbar
2413 name => "message_window2", 2556 name => "message_window2",
2414 title => 'Messages', 2557 title => 'Messages',
2558 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2415 force_w => $::WIDTH * 0.6, 2559 force_w => $::WIDTH * 0.6,
2416 force_h => $::HEIGHT * 0.25, 2560 force_h => $::HEIGHT * 0.25,
2417 ; 2561 ;
2418 2562
2419 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2563 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2439 . "After pressing the combo the binding will be saved automatically and the " 2583 . "After pressing the combo the binding will be saved automatically and the "
2440 . "binding editor closes"); 2584 . "binding editor closes");
2441 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2585 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2442 "Some debuggin' options. Do not ask."); 2586 "Some debuggin' options. Do not ask.");
2443 2587
2444 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2588 make_help_window;
2589 make_menubar;
2445 2590
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2447 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2448
2449# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2450# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2451
2452 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
2453
2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2455 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2456
2457 $BUTTONBAR->add (new DC::UI::Button
2458 text => "Save Config",
2459 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2460 on_activate => sub {
2461 $::CFG->{layout} = DC::UI::get_layout;
2462 DC::write_cfg;
2463 status "Configuration Saved";
2464 0
2465 },
2466 );
2467
2468 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2469 tooltip => "View Documentation");
2470
2471 $BUTTONBAR->add (new DC::UI::Button
2472 text => "Quit",
2473 tooltip => "Terminates the program",
2474 on_activate => sub {
2475 if ($CONN) {
2476 open_quit_dialog;
2477 } else {
2478 EV::unloop EV::UNLOOP_ALL;
2479 }
2480 0
2481 },
2482 );
2483
2484 $BUTTONBAR->show;
2485 $SETUP_DIALOG->show; 2591 $SETUP_DIALOG->show;
2486 $MESSAGE_WINDOW->show; 2592 $MESSAGE_WINDOW->show;
2487 } 2593 }
2488 2594
2489 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2595 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2596 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2491 2597
2492 $CAVEAT_LABEL->set_text ("None :)"); 2598 $CAVEAT_LABEL->set_text ("None :)");
2599 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2600 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2601 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2602 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2495 2603
2496 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2604 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2497} 2605}
… …
2525my $want_refresh = EV::prepare_ns \&force_refresh; 2633my $want_refresh = EV::prepare_ns \&force_refresh;
2526 2634
2527my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2635my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2528 $NOW = EV::now; 2636 $NOW = EV::now;
2529 2637
2530 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2638 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2531 for DC::poll_events; 2639 for DC::poll_events;
2532 2640
2533 if (%animate_object) { 2641 if (%animate_object) {
2534 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2642 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2535 $WANT_REFRESH = 1; 2643 $WANT_REFRESH = 1;
… …
2547sub animation_stop { 2655sub animation_stop {
2548 my ($widget) = @_; 2656 my ($widget) = @_;
2549 delete $animate_object{$widget}; 2657 delete $animate_object{$widget};
2550} 2658}
2551 2659
2552%SDL_CB = (
2553 DC::SDL_QUIT => sub { 2660$SDL_CB[DC::SDL_QUIT] = sub {
2554 crash "SDL_QUIT"; 2661 crash "SDL_QUIT";
2555 EV::unloop EV::UNLOOP_ALL; 2662 EV::unloop EV::UNLOOP_ALL;
2556 }, 2663};
2557 DC::SDL_VIDEORESIZE => sub { 2664$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2558 },
2559 DC::SDL_VIDEOEXPOSE => sub { 2665$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2560 DC::UI::full_refresh; 2666 DC::UI::full_refresh;
2561 }, 2667};
2562 DC::SDL_ACTIVEEVENT => sub { 2668$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2563# not useful, as APPACTIVE includes only iconified state, not unmapped 2669# not useful, as APPACTIVE includes only iconified state, not unmapped
2564# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2670# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2565# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2671# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2566# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2672# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2567# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2673# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2568# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2674# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2569 }, 2675};
2570 DC::SDL_KEYDOWN => sub { 2676$SDL_CB[DC::SDL_KEYDOWN] = sub {
2571 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2677 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2572 # alt-enter 2678 # alt-enter
2573 video_shutdown; 2679 video_shutdown;
2574 $FULLSCREEN_ENABLE->toggle; 2680 $FULLSCREEN_ENABLE->toggle;
2575 video_init; 2681 video_init;
2576 } else { 2682 } else {
2577 &DC::UI::feed_sdl_key_down_event; 2683 &DC::UI::feed_sdl_key_down_event;
2578 } 2684 }
2579 update_modbox; 2685 update_modbox;
2580 }, 2686};
2581 DC::SDL_KEYUP => sub { 2687$SDL_CB[DC::SDL_KEYUP] = sub {
2582 &DC::UI::feed_sdl_key_up_event; 2688 &DC::UI::feed_sdl_key_up_event;
2583 update_modbox; 2689 update_modbox;
2584 }, 2690};
2585 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2691$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2586 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2692$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2587 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2693$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2588 DC::SDL_USEREVENT => sub { 2694$SDL_CB[DC::SDL_USEREVENT] = sub {
2589 if ($_[0]{code} == 1) { 2695 if ($_[0]{code} == 1) {
2590 audio_channel_finished $_[0]{data1}; 2696 audio_channel_finished $_[0]{data1};
2591 } elsif ($_[0]{code} == 0) { 2697 } elsif ($_[0]{code} == 0) {
2592 audio_music_finished; 2698 audio_music_finished;
2593 }
2594 }, 2699 }
2595); 2700};
2596 2701
2597############################################################################# 2702#############################################################################
2598 2703
2599$SIG{INT} = $SIG{TERM} = sub { 2704$SIG{INT} = $SIG{TERM} = sub {
2600 EV::unloop; 2705 EV::unloop;
2601 #d# TODO calling exit here hangs the process in some futex 2706 #d# TODO calling exit here hangs the process in some futex
2602}; 2707};
2603 2708
2604# due to mac os x + sdl combined briandamage, we need this contortion 2709# due to mac os x + sdl combined braindamage, we need this contortion
2605sub main { 2710sub main {
2606 { 2711 {
2607 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2712 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2608 2713
2609 if (-e "$Deliantra::VARDIR/client.cf") { 2714 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2626 DC::DB::open_db; 2731 DC::DB::open_db;
2627 2732
2628 DC::UI::set_layout ($::CFG->{layout}); 2733 DC::UI::set_layout ($::CFG->{layout});
2629 2734
2630 my %DEF_CFG = ( 2735 my %DEF_CFG = (
2736 config_autosave => 1,
2631 sdl_mode => undef, 2737 sdl_mode => undef,
2632 fullscreen => 1, 2738 fullscreen => 1,
2633 fast => 0, 2739 fast => 0,
2634 force_opengl11 => undef, 2740 force_opengl11 => undef,
2635 disable_alpha => 0, 2741 disable_alpha => 0,
2636 smooth_movement => 1, 2742 smooth_movement => 1,
2743 smooth_transitions => 1,
2637 texture_compression => 1, 2744 texture_compression => 1,
2638 map_scale => 1, 2745 map_scale => 1,
2639 fow_enable => 1, 2746 fow_enable => 1,
2640 fow_intensity => 0, 2747 fow_intensity => 0,
2748 fow_texture => 0,
2641 map_smoothing => 1, 2749 map_smoothing => 1,
2642 gui_fontsize => 1, 2750 gui_fontsize => 1,
2643 log_fontsize => 0.7, 2751 log_fontsize => 0.7,
2644 gauge_fontsize => 1, 2752 gauge_fontsize => 1,
2645 gauge_size => 0.35, 2753 gauge_size => 0.35,
… …
2653 effects_enable => 1, 2761 effects_enable => 1,
2654 effects_volume => 1, 2762 effects_volume => 1,
2655 bgm_enable => 1, 2763 bgm_enable => 1,
2656 bgm_volume => 0.5, 2764 bgm_volume => 0.5,
2657 output_rate => "", 2765 output_rate => "",
2658 pickup => 0, 2766 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2659 inv_sort => "mtime", 2767 inv_sort => "mtime",
2660 default => "profile", # default profile 2768 default => "profile", # default profile
2661 show_tips => 1, 2769 show_tips => 1,
2662 logview_max_par => 1000, 2770 logview_max_par => 1000,
2663 shift_fire_stop => 0, 2771 shift_fire_stop => 0,
2664 uitheme => "wood", 2772 uitheme => "wood",
2773 map_shift_x => -24, # arbitrary
2774 map_shift_y => +24, # arbitrary
2665 ); 2775 );
2666 2776
2667 while (my ($k, $v) = each %DEF_CFG) { 2777 while (my ($k, $v) = each %DEF_CFG) {
2668 $CFG->{$k} = $v unless exists $CFG->{$k}; 2778 $CFG->{$k} = $v unless exists $CFG->{$k};
2669 } 2779 }
… …
2683 } 2793 }
2684 } 2794 }
2685 2795
2686 sdl_init; 2796 sdl_init;
2687 2797
2798 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2799 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2800
2688 { 2801 {
2689 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2802 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2690 DejaVuSans.ttf 2803 DejaVuSans.ttf
2691 DejaVuSansMono.ttf 2804 DejaVuSansMono.ttf
2692 DejaVuSans-Bold.ttf 2805 DejaVuSans-Bold.ttf
2693 DejaVuSansMono-Bold.ttf 2806 DejaVuSansMono-Bold.ttf
2694 DejaVuSans-Oblique.ttf 2807 DejaVuSans-Oblique.ttf
2695 DejaVuSansMono-Oblique.ttf 2808 DejaVuSansMono-Oblique.ttf
2696 DejaVuSans-BoldOblique.ttf 2809 DejaVuSans-BoldOblique.ttf
2697 DejaVuSansMono-BoldOblique.ttf 2810 DejaVuSansMono-BoldOblique.ttf
2811 mona.ttf
2698 ); 2812 );
2699 2813
2700 DC::add_font $_ for @fonts; 2814 DC::add_font $_ for @fonts;
2701 2815
2702 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2816 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2732 }; 2846 };
2733 2847
2734 delete $SIG{__DIE__}; 2848 delete $SIG{__DIE__};
2735 EV::loop; 2849 EV::loop;
2736 2850
2851 DC::write_cfg if $CFG->{config_autosave};
2852
2737#video_shutdown; 2853 #video_shutdown;
2738#audio_shutdown; 2854 #audio_shutdown;
2855
2739 DC::OpenGL::quit; 2856 DC::OpenGL::quit;
2740 DC::SDL_Quit; 2857 DC::SDL_Quit;
2741 DC::DB::Server::stop; 2858 DC::DB::Server::stop;
2742} 2859}
2743 2860

Diff Legend

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