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.6 by root, Sat Dec 31 04:23:42 2011 UTC vs.
Revision 1.22 by root, Sun Nov 4 02:13:53 2012 UTC

… …
18} 18}
19 19
20use common::sense; 20use common::sense;
21use Carp 'verbose'; 21use Carp 'verbose';
22use Cwd (); 22use Cwd ();
23use Digest::MD5 ();
23use EV; 24use EV;
24BEGIN { *time = \&EV::time } 25BEGIN { *time = \&EV::time }
25 26
26use List::Util qw(max min); 27use List::Util qw(max min);
27 28
… …
32use AnyEvent::Socket (); 33use AnyEvent::Socket ();
33use AnyEvent::DNS (); 34use AnyEvent::DNS ();
34 35
35use Compress::LZF; 36use Compress::LZF;
36use JSON::XS; 37use JSON::XS;
38use Urlader;
37 39
38use DC; 40use DC;
39 41
40sub crash($;$) { 42sub crash($;$) {
41 # nop at compiletime 43 # nop at compiletime
… …
43 45
44BEGIN { 46BEGIN {
45 $SIG{__DIE__} = sub { 47 $SIG{__DIE__} = sub {
46 return if $^S; # quick reject 48 return if $^S; # quick reject
47 49
48 # return if there are any eval contexts in the csall stack 50 # return if there are any eval contexts in the call stack
49 for my $i (0..999) { 51 for my $i (0..999) {
50 my ($sub, $is_require) = (caller $i)[3, 7] 52 my ($sub, $is_require) = (caller $i)[3, 7]
51 or last; 53 or last;
52 return if $sub eq "(eval)" && !$is_require; 54 return if $sub eq "(eval)" && !$is_require;
53 } 55 }
… …
56 DC::fatal Carp::longmess "$_[0]"; 58 DC::fatal Carp::longmess "$_[0]";
57 } 59 }
58} 60}
59 61
60use DC::OpenGL (); 62use DC::OpenGL ();
63use DC::Audio ();
61use DC::Protocol; 64use DC::Protocol;
62use DC::DB; 65use DC::DB;
63use DC::UI; 66use DC::UI;
64use DC::UI::Canvas; 67use DC::UI::Canvas;
65use DC::UI::Inventory; 68use DC::UI::Inventory;
… …
195 AnyEvent::Util::fh_nonblocking $fh, 1; 198 AnyEvent::Util::fh_nonblocking $fh, 1;
196 199
197 $msg =~ s/\s+$//; 200 $msg =~ s/\s+$//;
198 201
199 # backtrace as second step, in case it crashes, too 202 # backtrace as second step, in case it crashes, too
200 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"
201 if $backtrace; 204 if $backtrace;
202}; 205};
203 206
204sub clienterror($;$) { 207sub clienterror($;$) {
205 my ($msg, $backtrace) = @_; 208 my ($msg, $backtrace) = @_;
… …
207 warn $msg; 210 warn $msg;
208 211
209 return unless $CONN; 212 return unless $CONN;
210 213
211 $CONN->send_exti_msg (clientlog => $msg); 214 $CONN->send_exti_msg (clientlog => $msg);
212 $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;
213} 216}
214 217
215############################################################################# 218#############################################################################
216 219
217sub status { 220sub status {
… …
472 audio_music_push; 475 audio_music_push;
473} 476}
474 477
475sub audio_init { 478sub audio_init {
476 if ($CFG->{audio_enable}) { 479 if ($CFG->{audio_enable}) {
477 if (length $CFG->{audio_driver}) { 480 DC::Audio::init $CFG->{audio_driver};
478 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
479 DC::SDL_Init DC::SDL_INIT_AUDIO
480 and die "SDL::Init failed!\n";
481 } else {
482 DC::SDL_Init DC::SDL_INIT_AUDIO
483 and die "SDL::Init failed!\n";
484 }
485
486 $ENV{MIX_EFFECTSMAXSPEED} = 1;
487 $SDL_MIXER = !DC::Mix_OpenAudio
488 $CFG->{audio_hw_frequency},
489 DC::MIX_DEFAULT_FORMAT,
490 $CFG->{audio_hw_channels},
491 $CFG->{audio_hw_chunksize};
492 481
493 if ($SDL_MIXER) { 482 if ($SDL_MIXER) {
494 DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
495
496 audio_music_finished; 483 audio_music_finished;
497 } else { 484 } else {
498 status "Unable to open sound device: there will be no sound"; 485 status "Unable to open sound device: there will be no sound";
499 } 486 }
500 } else { 487 } else {
… …
522 509
523 DC::Mix_CloseAudio if $SDL_MIXER; 510 DC::Mix_CloseAudio if $SDL_MIXER;
524 undef $SDL_MIXER; 511 undef $SDL_MIXER;
525 512
526 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 ()
696 });
527} 697}
528 698
529############################################################################# 699#############################################################################
530 700
531sub destroy_query_dialog { 701sub destroy_query_dialog {
… …
774 mapw => $mapw, 944 mapw => $mapw,
775 maph => $maph, 945 maph => $maph,
776 946
777 c_version => { 947 c_version => {
778 client => "deliantra", 948 client => "deliantra",
779 clientver => $DC::VERSION, 949 clientver => "$DC::VERSION$Urlader::EXE_VER",
780 gl_vendor => DC::OpenGL::gl_vendor, 950 gl_vendor => DC::OpenGL::gl_vendor,
781 gl_version => DC::OpenGL::gl_version, 951 gl_version => DC::OpenGL::gl_version,
782 }, 952 },
783 953
784 map_widget => $MAPWIDGET, 954 map_widget => $MAPWIDGET,
… …
792 }, 962 },
793 963
794 on_connect => sub { 964 on_connect => sub {
795 if ($_[0]) { 965 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh}; 966 DC::lowdelay fileno $CONN->{fh};
967
968 ota_update_check;
797 969
798 status "successfully connected to the server"; 970 status "successfully connected to the server";
799 } else { 971 } else {
800 undef $CONN; 972 undef $CONN;
801 status "unable to connect: $!"; 973 status "unable to connect: $!";
… …
1836 $table->add_at (2, $row++, new DC::UI::Button 2008 $table->add_at (2, $row++, new DC::UI::Button
1837 text => "Save Now", 2009 text => "Save Now",
1838 tooltip => "Use this to manually save configuration and UI layout when " 2010 tooltip => "Use this to manually save configuration and UI layout when "
1839 . "autosave is disabled.", 2011 . "autosave is disabled.",
1840 on_activate => sub { 2012 on_activate => sub {
1841 DC::write_cfg; 2013 DC::save_cfg;
1842 0 2014 0
1843 } 2015 }
1844 ); 2016 );
1845 } 2017 }
1846 2018
… …
1855 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => ""); 2027 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
1856 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)"); 2028 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
1857 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => ""); 2029 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
1858 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)"); 2030 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
1859 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => ""); 2031 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
1860 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Version (Prebuilt)"); 2032 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
1861 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => ""); 2033 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
1862 } 2034 }
1863 2035
1864 $vbox 2036 $vbox
1865} 2037}
… …
2057 my ($self) = @_; 2229 my ($self) = @_;
2058 2230
2059 delete $self->{updater}; 2231 delete $self->{updater};
2060 return unless $_[1]; 2232 return unless $_[1];
2061 2233
2062 $self->{updater} = AE::timer 0, 1, sub { 2234 $self->{updater} = AE::timer 0, 0.7, sub {
2063 $self->clear; 2235 $self->clear;
2064 2236
2065 return unless $CONN; 2237 return unless $CONN;
2066 2238
2067 my @nums = sort { $b <=> $a } keys %{ $CONN->{ix_recv_buf} }; 2239 my @nums = sort { $b <=> $a } keys %{ $CONN->{ix_recv_buf} };
2240 return unless @nums;
2068 2241
2069 $self->add_at (0, 0, new DC::UI::Label align => 1, text => "Face"); 2242 $self->add_at (0, 0, new DC::UI::Label align => 1, text => "Face");
2070 $self->add_at (1, 0, new DC::UI::Label align => 0, text => "Octets/Total"); 2243 $self->add_at (1, 0, new DC::UI::Label align => 0, text => "Octets/Total");
2071 2244
2072 for my $row (0 .. $#nums) { 2245 for my $row (0 .. $#nums) {
… …
2278sub open_quit_dialog { 2451sub open_quit_dialog {
2279 unless ($QUIT_DIALOG) { 2452 unless ($QUIT_DIALOG) {
2280 $QUIT_DIALOG = new DC::UI::Toplevel 2453 $QUIT_DIALOG = new DC::UI::Toplevel
2281 x => "center", 2454 x => "center",
2282 y => "center", 2455 y => "center",
2283 z => 50, 2456 z => 60,
2284 title => "Really Quit?", 2457 title => "Really Quit?",
2285 on_key_down => sub { 2458 on_key_down => sub {
2286 my ($dialog, $ev) = @_; 2459 my ($dialog, $ev) = @_;
2287 $ev->{sym} == 27 and $dialog->hide; 2460 $ev->{sym} == 27 and $dialog->hide;
2288 } 2461 }
… …
2481 DC::set_theme $CFG->{uitheme}; 2654 DC::set_theme $CFG->{uitheme};
2482 2655
2483 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2656 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2484 $SDL_REINIT = 0; 2657 $SDL_REINIT = 0;
2485 2658
2486 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2659 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 2;
2487 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2660 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2488 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2661 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2489 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2662 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490 2663
2491 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2664 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
… …
2504 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2677 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2505 2678
2506 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2679 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2507 $FULLSCREEN = $CFG->{fullscreen}; 2680 $FULLSCREEN = $CFG->{fullscreen};
2508 $FAST = $CFG->{fast}; 2681 $FAST = $CFG->{fast};
2682
2683 DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
2509 2684
2510 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error 2685 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2511 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2686 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2512 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN 2687 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2513 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2688 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
… …
2771 EV::unloop; 2946 EV::unloop;
2772 #d# TODO calling exit here hangs the process in some futex 2947 #d# TODO calling exit here hangs the process in some futex
2773}; 2948};
2774 2949
2775# due to mac os x + sdl combined braindamage, we need this contortion 2950# due to mac os x + sdl combined braindamage, we need this contortion
2776sub DC::Main::main { 2951sub DC::Main::run {
2777 { 2952 DC::SDL_main_hack {
2953 {
2778 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2954 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2779 2955
2780 if (-e "$Deliantra::VARDIR/client.cf") { 2956 DC::load_cfg;
2781 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2957 DC::upgrade_cfg;
2782 } else {
2783 #TODO: compatibility cruft
2784 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2785 print STDERR "INFO: used old configuration file\n";
2786 }
2787 2958
2959 DC::Audio::probe;
2960
2788 DC::DB::Server::run; 2961 DC::DB::Server::run;
2789 2962
2790 if ($CFG->{db_schema} < 1) { 2963 if ($CFG->{db_schema} < 1) {
2791 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2964 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2792 DC::DB::nuke_db; 2965 DC::DB::nuke_db;
2793 $CFG->{db_schema} = 1; 2966 $CFG->{db_schema} = 1;
2794 DC::write_cfg; 2967 DC::save_cfg;
2795 }
2796
2797 DC::DB::open_db;
2798
2799 DC::UI::set_layout ($::CFG->{layout});
2800
2801 my %DEF_CFG = (
2802 config_autosave => 1,
2803 sdl_mode => undef,
2804 fullscreen => 1,
2805 fast => 0,
2806 force_opengl11 => undef,
2807 disable_alpha => 0,
2808 smooth_movement => 1,
2809 smooth_transitions => 1,
2810 texture_compression => 1,
2811 map_scale => 1,
2812 fow_enable => 1,
2813 fow_intensity => 0,
2814 fow_texture => 0,
2815 map_smoothing => 1,
2816 gui_fontsize => 1,
2817 log_fontsize => 0.7,
2818 gauge_fontsize => 1,
2819 gauge_size => 0.35,
2820 stat_fontsize => 0.7,
2821 mapsize => 100,
2822 audio_enable => 1,
2823 audio_hw_channels => 0,
2824 audio_hw_frequency => 0,
2825 audio_hw_chunksize => 0,
2826 audio_mix_channels => 8,
2827 effects_enable => 1,
2828 effects_volume => 1,
2829 bgm_enable => 1,
2830 bgm_volume => 0.5,
2831 output_rate => "",
2832 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2833 inv_sort => "mtime",
2834 default => "profile", # default profile
2835 show_tips => 1,
2836 logview_max_par => 1000,
2837 shift_fire_stop => 0,
2838 uitheme => "wood",
2839 map_shift_x => -24, # arbitrary
2840 map_shift_y => +24, # arbitrary
2841 );
2842
2843 while (my ($k, $v) = each %DEF_CFG) {
2844 $CFG->{$k} = $v unless exists $CFG->{$k};
2845 }
2846
2847 my @args = @ARGV;
2848
2849 # OS X passes some process serial number of other shit. they
2850 # could have used an env var or any other sane mechanism. but
2851 # would it be os x then? no...
2852 shift @args if $args[0] =~ /^-psn_/;
2853
2854 my $profile = 'default';
2855
2856 for (my $i = 0; $i < @args; $i++) {
2857 if ($args[$i] =~ /^--?profile$/) {
2858 $profile = $args[$i + 1];
2859 splice @args, $i, 2, ();
2860 $i = 0;
2861 } elsif ($args[$i] =~ /^--?h/) {
2862 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2863 exit 0;
2864 } 2968 }
2865 }
2866 2969
2867 $CFG->{profile}{$profile} ||= {}; 2970 DC::DB::open_db;
2868 $PROFILE = $CFG->{profile}{$profile};
2869 $PROFILE->{host} ||= "gameserver.deliantra.net";
2870 2971
2871 $PROFILE->{host} = $args[0] if @args > 0; 2972 DC::UI::set_layout ($::CFG->{layout});
2872 $PROFILE->{user} = $args[1] if @args > 1;
2873 $PROFILE->{password} = $args[2] if @args > 2;
2874 2973
2875 # convert old bindings (only default profile matters) 2974 my @args = @ARGV;
2876 if (my $bindings = delete $PROFILE->{bindings}) { 2975
2877 while (my ($mod, $syms) = each %$bindings) { 2976 # OS X passes some process serial number of other shit. they
2878 while (my ($sym, $cmds) = each %$syms) { 2977 # could have used an env var or any other sane mechanism. but
2879 push @{ $PROFILE->{macro} }, { 2978 # would it be os x then? no...
2880 accelkey => [$mod*1, $sym*1], 2979 shift @args if $args[0] =~ /^-psn_/;
2881 action => $cmds, 2980
2981 my $profile = 'default';
2982
2983 for (my $i = 0; $i < @args; $i++) {
2984 if ($args[$i] =~ /^--?profile$/) {
2985 $profile = $args[$i + 1];
2986 splice @args, $i, 2, ();
2882 }; 2987 $i = 0;
2988 } elsif ($args[$i] =~ /^--?h/) {
2989 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2990 exit 0;
2883 } 2991 }
2884 } 2992 }
2993
2994 $CFG->{profile}{$profile} ||= {};
2995 $PROFILE = $CFG->{profile}{$profile};
2996 $PROFILE->{host} ||= "gameserver.deliantra.net";
2997
2998 $PROFILE->{host} = $args[0] if @args > 0;
2999 $PROFILE->{user} = $args[1] if @args > 1;
3000 $PROFILE->{password} = $args[2] if @args > 2;
3001
3002 # convert old bindings (only default profile matters)
3003 if (my $bindings = delete $PROFILE->{bindings}) {
3004 while (my ($mod, $syms) = each %$bindings) {
3005 while (my ($sym, $cmds) = each %$syms) {
3006 push @{ $PROFILE->{macro} }, {
3007 accelkey => [$mod*1, $sym*1],
3008 action => $cmds,
3009 };
3010 }
3011 }
2885 } 3012 }
2886 3013
2887 # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed 3014 # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
2888 # these are ignored under windows, for some reason, and thus set in the loader 3015 # these are ignored under windows, for some reason, and thus set in the loader
2889 $ENV{FONTCONFIG_FILE} = "fonts.conf"; 3016 $ENV{FONTCONFIG_FILE} = "fonts.conf";
2890 $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts"; 3017 $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
2891 $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions 3018 $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions
2892 3019
2893 { 3020 {
2894 my @fonts = map DC::find_rcfile "fonts/$_", qw( 3021 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2895 DejaVuSans.ttf 3022 DejaVuSans.ttf
2896 DejaVuSansMono.ttf 3023 DejaVuSansMono.ttf
2897 DejaVuSans-Bold.ttf 3024 DejaVuSans-Bold.ttf
2898 DejaVuSansMono-Bold.ttf 3025 DejaVuSansMono-Bold.ttf
2899 DejaVuSans-Oblique.ttf 3026 DejaVuSans-Oblique.ttf
2900 DejaVuSansMono-Oblique.ttf 3027 DejaVuSansMono-Oblique.ttf
2901 DejaVuSans-BoldOblique.ttf 3028 DejaVuSans-BoldOblique.ttf
2902 DejaVuSansMono-BoldOblique.ttf 3029 DejaVuSansMono-BoldOblique.ttf
2903 mona.ttf 3030 mona.ttf
2904 ); 3031 );
2905 3032
2906 DC::add_font $_ for @fonts; 3033 DC::add_font $_ for @fonts;
2907 3034
2908 $FONT_PROP = new_from_file DC::Font $fonts[0]; 3035 $FONT_PROP = new_from_file DC::Font $fonts[0];
2909 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 3036 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2910 3037
2911 $FONT_PROP->make_default; 3038 $FONT_PROP->make_default;
2912 3039
2913 DC::pango_init; 3040 DC::pango_init;
2914 } 3041 }
2915 3042
2916# compare mono (ft) vs. rgba (cairo) 3043# compare mono (ft) vs. rgba (cairo)
2917# ft - 1.8s, cairo 3s, even in alpha-only mode 3044# ft - 1.8s, cairo 3s, even in alpha-only mode
2918# for my $rgba (0..1) { 3045# for my $rgba (0..1) {
2919# my $t1 = Time::HiRes::time; 3046# my $t1 = Time::HiRes::time;
… …
2924# } 3051# }
2925# my $t2 = Time::HiRes::time; 3052# my $t2 = Time::HiRes::time;
2926# warn $t2-$t1; 3053# warn $t2-$t1;
2927# } 3054# }
2928 3055
3056 }
3057
3058 DC::SDL_Init 0;
2929 DC::IMG_Init; video_init; 3059 DC::IMG_Init; video_init;
2930 DC::Mix_Init; audio_init; 3060 DC::Mix_Init; audio_init;
2931 }
2932 3061
2933 show_tip_of_the_day if $CFG->{show_tips}; 3062 show_tip_of_the_day if $CFG->{show_tips};
2934 3063
2935 my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { 3064 my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub {
2936 undef $STARTUP_CANCEL; 3065 undef $STARTUP_CANCEL;
2937 (pop @::STARTUP_DONE)->() 3066 (pop @::STARTUP_DONE)->()
2938 while @::STARTUP_DONE; 3067 while @::STARTUP_DONE;
3068 };
3069
3070 debug_toggle 0;
3071
3072 delete $SIG{__DIE__};
3073 EV::loop;
3074
3075 DC::save_cfg if $CFG->{config_autosave};
3076
3077 #video_shutdown;
3078 #audio_shutdown;
3079
3080 DC::OpenGL::quit;
3081 DC::SDL_Quit;
3082 DC::DB::Server::stop;
2939 }; 3083 };
2940
2941 debug_toggle 0;
2942
2943 delete $SIG{__DIE__};
2944 EV::loop;
2945
2946 DC::write_cfg if $CFG->{config_autosave};
2947
2948 #video_shutdown;
2949 #audio_shutdown;
2950
2951 DC::OpenGL::quit;
2952 DC::SDL_Quit;
2953 DC::DB::Server::stop;
2954} 3084}
2955
2956*DC::Main::run = \&DC::SDL_braino; # see sub above
2957 3085
29581 30861

Diff Legend

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