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.9 by root, Thu Jan 5 05:37:02 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
… …
40 # nop at compiletime 42 # nop at compiletime
41} 43}
42 44
43BEGIN { 45BEGIN {
44 $SIG{__DIE__} = sub { 46 $SIG{__DIE__} = sub {
45 return if $^S; 47 return if $^S; # quick reject
48
49 # return if there are any eval contexts in the csall stack
50 for my $i (0..999) {
51 my ($sub, $is_require) = (caller $i)[3, 7]
52 or last;
53 return if $sub eq "(eval)" && !$is_require;
54 }
55
46 crash "CRASH/DIE: $_[0]" => 1; 56 crash "CRASH/DIE: $_[0]" => 1;
47 DC::fatal Carp::longmess "$_[0]"; 57 DC::fatal Carp::longmess "$_[0]";
48 } 58 }
49} 59}
50 60
… …
133our $PL_NOTEBOOK; 143our $PL_NOTEBOOK;
134our $PL_WINDOW; 144our $PL_WINDOW;
135 145
136our $MUSIC_PLAYING_WIDGET; 146our $MUSIC_PLAYING_WIDGET;
137our $LICENSE_WIDGET; 147our $LICENSE_WIDGET;
148our $DOWNLOADS_WIDGET;
138 149
139our $PICKUP_PAGE; 150our $PICKUP_PAGE;
140our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
141our $STATS_PAGE; 152our $STATS_PAGE;
142our $SKILL_PAGE; 153our $SKILL_PAGE;
… …
512 523
513 DC::Mix_CloseAudio if $SDL_MIXER; 524 DC::Mix_CloseAudio if $SDL_MIXER;
514 undef $SDL_MIXER; 525 undef $SDL_MIXER;
515 526
516 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO; 527 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
528}
529
530#############################################################################
531# Over-the-air updates
532
533sub ota_update {
534 my ($face, $size, $md5) = @_;
535
536 my $coro = Coro::async_pool {
537 my $override = "$Urlader::EXE_DIR/override";
538
539 $MESSAGE_DIST->add_channel ({
540 id => "ota_update",
541 title => "Update",
542 tooltip => "<b>Software Update Log</b>",
543 });
544
545 $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." });
546
547 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777;
548
549 unless ($fh) {
550 $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
551 return;
552 }
553
554 $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." });
555
556 my $cv = AE::cv;
557 my $error;
558
559 $cv->begin (Coro::rouse_cb);
560 $CONN->ask_face (
561 $face,
562 -1000,
563 sub {
564 $STATUSBOX->add (
565 (sprintf "update download: %d/%d", $size - $_[1], $size),
566 pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1]
567 );
568
569 $cv->begin;
570 my $len = length $_[2];
571 IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub {
572 $error ||= $_[0] != $len;
573 $cv->end;
574 };
575 },
576 sub {
577 $cv->end;
578 },
579 );
580
581 Coro::rouse_wait;
582
583 $STATUSBOX->clr_group ("ota_update");
584
585 $error ||= Coro::AIO::aio_fsync $fh;
586 $error ||= Coro::AIO::aio_close $fh;
587
588 if ($error) {
589 $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." });
590 Coro::AIO::aio_unlink "$override.tmp";
591 return;
592 }
593
594 {
595 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
596
597 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
598
599 if ($fh) {
600 $error ||= Coro::AIO::aio_stat "$override.tmp";
601 $error ||= -s _ != $size;
602 $error ||= Coro::AIO::aio_readahead $fh, 0, $size;
603
604 my $f_md5 = new Digest::MD5;
605 $f_md5->addfile ($fh);
606 $f_md5 = $f_md5->hexdigest;
607 $error ||= $md5 ne $f_md5;
608 }
609 }
610
611 if ($error) {
612 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
613 Coro::AIO::aio_unlink "$override.tmp";
614 return;
615 }
616
617 $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
618
619 if (Coro::AIO::aio_rename "$override.tmp", $override) {
620 $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." });
621 Coro::AIO::aio_unlink "$override.tmp";
622 }
623
624 $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
625 };
626
627 $CONN->{ota_update} = Guard::guard {
628 $coro->cancel;
629 };
630}
631
632sub ota_update_ask {
633 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
634
635 $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
636 x => "center",
637 y => "center",
638 z => 55,
639 force_w => $::WIDTH * 0.7,
640 force_h => $::HEIGHT * 0.7,
641 title => "Software update available",
642 child => my $vbox = new DC::UI::VBox,
643 ;
644
645 $vbox->add (new DC::UI::Label
646 ellipsise => 0,
647 text => "The server offers a software update, "
648 . "do you want to start downloading this update in the background?",
649 );
650
651 $vbox->add (new DC::UI::FancyFrame
652 expand => 1,
653 label => "Details",
654 child => (new DC::UI::TextScroller
655 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
656 par => [{
657 markup => "<tt>Old revision: $Urlader::EXE_VER\n"
658 . "New revision: $ver\n"
659 . "Download size: $size bytes</tt>\n\n"
660 . "Changes:\n\n"
661 . DC::asxml $changes
662 }],
663 ),
664 );
665
666 $vbox->add (my $hbox = new DC::UI::HBox);
667
668 $hbox->add (new DC::UI::Button
669 expand => 1,
670 text => "Not now",
671 on_activate => sub {
672 $dialog->destroy;
673 0
674 }
675 );
676 $hbox->add (new DC::UI::Button
677 expand => 1,
678 text => "Yes, start downloading",
679 on_activate => sub {
680 $dialog->destroy;
681 ota_update $face, $size, $md5;
682 0
683 },
684 );
685
686 $dialog->show;
687}
688
689sub ota_update_check {
690 return unless defined $Urlader::EXE_ID;
691
692 ::message { markup => "Checking for software update..." };
693
694 $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
695 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
696
697 if ($ok) {
698 if (defined $ver) {
699 ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." };
700 &ota_update_ask;
701 } else {
702 ::message { markup => "Server has no newer version." };
703 }
704 } else {
705 ::message { markup => "Server does not support software update." };
706 }
707
708# $self->register_face_handler ($exp_table, sub {
709# my ($face) = @_;
710
711# $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
712# $_->() for values %{ $self->{on_exp_update} || {} };
713# });
714
715 ()
716 });
517} 717}
518 718
519############################################################################# 719#############################################################################
520 720
521sub destroy_query_dialog { 721sub destroy_query_dialog {
… …
783 983
784 on_connect => sub { 984 on_connect => sub {
785 if ($_[0]) { 985 if ($_[0]) {
786 DC::lowdelay fileno $CONN->{fh}; 986 DC::lowdelay fileno $CONN->{fh};
787 987
988 ota_update_check;
989
788 status "successfully connected to the server"; 990 status "successfully connected to the server";
789 } else { 991 } else {
790 undef $CONN; 992 undef $CONN;
791 status "unable to connect: $!"; 993 status "unable to connect: $!";
792 stop_game(); 994 stop_game();
… …
1131 text => $CFG->{audio_driver}, 1333 text => $CFG->{audio_driver},
1132 template => "dsound1234", 1334 template => "dsound1234",
1133 tooltip => "You can override the audio driver to use here. Leaving it empty will result " 1335 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 " 1336 . "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> " 1337 . "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" 1338 . "or other system-specific drivers. Selecting the wrong driver here will simply result "
1137 . "in no sound.", 1339 . "in no sound.",
1138 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 } 1340 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1139 ); 1341 );
1140 1342
1141 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1343 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
… …
1773 1975
1774 $vbox 1976 $vbox
1775} 1977}
1776 1978
1777sub client_setup { 1979sub client_setup {
1980 my $vbox = new DC::UI::VBox;
1981
1982 $vbox->add (my $top = new DC::UI::FancyFrame expand => 1, label => "Client Settings");
1983 $vbox->add (my $bot = new DC::UI::FancyFrame expand => 1, label => "Client Info");
1984
1985 {
1778 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1986 $top->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1779 1987
1780 my $row = 0; 1988 my $row = 0;
1781 1989
1782 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1990 $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 1991 $table->add_at (1, $row++, new DC::UI::CheckBox
1784 c_colspan => 2, 1992 c_colspan => 2,
1785 state => $CFG->{show_tips}, 1993 state => $CFG->{show_tips},
1786 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1994 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1787 on_changed => sub { 1995 on_changed => sub {
1788 my ($self, $value) = @_; 1996 my ($self, $value) = @_;
1789 $CFG->{show_tips} = $value; 1997 $CFG->{show_tips} = $value;
1998 0
1790 0 1999 }
1791 } 2000 );
1792 );
1793 2001
1794 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 2002 $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 2003 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1796 c_colspan => 2, 2004 c_colspan => 2,
1797 text => $CFG->{logview_max_par}, 2005 text => $CFG->{logview_max_par},
1798 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 2006 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 " 2007 . "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.", 2008 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1801 on_changed => sub { 2009 on_changed => sub {
1802 my ($self, $value) = @_; 2010 my ($self, $value) = @_;
1803 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 2011 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1804 0 2012 0
1805 }, 2013 },
1806 ); 2014 );
1807 2015
1808 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave"); 2016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1809 $table->add_at (1, $row, new DC::UI::CheckBox 2017 $table->add_at (1, $row, new DC::UI::CheckBox
1810 state => $CFG->{config_autosave}, 2018 state => $CFG->{config_autosave},
1811 tooltip => "Normally, configuration settings and the user interface layout " 2019 tooltip => "Normally, configuration settings and the user interface layout "
1812 . "are saved on client exit. You can disable this behaviour by " 2020 . "are saved on client exit. You can disable this behaviour by "
1813 . "unchecking this checkbox.", 2021 . "unchecking this checkbox.",
1814 on_changed => sub { 2022 on_changed => sub {
1815 my ($self, $value) = @_; 2023 my ($self, $value) = @_;
1816 $CFG->{config_autosave} = $value; 2024 $CFG->{config_autosave} = $value;
2025 0
1817 0 2026 }
1818 } 2027 );
1819 );
1820 $table->add_at (2, $row++, new DC::UI::Button 2028 $table->add_at (2, $row++, new DC::UI::Button
1821 text => "Save Now", 2029 text => "Save Now",
1822 tooltip => "Use this to manually save configuration and UI layout when " 2030 tooltip => "Use this to manually save configuration and UI layout when "
1823 . "autosave is disabled.", 2031 . "autosave is disabled.",
1824 on_activate => sub { 2032 on_activate => sub {
1825 DC::write_cfg; 2033 DC::write_cfg;
2034 0
1826 0 2035 }
1827 } 2036 );
1828 ); 2037 }
1829 2038
1830 $table 2039 {
2040 $bot->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
2041
2042 my $row = 0;
2043
2044 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Data Directory");
2045 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $Deliantra::VARDIR, tooltip => "");
2046 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Database Directory");
2047 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
2048 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
2049 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
2050 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
2051 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
2052 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
2053 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
2054 }
2055
2056 $vbox
1831} 2057}
1832 2058
1833sub autopickup_setup { 2059sub autopickup_setup {
1834 my $r = new DC::UI::ScrolledWindow ( 2060 my $r = new DC::UI::ScrolledWindow (
1835 expand => 1, 2061 expand => 1,
… …
2006 2232
2007sub media_window { 2233sub media_window {
2008 my $vb = new DC::UI::VBox; 2234 my $vb = new DC::UI::VBox;
2009 2235
2010 $vb->add (new DC::UI::FancyFrame 2236 $vb->add (new DC::UI::FancyFrame
2011 label => "Currently playing music", 2237 label => "Current background music",
2012 child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 2238 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), 2239 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
2014 ); 2240 );
2241
2242 $vb->add (new DC::UI::FancyFrame
2243 label => "Current downloads",
2244 child => ($DOWNLOADS_WIDGET = new DC::UI::Table
2245 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
2246 );
2247
2248 $DOWNLOADS_WIDGET->connect (visibility_change => sub {
2249 my ($self) = @_;
2250
2251 delete $self->{updater};
2252 return unless $_[1];
2253
2254 $self->{updater} = AE::timer 0, 0.7, sub {
2255 $self->clear;
2256
2257 return unless $CONN;
2258
2259 my @nums = sort { $b <=> $a } keys %{ $CONN->{ix_recv_buf} };
2260 return unless @nums;
2261
2262 $self->add_at (0, 0, new DC::UI::Label align => 1, text => "Face");
2263 $self->add_at (1, 0, new DC::UI::Label align => 0, text => "Octets/Total");
2264
2265 for my $row (0 .. $#nums) {
2266 my $num = $nums[$row];
2267
2268 my $total = length $CONN->{ix_recv_buf}{$num};
2269 my $got = $total - $CONN->{ix_recv_ofs}{$num};
2270
2271 $self->add_at (0, $row + 1, new DC::UI::Label align => 1, text => $num, tooltip => "");
2272 $self->add_at (1, $row + 1, new DC::UI::Label align => 0, text => "$got/$total", tooltip => "");
2273 }
2274 };
2275 });
2015 2276
2016 $vb->add (new DC::UI::FancyFrame 2277 $vb->add (new DC::UI::FancyFrame
2017 label => "Other media used in this session", 2278 label => "Other media used in this session",
2018 expand => 1, 2279 expand => 1,
2019 child => ($LICENSE_WIDGET = new DC::UI::TextScroller 2280 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
2020 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 2281 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
2021 ); 2282 );
2022 2283
2023 $vb 2284 $vb
2024} 2285}
2025 2286
… …
2210sub open_quit_dialog { 2471sub open_quit_dialog {
2211 unless ($QUIT_DIALOG) { 2472 unless ($QUIT_DIALOG) {
2212 $QUIT_DIALOG = new DC::UI::Toplevel 2473 $QUIT_DIALOG = new DC::UI::Toplevel
2213 x => "center", 2474 x => "center",
2214 y => "center", 2475 y => "center",
2215 z => 50, 2476 z => 60,
2216 title => "Really Quit?", 2477 title => "Really Quit?",
2217 on_key_down => sub { 2478 on_key_down => sub {
2218 my ($dialog, $ev) = @_; 2479 my ($dialog, $ev) = @_;
2219 $ev->{sym} == 27 and $dialog->hide; 2480 $ev->{sym} == 27 and $dialog->hide;
2220 } 2481 }
… …
2632 2893
2633our $INPUT_WATCHER = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2894our $INPUT_WATCHER = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2634 $NOW = EV::now; 2895 $NOW = EV::now;
2635 2896
2636 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_) 2897 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2637 for DC::poll_events; 2898 for DC::peep_events;
2638 2899
2639 if (%animate_object) { 2900 if (%animate_object) {
2640 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2901 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2641 $WANT_REFRESH = 1; 2902 $WANT_REFRESH = 1;
2642 } 2903 }
… …
2814 }; 3075 };
2815 } 3076 }
2816 } 3077 }
2817 } 3078 }
2818 3079
3080 # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
3081 # these are ignored under windows, for some reason, and thus set in the loader
2819 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf"; 3082 $ENV{FONTCONFIG_FILE} = "fonts.conf";
2820 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts"; 3083 $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
3084 $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions
2821 3085
2822 { 3086 {
2823 my @fonts = map DC::find_rcfile "fonts/$_", qw( 3087 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2824 DejaVuSans.ttf 3088 DejaVuSans.ttf
2825 DejaVuSansMono.ttf 3089 DejaVuSansMono.ttf

Diff Legend

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