ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Main.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.1 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.20 by root, Thu Apr 5 04:38:43 2012 UTC

… …
17 die if $@; 17 die if $@;
18} 18}
19 19
20use common::sense; 20use common::sense;
21use Carp 'verbose'; 21use Carp 'verbose';
22use Cwd ();
23use Digest::MD5 ();
22use EV; 24use EV;
23BEGIN { *time = \&EV::time } 25BEGIN { *time = \&EV::time }
24 26
25use List::Util qw(max min); 27use List::Util qw(max min);
26 28
… …
31use AnyEvent::Socket (); 33use AnyEvent::Socket ();
32use AnyEvent::DNS (); 34use AnyEvent::DNS ();
33 35
34use Compress::LZF; 36use Compress::LZF;
35use JSON::XS; 37use JSON::XS;
38use Urlader;
36 39
37use DC; 40use DC;
38 41
39sub crash($;$) { 42sub crash($;$) {
40 # nop at compiletime 43 # nop at compiletime
41} 44}
42 45
43BEGIN { 46BEGIN {
44 $SIG{__DIE__} = sub { 47 $SIG{__DIE__} = sub {
45 return if $^S; 48 return if $^S; # quick reject
49
50 # return if there are any eval contexts in the call stack
51 for my $i (0..999) {
52 my ($sub, $is_require) = (caller $i)[3, 7]
53 or last;
54 return if $sub eq "(eval)" && !$is_require;
55 }
56
46 crash "CRASH/DIE: $_[0]" => 1; 57 crash "CRASH/DIE: $_[0]" => 1;
47 DC::fatal Carp::longmess "$_[0]"; 58 DC::fatal Carp::longmess "$_[0]";
48 } 59 }
49} 60}
50 61
51use DC::OpenGL (); 62use DC::OpenGL ();
63use DC::Audio ();
52use DC::Protocol; 64use DC::Protocol;
53use DC::DB; 65use DC::DB;
54use DC::UI; 66use DC::UI;
55use DC::UI::Canvas; 67use DC::UI::Canvas;
56use DC::UI::Inventory; 68use DC::UI::Inventory;
… …
133our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
134our $PL_WINDOW; 146our $PL_WINDOW;
135 147
136our $MUSIC_PLAYING_WIDGET; 148our $MUSIC_PLAYING_WIDGET;
137our $LICENSE_WIDGET; 149our $LICENSE_WIDGET;
150our $DOWNLOADS_WIDGET;
138 151
139our $PICKUP_PAGE; 152our $PICKUP_PAGE;
140our $INVENTORY_PAGE; 153our $INVENTORY_PAGE;
141our $STATS_PAGE; 154our $STATS_PAGE;
142our $SKILL_PAGE; 155our $SKILL_PAGE;
… …
185 AnyEvent::Util::fh_nonblocking $fh, 1; 198 AnyEvent::Util::fh_nonblocking $fh, 1;
186 199
187 $msg =~ s/\s+$//; 200 $msg =~ s/\s+$//;
188 201
189 # backtrace as second step, in case it crashes, too 202 # backtrace as second step, in case it crashes, too
190 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 203 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated"
191 if $backtrace; 204 if $backtrace;
192}; 205};
193 206
194sub clienterror($;$) { 207sub clienterror($;$) {
195 my ($msg, $backtrace) = @_; 208 my ($msg, $backtrace) = @_;
… …
197 warn $msg; 210 warn $msg;
198 211
199 return unless $CONN; 212 return unless $CONN;
200 213
201 $CONN->send_exti_msg (clientlog => $msg); 214 $CONN->send_exti_msg (clientlog => $msg);
202 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace; 215 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace;
203} 216}
204 217
205############################################################################# 218#############################################################################
206 219
207sub status { 220sub status {
… …
462 audio_music_push; 475 audio_music_push;
463} 476}
464 477
465sub audio_init { 478sub audio_init {
466 if ($CFG->{audio_enable}) { 479 if ($CFG->{audio_enable}) {
467 if (length $CFG->{audio_driver}) { 480 DC::Audio::init $CFG->{audio_driver};
468 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
469 DC::SDL_Init DC::SDL_INIT_AUDIO
470 and die "SDL::Init failed!\n";
471 } else {
472 DC::SDL_Init DC::SDL_INIT_AUDIO
473 and die "SDL::Init failed!\n";
474 }
475
476 $ENV{MIX_EFFECTSMAXSPEED} = 1;
477 $SDL_MIXER = !DC::Mix_OpenAudio
478 $CFG->{audio_hw_frequency},
479 DC::MIX_DEFAULT_FORMAT,
480 $CFG->{audio_hw_channels},
481 $CFG->{audio_hw_chunksize};
482 481
483 if ($SDL_MIXER) { 482 if ($SDL_MIXER) {
484 DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
485
486 audio_music_finished; 483 audio_music_finished;
487 } else { 484 } else {
488 status "Unable to open sound device: there will be no sound"; 485 status "Unable to open sound device: there will be no sound";
489 } 486 }
490 } else { 487 } else {
… …
512 509
513 DC::Mix_CloseAudio if $SDL_MIXER; 510 DC::Mix_CloseAudio if $SDL_MIXER;
514 undef $SDL_MIXER; 511 undef $SDL_MIXER;
515 512
516 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO; 513 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
514}
515
516#############################################################################
517# Over-the-air updates
518
519sub ota_update {
520 my ($face, $size, $md5) = @_;
521
522 my $coro = Coro::async_pool {
523 my $override = "$Urlader::EXE_DIR/override";
524
525 $MESSAGE_DIST->add_channel ({
526 id => "ota_update",
527 title => "Update",
528 tooltip => "<b>Software Update Log</b>",
529 });
530
531 $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." });
532
533 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777;
534
535 unless ($fh) {
536 $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
537 return;
538 }
539
540 $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." });
541
542 my $cv = AE::cv;
543 my $error;
544
545 $cv->begin (Coro::rouse_cb);
546 $CONN->ask_face (
547 $face,
548 -1000,
549 sub {
550 $STATUSBOX->add (
551 (sprintf "update download: %d/%d", $size - $_[1], $size),
552 pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1]
553 );
554
555 $cv->begin;
556 my $len = length $_[2];
557 IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub {
558 $error ||= $_[0] != $len;
559 $cv->end;
560 };
561 },
562 sub {
563 $cv->end;
564 },
565 );
566
567 Coro::rouse_wait;
568
569 $STATUSBOX->clr_group ("ota_update");
570
571 $error ||= Coro::AIO::aio_fsync $fh;
572 $error ||= Coro::AIO::aio_close $fh;
573
574 if ($error) {
575 $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." });
576 Coro::AIO::aio_unlink "$override.tmp";
577 return;
578 }
579
580 {
581 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
582
583 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
584
585 if ($fh) {
586 $error ||= Coro::AIO::aio_stat "$override.tmp";
587 $error ||= -s _ != $size;
588 Coro::AIO::aio_readahead $fh, 0, $size;
589
590 my $f_md5 = new Digest::MD5;
591 binmode $fh; # ugh :(
592 $f_md5->addfile ($fh);
593 $f_md5 = $f_md5->hexdigest;
594 $error ||= $md5 ne $f_md5;
595 }
596 }
597
598 if ($error) {
599 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
600 Coro::AIO::aio_unlink "$override.tmp";
601 return;
602 }
603
604 $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
605
606 if (Coro::AIO::aio_rename "$override.tmp", $override) {
607 $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." });
608 Coro::AIO::aio_unlink "$override.tmp";
609 }
610
611 $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
612 };
613
614 $CONN->{ota_update} = Guard::guard {
615 $coro->cancel;
616 };
617}
618
619sub ota_update_ask {
620 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
621
622 $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
623 x => "center",
624 y => "center",
625 z => 55,
626 force_w => $::WIDTH * 0.7,
627 force_h => $::HEIGHT * 0.7,
628 title => "Software update available",
629 child => my $vbox = new DC::UI::VBox,
630 ;
631
632 $vbox->add (new DC::UI::Label
633 ellipsise => 0,
634 text => "The server offers a software update, "
635 . "do you want to start downloading this update in the background?",
636 );
637
638 $vbox->add (new DC::UI::FancyFrame
639 expand => 1,
640 label => "Details",
641 child => (new DC::UI::TextScroller
642 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
643 par => [{
644 markup => "<tt>Old revision: $Urlader::EXE_VER\n"
645 . "New revision: $ver\n"
646 . "Download size: $size bytes</tt>\n\n"
647 . "Changes:\n\n"
648 . DC::asxml $changes
649 }],
650 ),
651 );
652
653 $vbox->add (my $hbox = new DC::UI::HBox);
654
655 $hbox->add (new DC::UI::Button
656 expand => 1,
657 text => "Not now",
658 on_activate => sub {
659 $dialog->destroy;
660 0
661 }
662 );
663 $hbox->add (new DC::UI::Button
664 expand => 1,
665 text => "Yes, start downloading",
666 on_activate => sub {
667 $dialog->destroy;
668 ota_update $face, $size, $md5;
669 0
670 },
671 );
672
673 $dialog->show;
674}
675
676sub ota_update_check {
677 return unless defined $Urlader::EXE_ID;
678
679 ::message { markup => "Checking for software update..." };
680
681 $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
682 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
683
684 if ($ok) {
685 if (defined $ver) {
686 ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." };
687 &ota_update_ask;
688 } else {
689 ::message { markup => "Server has no newer version." };
690 }
691 } else {
692 ::message { markup => "Server does not support software update." };
693 }
694
695# $self->register_face_handler ($exp_table, sub {
696# my ($face) = @_;
697
698# $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
699# $_->() for values %{ $self->{on_exp_update} || {} };
700# });
701
702 ()
703 });
517} 704}
518 705
519############################################################################# 706#############################################################################
520 707
521sub destroy_query_dialog { 708sub destroy_query_dialog {
… …
764 mapw => $mapw, 951 mapw => $mapw,
765 maph => $maph, 952 maph => $maph,
766 953
767 c_version => { 954 c_version => {
768 client => "deliantra", 955 client => "deliantra",
769 clientver => $DC::VERSION, 956 clientver => "$DC::VERSION$Urlader::EXE_VER",
770 gl_vendor => DC::OpenGL::gl_vendor, 957 gl_vendor => DC::OpenGL::gl_vendor,
771 gl_version => DC::OpenGL::gl_version, 958 gl_version => DC::OpenGL::gl_version,
772 }, 959 },
773 960
774 map_widget => $MAPWIDGET, 961 map_widget => $MAPWIDGET,
… …
782 }, 969 },
783 970
784 on_connect => sub { 971 on_connect => sub {
785 if ($_[0]) { 972 if ($_[0]) {
786 DC::lowdelay fileno $CONN->{fh}; 973 DC::lowdelay fileno $CONN->{fh};
974
975 ota_update_check;
787 976
788 status "successfully connected to the server"; 977 status "successfully connected to the server";
789 } else { 978 } else {
790 undef $CONN; 979 undef $CONN;
791 status "unable to connect: $!"; 980 status "unable to connect: $!";
… …
1131 text => $CFG->{audio_driver}, 1320 text => $CFG->{audio_driver},
1132 template => "dsound1234", 1321 template => "dsound1234",
1133 tooltip => "You can override the audio driver to use here. Leaving it empty will result " 1322 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1134 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific " 1323 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1135 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> " 1324 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1136 . "or other system-specific drivers. Selecting the wrong driver here will simply result" 1325 . "or other system-specific drivers. Selecting the wrong driver here will simply result "
1137 . "in no sound.", 1326 . "in no sound.",
1138 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 } 1327 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1139 ); 1328 );
1140 1329
1141 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1330 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
… …
1773 1962
1774 $vbox 1963 $vbox
1775} 1964}
1776 1965
1777sub client_setup { 1966sub client_setup {
1967 my $vbox = new DC::UI::VBox;
1968
1969 $vbox->add (my $top = new DC::UI::FancyFrame expand => 1, label => "Client Settings");
1970 $vbox->add (my $bot = new DC::UI::FancyFrame expand => 1, label => "Client Info");
1971
1972 {
1778 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1973 $top->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1779 1974
1780 my $row = 0; 1975 my $row = 0;
1781 1976
1782 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1783 $table->add_at (1, $row++, new DC::UI::CheckBox 1978 $table->add_at (1, $row++, new DC::UI::CheckBox
1784 c_colspan => 2, 1979 c_colspan => 2,
1785 state => $CFG->{show_tips}, 1980 state => $CFG->{show_tips},
1786 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1981 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1787 on_changed => sub { 1982 on_changed => sub {
1788 my ($self, $value) = @_; 1983 my ($self, $value) = @_;
1789 $CFG->{show_tips} = $value; 1984 $CFG->{show_tips} = $value;
1985 0
1790 0 1986 }
1791 } 1987 );
1792 );
1793 1988
1794 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1795 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1990 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1796 c_colspan => 2, 1991 c_colspan => 2,
1797 text => $CFG->{logview_max_par}, 1992 text => $CFG->{logview_max_par},
1798 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1993 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1799 . "sends more messages than this number, older messages get removed to save memory and " 1994 . "sends more messages than this number, older messages get removed to save memory and "
1800 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1995 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1801 on_changed => sub { 1996 on_changed => sub {
1802 my ($self, $value) = @_; 1997 my ($self, $value) = @_;
1803 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1998 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1804 0 1999 0
1805 }, 2000 },
1806 ); 2001 );
1807 2002
1808 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave"); 2003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1809 $table->add_at (1, $row, new DC::UI::CheckBox 2004 $table->add_at (1, $row, new DC::UI::CheckBox
1810 state => $CFG->{config_autosave}, 2005 state => $CFG->{config_autosave},
1811 tooltip => "Normally, configuration settings and the user interface layout " 2006 tooltip => "Normally, configuration settings and the user interface layout "
1812 . "are saved on client exit. You can disable this behaviour by " 2007 . "are saved on client exit. You can disable this behaviour by "
1813 . "unchecking this checkbox.", 2008 . "unchecking this checkbox.",
1814 on_changed => sub { 2009 on_changed => sub {
1815 my ($self, $value) = @_; 2010 my ($self, $value) = @_;
1816 $CFG->{config_autosave} = $value; 2011 $CFG->{config_autosave} = $value;
2012 0
1817 0 2013 }
1818 } 2014 );
1819 );
1820 $table->add_at (2, $row++, new DC::UI::Button 2015 $table->add_at (2, $row++, new DC::UI::Button
1821 text => "Save Now", 2016 text => "Save Now",
1822 tooltip => "Use this to manually save configuration and UI layout when " 2017 tooltip => "Use this to manually save configuration and UI layout when "
1823 . "autosave is disabled.", 2018 . "autosave is disabled.",
1824 on_activate => sub { 2019 on_activate => sub {
1825 DC::write_cfg; 2020 DC::save_cfg;
2021 0
1826 0 2022 }
1827 } 2023 );
1828 ); 2024 }
1829 2025
1830 $table 2026 {
2027 $bot->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
2028
2029 my $row = 0;
2030
2031 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Data Directory");
2032 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $Deliantra::VARDIR, tooltip => "");
2033 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Database Directory");
2034 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
2035 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
2036 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
2037 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
2038 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
2039 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
2040 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
2041 }
2042
2043 $vbox
1831} 2044}
1832 2045
1833sub autopickup_setup { 2046sub autopickup_setup {
1834 my $r = new DC::UI::ScrolledWindow ( 2047 my $r = new DC::UI::ScrolledWindow (
1835 expand => 1, 2048 expand => 1,
… …
2006 2219
2007sub media_window { 2220sub media_window {
2008 my $vb = new DC::UI::VBox; 2221 my $vb = new DC::UI::VBox;
2009 2222
2010 $vb->add (new DC::UI::FancyFrame 2223 $vb->add (new DC::UI::FancyFrame
2011 label => "Currently playing music", 2224 label => "Current background music",
2012 child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 2225 child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
2013 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8), 2226 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
2014 ); 2227 );
2228
2229 $vb->add (new DC::UI::FancyFrame
2230 label => "Current downloads",
2231 child => ($DOWNLOADS_WIDGET = new DC::UI::Table
2232 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
2233 );
2234
2235 $DOWNLOADS_WIDGET->connect (visibility_change => sub {
2236 my ($self) = @_;
2237
2238 delete $self->{updater};
2239 return unless $_[1];
2240
2241 $self->{updater} = AE::timer 0, 0.7, sub {
2242 $self->clear;
2243
2244 return unless $CONN;
2245
2246 my @nums = sort { $b <=> $a } keys %{ $CONN->{ix_recv_buf} };
2247 return unless @nums;
2248
2249 $self->add_at (0, 0, new DC::UI::Label align => 1, text => "Face");
2250 $self->add_at (1, 0, new DC::UI::Label align => 0, text => "Octets/Total");
2251
2252 for my $row (0 .. $#nums) {
2253 my $num = $nums[$row];
2254
2255 my $total = length $CONN->{ix_recv_buf}{$num};
2256 my $got = $total - $CONN->{ix_recv_ofs}{$num};
2257
2258 $self->add_at (0, $row + 1, new DC::UI::Label align => 1, text => $num, tooltip => "");
2259 $self->add_at (1, $row + 1, new DC::UI::Label align => 0, text => "$got/$total", tooltip => "");
2260 }
2261 };
2262 });
2015 2263
2016 $vb->add (new DC::UI::FancyFrame 2264 $vb->add (new DC::UI::FancyFrame
2017 label => "Other media used in this session", 2265 label => "Other media used in this session",
2018 expand => 1, 2266 expand => 1,
2019 child => ($LICENSE_WIDGET = new DC::UI::TextScroller 2267 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
2020 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 2268 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
2021 ); 2269 );
2022 2270
2023 $vb 2271 $vb
2024} 2272}
2025 2273
… …
2210sub open_quit_dialog { 2458sub open_quit_dialog {
2211 unless ($QUIT_DIALOG) { 2459 unless ($QUIT_DIALOG) {
2212 $QUIT_DIALOG = new DC::UI::Toplevel 2460 $QUIT_DIALOG = new DC::UI::Toplevel
2213 x => "center", 2461 x => "center",
2214 y => "center", 2462 y => "center",
2215 z => 50, 2463 z => 60,
2216 title => "Really Quit?", 2464 title => "Really Quit?",
2217 on_key_down => sub { 2465 on_key_down => sub {
2218 my ($dialog, $ev) = @_; 2466 my ($dialog, $ev) = @_;
2219 $ev->{sym} == 27 and $dialog->hide; 2467 $ev->{sym} == 27 and $dialog->hide;
2220 } 2468 }
… …
2436 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2684 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2437 2685
2438 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2686 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2439 $FULLSCREEN = $CFG->{fullscreen}; 2687 $FULLSCREEN = $CFG->{fullscreen};
2440 $FAST = $CFG->{fast}; 2688 $FAST = $CFG->{fast};
2689
2690 DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
2441 2691
2442 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error 2692 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2443 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2693 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2444 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN 2694 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2445 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2695 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
… …
2632 2882
2633our $INPUT_WATCHER = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2883our $INPUT_WATCHER = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2634 $NOW = EV::now; 2884 $NOW = EV::now;
2635 2885
2636 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_) 2886 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2637 for DC::poll_events; 2887 for DC::peep_events;
2638 2888
2639 if (%animate_object) { 2889 if (%animate_object) {
2640 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2890 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2641 $WANT_REFRESH = 1; 2891 $WANT_REFRESH = 1;
2642 } 2892 }
… …
2703 EV::unloop; 2953 EV::unloop;
2704 #d# TODO calling exit here hangs the process in some futex 2954 #d# TODO calling exit here hangs the process in some futex
2705}; 2955};
2706 2956
2707# due to mac os x + sdl combined braindamage, we need this contortion 2957# due to mac os x + sdl combined braindamage, we need this contortion
2708sub DC::Main::main { 2958sub DC::Main::run {
2709 { 2959 DC::SDL_main_hack {
2960 {
2710 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2961 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2711 2962
2712 if (-e "$Deliantra::VARDIR/client.cf") { 2963 DC::load_cfg;
2713 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2964 DC::upgrade_cfg;
2714 } else {
2715 #TODO: compatibility cruft
2716 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2717 print STDERR "INFO: used old configuration file\n";
2718 }
2719 2965
2966 DC::Audio::probe;
2967
2720 DC::DB::Server::run; 2968 DC::DB::Server::run;
2721 2969
2722 if ($CFG->{db_schema} < 1) { 2970 if ($CFG->{db_schema} < 1) {
2723 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2971 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2724 DC::DB::nuke_db; 2972 DC::DB::nuke_db;
2725 $CFG->{db_schema} = 1; 2973 $CFG->{db_schema} = 1;
2726 DC::write_cfg; 2974 DC::save_cfg;
2727 }
2728
2729 DC::DB::open_db;
2730
2731 DC::UI::set_layout ($::CFG->{layout});
2732
2733 my %DEF_CFG = (
2734 config_autosave => 1,
2735 sdl_mode => undef,
2736 fullscreen => 1,
2737 fast => 0,
2738 force_opengl11 => undef,
2739 disable_alpha => 0,
2740 smooth_movement => 1,
2741 smooth_transitions => 1,
2742 texture_compression => 1,
2743 map_scale => 1,
2744 fow_enable => 1,
2745 fow_intensity => 0,
2746 fow_texture => 0,
2747 map_smoothing => 1,
2748 gui_fontsize => 1,
2749 log_fontsize => 0.7,
2750 gauge_fontsize => 1,
2751 gauge_size => 0.35,
2752 stat_fontsize => 0.7,
2753 mapsize => 100,
2754 audio_enable => 1,
2755 audio_hw_channels => 0,
2756 audio_hw_frequency => 0,
2757 audio_hw_chunksize => 0,
2758 audio_mix_channels => 8,
2759 effects_enable => 1,
2760 effects_volume => 1,
2761 bgm_enable => 1,
2762 bgm_volume => 0.5,
2763 output_rate => "",
2764 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2765 inv_sort => "mtime",
2766 default => "profile", # default profile
2767 show_tips => 1,
2768 logview_max_par => 1000,
2769 shift_fire_stop => 0,
2770 uitheme => "wood",
2771 map_shift_x => -24, # arbitrary
2772 map_shift_y => +24, # arbitrary
2773 );
2774
2775 while (my ($k, $v) = each %DEF_CFG) {
2776 $CFG->{$k} = $v unless exists $CFG->{$k};
2777 }
2778
2779 my @args = @ARGV;
2780
2781 # OS X passes some process serial number of other shit. they
2782 # could have used an env var or any other sane mechanism. but
2783 # would it be os x then? no...
2784 shift @args if $args[0] =~ /^-psn_/;
2785
2786 my $profile = 'default';
2787
2788 for (my $i = 0; $i < @args; $i++) {
2789 if ($args[$i] =~ /^--?profile$/) {
2790 $profile = $args[$i + 1];
2791 splice @args, $i, 2, ();
2792 $i = 0;
2793 } elsif ($args[$i] =~ /^--?h/) {
2794 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2795 exit 0;
2796 } 2975 }
2797 }
2798 2976
2799 $CFG->{profile}{$profile} ||= {}; 2977 DC::DB::open_db;
2800 $PROFILE = $CFG->{profile}{$profile};
2801 $PROFILE->{host} ||= "gameserver.deliantra.net";
2802 2978
2803 $PROFILE->{host} = $args[0] if @args > 0; 2979 DC::UI::set_layout ($::CFG->{layout});
2804 $PROFILE->{user} = $args[1] if @args > 1;
2805 $PROFILE->{password} = $args[2] if @args > 2;
2806 2980
2807 # convert old bindings (only default profile matters) 2981 my @args = @ARGV;
2808 if (my $bindings = delete $PROFILE->{bindings}) { 2982
2809 while (my ($mod, $syms) = each %$bindings) { 2983 # OS X passes some process serial number of other shit. they
2810 while (my ($sym, $cmds) = each %$syms) { 2984 # could have used an env var or any other sane mechanism. but
2811 push @{ $PROFILE->{macro} }, { 2985 # would it be os x then? no...
2812 accelkey => [$mod*1, $sym*1], 2986 shift @args if $args[0] =~ /^-psn_/;
2813 action => $cmds, 2987
2988 my $profile = 'default';
2989
2990 for (my $i = 0; $i < @args; $i++) {
2991 if ($args[$i] =~ /^--?profile$/) {
2992 $profile = $args[$i + 1];
2993 splice @args, $i, 2, ();
2814 }; 2994 $i = 0;
2995 } elsif ($args[$i] =~ /^--?h/) {
2996 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2997 exit 0;
2815 } 2998 }
2816 } 2999 }
3000
3001 $CFG->{profile}{$profile} ||= {};
3002 $PROFILE = $CFG->{profile}{$profile};
3003 $PROFILE->{host} ||= "gameserver.deliantra.net";
3004
3005 $PROFILE->{host} = $args[0] if @args > 0;
3006 $PROFILE->{user} = $args[1] if @args > 1;
3007 $PROFILE->{password} = $args[2] if @args > 2;
3008
3009 # convert old bindings (only default profile matters)
3010 if (my $bindings = delete $PROFILE->{bindings}) {
3011 while (my ($mod, $syms) = each %$bindings) {
3012 while (my ($sym, $cmds) = each %$syms) {
3013 push @{ $PROFILE->{macro} }, {
3014 accelkey => [$mod*1, $sym*1],
3015 action => $cmds,
3016 };
3017 }
3018 }
2817 } 3019 }
2818 3020
3021 # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
3022 # these are ignored under windows, for some reason, and thus set in the loader
2819 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf"; 3023 $ENV{FONTCONFIG_FILE} = "fonts.conf";
2820 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts"; 3024 $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
3025 $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions
2821 3026
2822 { 3027 {
2823 my @fonts = map DC::find_rcfile "fonts/$_", qw( 3028 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2824 DejaVuSans.ttf 3029 DejaVuSans.ttf
2825 DejaVuSansMono.ttf 3030 DejaVuSansMono.ttf
2826 DejaVuSans-Bold.ttf 3031 DejaVuSans-Bold.ttf
2827 DejaVuSansMono-Bold.ttf 3032 DejaVuSansMono-Bold.ttf
2828 DejaVuSans-Oblique.ttf 3033 DejaVuSans-Oblique.ttf
2829 DejaVuSansMono-Oblique.ttf 3034 DejaVuSansMono-Oblique.ttf
2830 DejaVuSans-BoldOblique.ttf 3035 DejaVuSans-BoldOblique.ttf
2831 DejaVuSansMono-BoldOblique.ttf 3036 DejaVuSansMono-BoldOblique.ttf
2832 mona.ttf 3037 mona.ttf
2833 ); 3038 );
2834 3039
2835 DC::add_font $_ for @fonts; 3040 DC::add_font $_ for @fonts;
2836 3041
2837 $FONT_PROP = new_from_file DC::Font $fonts[0]; 3042 $FONT_PROP = new_from_file DC::Font $fonts[0];
2838 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 3043 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2839 3044
2840 $FONT_PROP->make_default; 3045 $FONT_PROP->make_default;
2841 3046
2842 DC::pango_init; 3047 DC::pango_init;
2843 } 3048 }
2844 3049
2845# compare mono (ft) vs. rgba (cairo) 3050# compare mono (ft) vs. rgba (cairo)
2846# ft - 1.8s, cairo 3s, even in alpha-only mode 3051# ft - 1.8s, cairo 3s, even in alpha-only mode
2847# for my $rgba (0..1) { 3052# for my $rgba (0..1) {
2848# my $t1 = Time::HiRes::time; 3053# my $t1 = Time::HiRes::time;
… …
2853# } 3058# }
2854# my $t2 = Time::HiRes::time; 3059# my $t2 = Time::HiRes::time;
2855# warn $t2-$t1; 3060# warn $t2-$t1;
2856# } 3061# }
2857 3062
3063 }
3064
3065 DC::SDL_Init 0;
2858 DC::IMG_Init; video_init; 3066 DC::IMG_Init; video_init;
2859 DC::Mix_Init; audio_init; 3067 DC::Mix_Init; audio_init;
2860 }
2861 3068
2862 show_tip_of_the_day if $CFG->{show_tips}; 3069 show_tip_of_the_day if $CFG->{show_tips};
2863 3070
2864 my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { 3071 my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub {
2865 undef $STARTUP_CANCEL; 3072 undef $STARTUP_CANCEL;
2866 (pop @::STARTUP_DONE)->() 3073 (pop @::STARTUP_DONE)->()
2867 while @::STARTUP_DONE; 3074 while @::STARTUP_DONE;
3075 };
3076
3077 debug_toggle 0;
3078
3079 delete $SIG{__DIE__};
3080 EV::loop;
3081
3082 DC::save_cfg if $CFG->{config_autosave};
3083
3084 #video_shutdown;
3085 #audio_shutdown;
3086
3087 DC::OpenGL::quit;
3088 DC::SDL_Quit;
3089 DC::DB::Server::stop;
2868 }; 3090 };
2869
2870 debug_toggle 0;
2871
2872 delete $SIG{__DIE__};
2873 EV::loop;
2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2877 #video_shutdown;
2878 #audio_shutdown;
2879
2880 DC::OpenGL::quit;
2881 DC::SDL_Quit;
2882 DC::DB::Server::stop;
2883} 3091}
2884
2885*DC::Main::run = \&DC::SDL_braino; # see sub above
2886 3092
28871 30931

Diff Legend

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