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.79 by root, Fri Dec 19 22:06:53 2008 UTC vs.
Revision 1.98 by root, Mon Dec 21 03:30:23 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;
… …
125 128
126$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
127$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
128 131
129$EV::DIED = sub { 132$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1; 133 crash "CRASH/EV::DIED: $@" => 0;
131 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
132}; 135};
133 136
134my $MAX_FPS = 60; 137my $MAX_FPS = 60;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
135 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;
… …
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;
… …
215# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 225*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
219 227
228 warn $msg;
229
220 return unless $CONN; 230 return unless $CONN;
221 231
222 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
223 or return; 233 or return;
224 234
… …
234 244
235 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 247 if $backtrace;
238}; 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}
239 260
240############################################################################# 261#############################################################################
241 262
242sub status { 263sub status {
243 $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]);
… …
325 or return; 346 or return;
326 347
327 $meta->{data} 348 $meta->{data}
328 or return; 349 or return;
329 350
330 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
332 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
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 355 &audio_music_push ($face);
335 } 356 }
336 } else { 357 } else {
337 # fetch from database 358 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
341 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;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
344 365
345 audio_sound_push ($face); 366 audio_sound_push ($face);
346 }; 367 };
… …
393 414
394 audio_music_update_volume; 415 audio_music_update_volume;
395 416
396 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
397 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
398 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
399 ? 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
400 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
401 425
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 428
405 my $NOW = time; 429 my $NOW = time;
406 430
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
526 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
527 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
528 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
529 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
530 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
531 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
532 undef $SDL_MIXER; 558 undef $SDL_MIXER;
533} 559}
534 560
535############################################################################# 561#############################################################################
… …
766} 792}
767 793
768sub dc_connect { 794sub dc_connect {
769 my ($host, $port) = @_; 795 my ($host, $port) = @_;
770 796
771 my $mapw = List::Util::min 48, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 797 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
772 my $maph = List::Util::min 48, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32; 798 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
773 799
774 $CONN = 800 $CONN =
775 new DC::Protocol 801 new DC::Protocol
776 host => $host, 802 host => $host,
777 port => $port, 803 port => $port,
… …
794 820
795 on_connect => sub { 821 on_connect => sub {
796 if ($_[0]) { 822 if ($_[0]) {
797 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
798 824
799 status "login successful"; 825 status "successfully connected to the server";
800 } else { 826 } else {
801 undef $CONN; 827 undef $CONN;
802 status "unable to connect: $!"; 828 status "unable to connect: $!";
803 stop_game(); 829 stop_game();
804 } 830 }
… …
806 ; 832 ;
807} 833}
808 834
809sub start_game { 835sub start_game {
810 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.";
811 841
812 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816 844
817 $MAP = new DC::Map; 845 $MAP = new DC::Map;
818 846
819 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 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) {
824 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
826 } 858 }
827 859
828 dc_connect $host, $port; 860 dc_connect $host, $port;
829 }; 861 };
830 } else { 862 } else {
… …
897 929
898 $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");
899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
900 932
901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
934 c_rescale => 1,
902 force_w => $WIDTH * 0.1, expand => 1, 935 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ], 936 range => [ ($CFG->{sdl_mode}) x 3 ],
904 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
905 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
906 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
… …
934 ); 967 );
935 968
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox 970 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha}, 971 state => $CFG->{disable_alpha},
939 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 972 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these " 973 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall " 974 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option " 975 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! " 976 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>", 977 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
… …
997 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1030 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
998 . "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, "
999 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1001 ); 1034 );
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 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1002 1045
1003 $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");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
… …
1230} 1273}
1231 1274
1232sub make_gauge_window { 1275sub make_gauge_window {
1233 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1276 my $gh = int $HEIGHT * $CFG->{gauge_size};
1234 1277
1235 my $win = new DC::UI::Frame ( 1278 $GAUGES->{win} = my $win = new DC::UI::Frame (
1236 force_x => 0, 1279 force_x => 0,
1237 force_y => "max", 1280 force_y => "max",
1238 force_w => $WIDTH, 1281 force_w => $WIDTH,
1239 force_h => $gh, 1282 force_h => $gh,
1240 ); 1283 );
… …
1256 (new DC::UI::Empty expand => 1), 1299 (new DC::UI::Empty expand => 1),
1257 (my $hb = new DC::UI::HBox), 1300 (my $hb = new DC::UI::HBox),
1258 ], 1301 ],
1259 ); 1302 );
1260 1303
1261 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1304 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1262 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1305 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1263 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1306 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1264 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1307 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1265
1266 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1267 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1268 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1269 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1270
1271 $GAUGES = {
1272 exp => $exp, prg => $prg, sklprg => $sklprg,
1273 win => $win, range => $rng,
1274 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1275 };
1276 1308
1277 &set_gauge_window_fontsize; 1309 &set_gauge_window_fontsize;
1278 1310
1279 $win 1311 $win
1280} 1312}
… …
1622 ); 1654 );
1623 1655
1624 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1656 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1625 $table->add_at (1, 4, new DC::UI::Entry 1657 $table->add_at (1, 4, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{user}, 1658 text => $CFG->{profile}{default}{user},
1627 tooltip => "The name of your character on the server.", 1659 tooltip => "The name of your character on the server. The name is case-sensitive!",
1628 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1660 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1629 ); 1661 );
1630 1662
1631 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1663 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1632 $table->add_at (1, 5, new DC::UI::Entry 1664 $table->add_at (1, 5, new DC::UI::Entry
… …
1734 1766
1735 my $row = 0; 1767 my $row = 0;
1736 1768
1737 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1769 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1738 $table->add_at (1, $row++, new DC::UI::CheckBox 1770 $table->add_at (1, $row++, new DC::UI::CheckBox
1771 c_colspan => 2,
1739 state => $CFG->{show_tips}, 1772 state => $CFG->{show_tips},
1740 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1773 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1741 on_changed => sub { 1774 on_changed => sub {
1742 my ($self, $value) = @_; 1775 my ($self, $value) = @_;
1743 $CFG->{show_tips} = $value; 1776 $CFG->{show_tips} = $value;
… …
1745 } 1778 }
1746 ); 1779 );
1747 1780
1748 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1749 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1782 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1783 c_colspan => 2,
1750 text => $CFG->{logview_max_par}, 1784 text => $CFG->{logview_max_par},
1751 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1785 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1752 . "sends more messages than this number, older messages get removed to save memory and " 1786 . "sends more messages than this number, older messages get removed to save memory and "
1753 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1787 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1754 on_changed => sub { 1788 on_changed => sub {
… …
1756 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1790 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1757 0 1791 0
1758 }, 1792 },
1759 ); 1793 );
1760 1794
1795 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1796 $table->add_at (1, $row, new DC::UI::CheckBox
1797 state => $CFG->{config_autosave},
1798 tooltip => "Normally, configuration settings and the user interface layout "
1799 . "are saved on client exit. You can disable this behaviour by "
1800 . "unchecking this checkbox.",
1801 on_changed => sub {
1802 my ($self, $value) = @_;
1803 $CFG->{config_autosave} = $value;
1804 0
1805 }
1806 );
1807 $table->add_at (2, $row++, new DC::UI::Button
1808 text => "Save Now",
1809 tooltip => "Use this to manually save configuration and UI layout when "
1810 . "autosave is disabled.",
1811 on_activate => sub {
1812 DC::write_cfg;
1813 0
1814 }
1815 );
1816
1761 $table 1817 $table
1762} 1818}
1763 1819
1764sub autopickup_setup { 1820sub autopickup_setup {
1765 my $r = new DC::UI::ScrolledWindow ( 1821 my $r = new DC::UI::ScrolledWindow (
… …
1771 col_expand => [0, 1, 0, 1], 1827 col_expand => [0, 1, 0, 1],
1772 ); 1828 );
1773 1829
1774 for ( 1830 for (
1775 ["General", 0, 0, 1831 ["General", 0, 0,
1776 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1777 ["Inhibit autopickup" => PICKUP_INHIBIT], 1832# ["Inhibit autopickup" => PICKUP_INHIBIT],
1778 ["Stop before pickup" => PICKUP_STOP], 1833 ["Stop before pickup" => PICKUP_STOP],
1779 ["Debug autopickup" => PICKUP_DEBUG], 1834 ["Debug autopickup" => PICKUP_DEBUG],
1780 ], 1835 ],
1781 ["Weapons", 0, 6, 1836 ["Weapons", 0, 6,
1782 ["All weapons" => PICKUP_ALLWEAPON], 1837 ["All weapons" => PICKUP_ALLWEAPON],
… …
1830 $::CFG->{pickup} |= $mask; 1885 $::CFG->{pickup} |= $mask;
1831 } else { 1886 } else {
1832 $::CFG->{pickup} &= ~$mask; 1887 $::CFG->{pickup} &= ~$mask;
1833 } 1888 }
1834 1889
1835 $::CONN->send_command ("pickup $::CFG->{pickup}") 1890 $::CONN->send_pickup ($::CFG->{pickup})
1836 if defined $::CONN; 1891 if defined $::CONN;
1837 1892
1838 0 1893 0
1839 }); 1894 });
1840 1895
… …
1857 }); 1912 });
1858 1913
1859 $table->add_at (3, 18, new DC::UI::Button 1914 $table->add_at (3, 18, new DC::UI::Button
1860 text => "set", 1915 text => "set",
1861 on_activate => sub { 1916 on_activate => sub {
1862 $::CONN->send_command ("pickup $::CFG->{pickup}") 1917 $::CONN->send_pickup ($::CFG->{pickup})
1863 if defined $::CONN; 1918 if defined $::CONN;
1864 0 1919 0
1865 }); 1920 });
1866 1921
1867 $r 1922 $r
… …
1980 $PL_NOTEBOOK->set_current_page ($widget); 2035 $PL_NOTEBOOK->set_current_page ($widget);
1981 $PL_WINDOW->show; 2036 $PL_WINDOW->show;
1982 } 2037 }
1983} 2038}
1984 2039
1985sub player_window { 2040sub make_playerbook {
1986 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2041 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1987 x => "center", 2042 x => "center",
1988 y => "center", 2043 y => "center",
1989 force_w => $WIDTH * 9/10, 2044 force_w => $WIDTH * 9/10,
1990 force_h => $HEIGHT * 9/10, 2045 force_h => $HEIGHT * 9/10,
… …
2024 "License, Author and Source info for media sent by the server."); 2079 "License, Author and Source info for media sent by the server.");
2025 2080
2026 $ntb->set_current_page ($INVENTORY_PAGE); 2081 $ntb->set_current_page ($INVENTORY_PAGE);
2027 2082
2028 $plwin->add ($ntb); 2083 $plwin->add ($ntb);
2029 $plwin
2030} 2084}
2031 2085
2032sub keyboard_setup { 2086sub keyboard_setup {
2033 DC::Macro::keyboard_setup 2087 DC::Macro::keyboard_setup
2034} 2088}
2035 2089
2036sub help_window { 2090sub make_help_window {
2037 my $win = new DC::UI::Toplevel 2091 my $win = new DC::UI::Toplevel
2038 x => 'center', 2092 x => 'center',
2039 y => 'center', 2093 y => 'center',
2040 z => 4, 2094 z => 4,
2041 name => 'doc_browser', 2095 name => 'doc_browser',
… …
2130 2184
2131 $load_node->((DC::Pod::find @path)[0]); 2185 $load_node->((DC::Pod::find @path)[0]);
2132 $win->show; 2186 $win->show;
2133 }; 2187 };
2134 2188
2135 $win 2189 $HELP_WINDOW = $win;
2136}
2137
2138sub open_string_query {
2139 my ($title, $cb, $txt, $tooltip) = @_;
2140 my $dialog = new DC::UI::Toplevel
2141 x => "center",
2142 y => "center",
2143 z => 50,
2144 force_w => $WIDTH * 4/5,
2145 title => $title;
2146
2147 $dialog->add (
2148 my $e = new DC::UI::Entry
2149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2151 tooltip => $tooltip
2152 );
2153
2154 $e->grab_focus;
2155 $e->set_text ($txt) if $txt;
2156 $dialog->show;
2157} 2190}
2158 2191
2159sub open_quit_dialog { 2192sub open_quit_dialog {
2160 unless ($QUIT_DIALOG) { 2193 unless ($QUIT_DIALOG) {
2161 $QUIT_DIALOG = new DC::UI::Toplevel 2194 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2194 2227
2195 $QUIT_DIALOG->show; 2228 $QUIT_DIALOG->show;
2196 $QUIT_DIALOG->grab_focus; 2229 $QUIT_DIALOG->grab_focus;
2197} 2230}
2198 2231
2232sub make_menubar {
2233 $MENUFRAME = new DC::UI::Toplevel
2234 border => 0,
2235 force_x => 0,
2236 force_y => 0,
2237 force_w => $::WIDTH,
2238 child => ($MENUBAR = new DC::UI::HBox),
2239 ;
2240
2241 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2242
2243 # 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
2244 make_gauge_window->show;
2245
2246# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2247# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2248
2249 make_playerbook;
2250
2251 $MENUPOPUP = DC::UI::Menu->new (items => [
2252 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2253 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2254 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2255 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2256 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2257 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2258 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2259 ["Quit…" , sub {
2260 if ($CONN) {
2261 open_quit_dialog;
2262 } else {
2263 EV::unloop EV::UNLOOP_ALL;
2264 }
2265 }],
2266 ]);
2267
2268 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2269 tooltip => "Shows the main menu",
2270 on_button_down => sub {
2271 my ($self, $ev) = @_;
2272 local $ev->{x} = 0;
2273 local $ev->{y} = 0;
2274 $MENUPOPUP->popup ($ev);
2275 },
2276 );
2277
2278 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2279 padding_x => 6,
2280 padding_y => 3,
2281 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2282 template => " Exp: 888,888,888,888 (lvl 188) ",
2283 );
2284
2285 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2286 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2287 . "will automatically pick up items as defined by your item pickup settings "
2288 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2289 . "disable autopickup by disabling this checkbox.",
2290 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2291 on_changed => sub {
2292 my ($self, $value) = @_;
2293 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2294 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2295 $CONN->send_pickup ($CFG->{pickup})
2296 if $CONN;
2297 },
2298 );
2299
2300 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2301 c_rescale => 1,
2302 padding_x => 6,
2303 padding_y => 3,
2304 force_w => $::WIDTH * 0.2,
2305 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2306 template => "two handed weapons 99%",
2307 );
2308
2309 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2310 expand => 1,
2311 align => 1, can_hover => 1, can_events => 1,
2312 text => "Range and Combat Slots",
2313 tooltip => "#stat_ranged",
2314 );
2315
2316 $MENUFRAME->show;
2317}
2318
2319sub open_string_query {
2320 my ($title, $cb, $txt, $tooltip) = @_;
2321 my $dialog = new DC::UI::Toplevel
2322 x => "center",
2323 y => "center",
2324 z => 50,
2325 force_w => $WIDTH * 4/5,
2326 title => $title;
2327
2328 $dialog->add (
2329 my $e = new DC::UI::Entry
2330 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2331 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2332 tooltip => $tooltip
2333 );
2334
2335 $e->grab_focus;
2336 $e->set_text ($txt) if $txt;
2337 $dialog->show;
2338}
2339
2199sub show_tip_of_the_day { 2340sub show_tip_of_the_day {
2200 # find all tips 2341 # find all tips
2201 my @tod = DC::Pod::find tip_of_the_day => "*"; 2342 my @tod = DC::Pod::find tip_of_the_day => "*";
2202 2343
2203 DC::DB::get state => "tip_of_the_day", sub { 2344 DC::DB::get state => "tip_of_the_day", sub {
… …
2342 2483
2343 (new DC::UI::Frame 2484 (new DC::UI::Frame
2344 bg => [0, 0, 0, 0.4], 2485 bg => [0, 0, 0, 0.4],
2345 force_x => 0, 2486 force_x => 0,
2346 force_y => "max", 2487 force_y => "max",
2347 child => (my $LR = new DC::UI::VBox), 2488 child => (my $LL = new DC::UI::VBox),
2348 )->show; 2489 )->show;
2349 2490
2350 $LR->add ($STATUSBOX); 2491 $LL->add ($STATUSBOX);
2351 $LR->add ($MODBOX); 2492 $LL->add ($MODBOX);
2352 $LR->add (new DC::UI::Label 2493 $LL->add (new DC::UI::Label
2353 align => 0, 2494 align => 0,
2354 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2495 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2355 fontsize => 0.5, 2496 fontsize => 0.5,
2356 fg => [1, 1, 0, 0.7], 2497 fg => [1, 1, 0, 0.7],
2357 ); 2498 );
2358 2499
2359 DC::UI::Toplevel->new ( 2500 DC::UI::Toplevel->new (
2360 title => "Minimap", 2501 title => "Minimap",
2361 name => "mapmap", 2502 name => "mapmap",
2362 x => 0, 2503 x => 0,
2363 y => $FONTSIZE + 8, 2504 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2364 border_bg => [1, 1, 1, 192/255], 2505 border_bg => [1, 1, 1, 192/255],
2365 bg => [1, 1, 1, 0], 2506 bg => [1, 1, 1, 0],
2366 child => ($MAPMAP = new DC::MapWidget::MapMap 2507 child => ($MAPMAP = new DC::MapWidget::MapMap
2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2508 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2368 ), 2509 ),
… …
2397 $METASERVER = metaserver_dialog; 2538 $METASERVER = metaserver_dialog;
2398 # the name is changed to not conflict with the older name as users could have hidden it 2539 # the name is changed to not conflict with the older name as users could have hidden it
2399 $MESSAGE_WINDOW = new DC::UI::Dockbar 2540 $MESSAGE_WINDOW = new DC::UI::Dockbar
2400 name => "message_window2", 2541 name => "message_window2",
2401 title => 'Messages', 2542 title => 'Messages',
2543 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2402 force_w => $::WIDTH * 0.6, 2544 force_w => $::WIDTH * 0.6,
2403 force_h => $::HEIGHT * 0.25, 2545 force_h => $::HEIGHT * 0.25,
2404 ; 2546 ;
2405 2547
2406 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2548 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2426 . "After pressing the combo the binding will be saved automatically and the " 2568 . "After pressing the combo the binding will be saved automatically and the "
2427 . "binding editor closes"); 2569 . "binding editor closes");
2428 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2570 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2429 "Some debuggin' options. Do not ask."); 2571 "Some debuggin' options. Do not ask.");
2430 2572
2431 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2573 make_help_window;
2574 make_menubar;
2432 2575
2433 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2434 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2435
2436# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2437# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2438
2439 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
2440
2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2442 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2443
2444 $BUTTONBAR->add (new DC::UI::Button
2445 text => "Save Config",
2446 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2447 on_activate => sub {
2448 $::CFG->{layout} = DC::UI::get_layout;
2449 DC::write_cfg;
2450 status "Configuration Saved";
2451 0
2452 },
2453 );
2454
2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2456 tooltip => "View Documentation");
2457
2458 $BUTTONBAR->add (new DC::UI::Button
2459 text => "Quit",
2460 tooltip => "Terminates the program",
2461 on_activate => sub {
2462 if ($CONN) {
2463 open_quit_dialog;
2464 } else {
2465 EV::unloop EV::UNLOOP_ALL;
2466 }
2467 0
2468 },
2469 );
2470
2471 $BUTTONBAR->show;
2472 $SETUP_DIALOG->show; 2576 $SETUP_DIALOG->show;
2473 $MESSAGE_WINDOW->show; 2577 $MESSAGE_WINDOW->show;
2474 } 2578 }
2475 2579
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2580 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2581 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478 2582
2479 $CAVEAT_LABEL->set_text ("None :)"); 2583 $CAVEAT_LABEL->set_text ("None :)");
2584 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2585 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2586 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2587 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482 2588
2483 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2589 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2484} 2590}
… …
2512my $want_refresh = EV::prepare_ns \&force_refresh; 2618my $want_refresh = EV::prepare_ns \&force_refresh;
2513 2619
2514my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2620my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2515 $NOW = EV::now; 2621 $NOW = EV::now;
2516 2622
2517 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2623 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2518 for DC::poll_events; 2624 for DC::poll_events;
2519 2625
2520 if (%animate_object) { 2626 if (%animate_object) {
2521 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2627 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2522 $WANT_REFRESH = 1; 2628 $WANT_REFRESH = 1;
… …
2534sub animation_stop { 2640sub animation_stop {
2535 my ($widget) = @_; 2641 my ($widget) = @_;
2536 delete $animate_object{$widget}; 2642 delete $animate_object{$widget};
2537} 2643}
2538 2644
2539%SDL_CB = (
2540 DC::SDL_QUIT => sub { 2645$SDL_CB[DC::SDL_QUIT] = sub {
2541 crash "SDL_QUIT"; 2646 crash "SDL_QUIT";
2542 EV::unloop EV::UNLOOP_ALL; 2647 EV::unloop EV::UNLOOP_ALL;
2543 }, 2648};
2544 DC::SDL_VIDEORESIZE => sub { 2649$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2545 },
2546 DC::SDL_VIDEOEXPOSE => sub { 2650$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2547 DC::UI::full_refresh; 2651 DC::UI::full_refresh;
2548 }, 2652};
2549 DC::SDL_ACTIVEEVENT => sub { 2653$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2550# not useful, as APPACTIVE includes only iconified state, not unmapped 2654# not useful, as APPACTIVE includes only iconified state, not unmapped
2551# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2655# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2552# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2656# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2553# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2657# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2554# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2658# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2659# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2556 }, 2660};
2557 DC::SDL_KEYDOWN => sub { 2661$SDL_CB[DC::SDL_KEYDOWN] = sub {
2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2662 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2559 # alt-enter 2663 # alt-enter
2560 video_shutdown; 2664 video_shutdown;
2561 $FULLSCREEN_ENABLE->toggle; 2665 $FULLSCREEN_ENABLE->toggle;
2562 video_init; 2666 video_init;
2563 } else { 2667 } else {
2564 &DC::UI::feed_sdl_key_down_event; 2668 &DC::UI::feed_sdl_key_down_event;
2565 } 2669 }
2566 update_modbox; 2670 update_modbox;
2567 }, 2671};
2568 DC::SDL_KEYUP => sub { 2672$SDL_CB[DC::SDL_KEYUP] = sub {
2569 &DC::UI::feed_sdl_key_up_event; 2673 &DC::UI::feed_sdl_key_up_event;
2570 update_modbox; 2674 update_modbox;
2571 }, 2675};
2572 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2676$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2573 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2677$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2574 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2678$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2575 DC::SDL_USEREVENT => sub { 2679$SDL_CB[DC::SDL_USEREVENT] = sub {
2576 if ($_[0]{code} == 1) { 2680 if ($_[0]{code} == 1) {
2577 audio_channel_finished $_[0]{data1}; 2681 audio_channel_finished $_[0]{data1};
2578 } elsif ($_[0]{code} == 0) { 2682 } elsif ($_[0]{code} == 0) {
2579 audio_music_finished; 2683 audio_music_finished;
2580 }
2581 }, 2684 }
2582); 2685};
2583 2686
2584############################################################################# 2687#############################################################################
2585 2688
2586$SIG{INT} = $SIG{TERM} = sub { 2689$SIG{INT} = $SIG{TERM} = sub {
2587 EV::unloop; 2690 EV::unloop;
2588 #d# TODO calling exit here hangs the process in some futex 2691 #d# TODO calling exit here hangs the process in some futex
2589}; 2692};
2590 2693
2591# due to mac os x + sdl combined briandamage, we need this contortion 2694# due to mac os x + sdl combined braindamage, we need this contortion
2592sub main { 2695sub main {
2593 { 2696 {
2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2697 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2595 2698
2596 if (-e "$Deliantra::VARDIR/client.cf") { 2699 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2613 DC::DB::open_db; 2716 DC::DB::open_db;
2614 2717
2615 DC::UI::set_layout ($::CFG->{layout}); 2718 DC::UI::set_layout ($::CFG->{layout});
2616 2719
2617 my %DEF_CFG = ( 2720 my %DEF_CFG = (
2721 config_autosave => 1,
2618 sdl_mode => undef, 2722 sdl_mode => undef,
2619 fullscreen => 1, 2723 fullscreen => 1,
2620 fast => 0, 2724 fast => 0,
2621 force_opengl11 => undef, 2725 force_opengl11 => undef,
2622 disable_alpha => 0, 2726 disable_alpha => 0,
2623 smooth_movement => 1, 2727 smooth_movement => 1,
2728 smooth_transitions => 1,
2624 texture_compression => 1, 2729 texture_compression => 1,
2625 map_scale => 1, 2730 map_scale => 1,
2626 fow_enable => 1, 2731 fow_enable => 1,
2627 fow_intensity => 0, 2732 fow_intensity => 0,
2628 map_smoothing => 1, 2733 map_smoothing => 1,
… …
2640 effects_enable => 1, 2745 effects_enable => 1,
2641 effects_volume => 1, 2746 effects_volume => 1,
2642 bgm_enable => 1, 2747 bgm_enable => 1,
2643 bgm_volume => 0.5, 2748 bgm_volume => 0.5,
2644 output_rate => "", 2749 output_rate => "",
2645 pickup => 0, 2750 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2646 inv_sort => "mtime", 2751 inv_sort => "mtime",
2647 default => "profile", # default profile 2752 default => "profile", # default profile
2648 show_tips => 1, 2753 show_tips => 1,
2649 logview_max_par => 1000, 2754 logview_max_par => 1000,
2650 shift_fire_stop => 0, 2755 shift_fire_stop => 0,
2651 uitheme => "wood", 2756 uitheme => "wood",
2757 map_shift_x => -24, # arbitrary
2758 map_shift_y => +24, # arbitrary
2652 ); 2759 );
2653 2760
2654 while (my ($k, $v) = each %DEF_CFG) { 2761 while (my ($k, $v) = each %DEF_CFG) {
2655 $CFG->{$k} = $v unless exists $CFG->{$k}; 2762 $CFG->{$k} = $v unless exists $CFG->{$k};
2656 } 2763 }
… …
2670 } 2777 }
2671 } 2778 }
2672 2779
2673 sdl_init; 2780 sdl_init;
2674 2781
2782 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2783 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2784
2675 { 2785 {
2676 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2786 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2677 DejaVuSans.ttf 2787 DejaVuSans.ttf
2678 DejaVuSansMono.ttf 2788 DejaVuSansMono.ttf
2679 DejaVuSans-Bold.ttf 2789 DejaVuSans-Bold.ttf
2680 DejaVuSansMono-Bold.ttf 2790 DejaVuSansMono-Bold.ttf
2681 DejaVuSans-Oblique.ttf 2791 DejaVuSans-Oblique.ttf
2682 DejaVuSansMono-Oblique.ttf 2792 DejaVuSansMono-Oblique.ttf
2683 DejaVuSans-BoldOblique.ttf 2793 DejaVuSans-BoldOblique.ttf
2684 DejaVuSansMono-BoldOblique.ttf 2794 DejaVuSansMono-BoldOblique.ttf
2795 mona.ttf
2685 ); 2796 );
2686 2797
2687 DC::add_font $_ for @fonts; 2798 DC::add_font $_ for @fonts;
2688 2799
2689 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2800 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2719 }; 2830 };
2720 2831
2721 delete $SIG{__DIE__}; 2832 delete $SIG{__DIE__};
2722 EV::loop; 2833 EV::loop;
2723 2834
2835 DC::write_cfg if $CFG->{config_autosave};
2836
2724#video_shutdown; 2837 #video_shutdown;
2725#audio_shutdown; 2838 #audio_shutdown;
2839
2726 DC::OpenGL::quit; 2840 DC::OpenGL::quit;
2727 DC::SDL_Quit; 2841 DC::SDL_Quit;
2728 DC::DB::Server::stop; 2842 DC::DB::Server::stop;
2729} 2843}
2730 2844

Diff Legend

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