… | |
… | |
18 | } |
18 | } |
19 | |
19 | |
20 | use common::sense; |
20 | use common::sense; |
21 | use Carp 'verbose'; |
21 | use Carp 'verbose'; |
22 | use Cwd (); |
22 | use Cwd (); |
|
|
23 | use Digest::MD5 (); |
23 | use EV; |
24 | use EV; |
24 | BEGIN { *time = \&EV::time } |
25 | BEGIN { *time = \&EV::time } |
25 | |
26 | |
26 | use List::Util qw(max min); |
27 | use List::Util qw(max min); |
27 | |
28 | |
… | |
… | |
56 | DC::fatal Carp::longmess "$_[0]"; |
57 | DC::fatal Carp::longmess "$_[0]"; |
57 | } |
58 | } |
58 | } |
59 | } |
59 | |
60 | |
60 | use DC::OpenGL (); |
61 | use DC::OpenGL (); |
|
|
62 | use DC::Audio (); |
61 | use DC::Protocol; |
63 | use DC::Protocol; |
62 | use DC::DB; |
64 | use DC::DB; |
63 | use DC::UI; |
65 | use DC::UI; |
64 | use DC::UI::Canvas; |
66 | use DC::UI::Canvas; |
65 | use DC::UI::Inventory; |
67 | use DC::UI::Inventory; |
… | |
… | |
195 | AnyEvent::Util::fh_nonblocking $fh, 1; |
197 | AnyEvent::Util::fh_nonblocking $fh, 1; |
196 | |
198 | |
197 | $msg =~ s/\s+$//; |
199 | $msg =~ s/\s+$//; |
198 | |
200 | |
199 | # backtrace as second step, in case it crashes, too |
201 | # backtrace as second step, in case it crashes, too |
200 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" |
202 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated" |
201 | if $backtrace; |
203 | if $backtrace; |
202 | }; |
204 | }; |
203 | |
205 | |
204 | sub clienterror($;$) { |
206 | sub clienterror($;$) { |
205 | my ($msg, $backtrace) = @_; |
207 | my ($msg, $backtrace) = @_; |
… | |
… | |
207 | warn $msg; |
209 | warn $msg; |
208 | |
210 | |
209 | return unless $CONN; |
211 | return unless $CONN; |
210 | |
212 | |
211 | $CONN->send_exti_msg (clientlog => $msg); |
213 | $CONN->send_exti_msg (clientlog => $msg); |
212 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace; |
214 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace; |
213 | } |
215 | } |
214 | |
216 | |
215 | ############################################################################# |
217 | ############################################################################# |
216 | |
218 | |
217 | sub status { |
219 | sub status { |
… | |
… | |
472 | audio_music_push; |
474 | audio_music_push; |
473 | } |
475 | } |
474 | |
476 | |
475 | sub audio_init { |
477 | sub audio_init { |
476 | if ($CFG->{audio_enable}) { |
478 | if ($CFG->{audio_enable}) { |
477 | if (length $CFG->{audio_driver}) { |
479 | 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 | |
480 | |
493 | if ($SDL_MIXER) { |
481 | if ($SDL_MIXER) { |
494 | DC::Mix_AllocateChannels $CFG->{audio_mix_channels}; |
|
|
495 | |
|
|
496 | audio_music_finished; |
482 | audio_music_finished; |
497 | } else { |
483 | } else { |
498 | status "Unable to open sound device: there will be no sound"; |
484 | status "Unable to open sound device: there will be no sound"; |
499 | } |
485 | } |
500 | } else { |
486 | } else { |
… | |
… | |
527 | } |
513 | } |
528 | |
514 | |
529 | ############################################################################# |
515 | ############################################################################# |
530 | # Over-the-air updates |
516 | # Over-the-air updates |
531 | |
517 | |
532 | sub ota_update_finish { |
|
|
533 | $MESSAGE_DIST->message ({ type => "ota_update", markup => $_[0] }); |
|
|
534 | } |
|
|
535 | |
|
|
536 | sub ota_update_status { |
|
|
537 | } |
|
|
538 | |
|
|
539 | sub ota_update { |
518 | sub ota_update { |
540 | my ($face, $size) = @_; |
519 | my ($face, $size, $md5) = @_; |
541 | |
520 | |
542 | my $coro = Coro::async_pool { |
521 | my $coro = Coro::async_pool { |
543 | my $override = "$Urlader::EXE_DIR/override"; |
522 | my $override = "$Urlader::EXE_DIR/override"; |
544 | |
523 | |
545 | $MESSAGE_DIST->add_channel ({ |
524 | $MESSAGE_DIST->add_channel ({ |
… | |
… | |
551 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." }); |
530 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." }); |
552 | |
531 | |
553 | my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777; |
532 | my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777; |
554 | |
533 | |
555 | unless ($fh) { |
534 | unless ($fh) { |
556 | ota_update_finish "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!"; |
535 | $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") }); |
557 | return; |
536 | return; |
558 | } |
537 | } |
559 | |
538 | |
560 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." }); |
539 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." }); |
561 | |
540 | |
562 | my $cv = AE::cv; |
541 | my $cv = AE::cv; |
563 | my $error; |
542 | my $error; |
564 | |
543 | |
565 | $cv->begin (Coro::rouse_cb); |
544 | $cv->begin (Coro::rouse_cb); |
566 | |
|
|
567 | $CONN->ask_face ( |
545 | $CONN->ask_face ( |
568 | $face, |
546 | $face, |
569 | -1000, |
547 | -1000, |
570 | sub { |
548 | sub { |
571 | $STATUSBOX->add ( |
549 | $STATUSBOX->add ( |
… | |
… | |
596 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." }); |
574 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." }); |
597 | Coro::AIO::aio_unlink "$override.tmp"; |
575 | Coro::AIO::aio_unlink "$override.tmp"; |
598 | return; |
576 | return; |
599 | } |
577 | } |
600 | |
578 | |
|
|
579 | { |
|
|
580 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." }); |
|
|
581 | |
|
|
582 | my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0; |
|
|
583 | |
|
|
584 | if ($fh) { |
|
|
585 | $error ||= Coro::AIO::aio_stat "$override.tmp"; |
|
|
586 | $error ||= -s _ != $size; |
|
|
587 | Coro::AIO::aio_readahead $fh, 0, $size; |
|
|
588 | |
|
|
589 | my $f_md5 = new Digest::MD5; |
|
|
590 | binmode $fh; # ugh :( |
|
|
591 | $f_md5->addfile ($fh); |
|
|
592 | $f_md5 = $f_md5->hexdigest; |
|
|
593 | $error ||= $md5 ne $f_md5; |
|
|
594 | } |
|
|
595 | } |
|
|
596 | |
|
|
597 | if ($error) { |
|
|
598 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." }); |
|
|
599 | Coro::AIO::aio_unlink "$override.tmp"; |
|
|
600 | return; |
|
|
601 | } |
|
|
602 | |
601 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." }); |
603 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." }); |
602 | |
604 | |
603 | if (Coro::AIO::aio_rename "$override.tmp", $override) { |
605 | if (Coro::AIO::aio_rename "$override.tmp", $override) { |
604 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." }); |
606 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." }); |
605 | Coro::AIO::aio_unlink "$override.tmp"; |
607 | Coro::AIO::aio_unlink "$override.tmp"; |
606 | } |
608 | } |
607 | |
609 | |
608 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "update successfull, changes become active at next start." }); |
610 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." }); |
609 | }; |
611 | }; |
610 | |
612 | |
611 | $CONN->{ota_update} = Guard::guard { |
613 | $CONN->{ota_update} = Guard::guard { |
612 | $coro->cancel; |
614 | $coro->cancel; |
613 | }; |
615 | }; |
614 | } |
616 | } |
615 | |
617 | |
616 | sub ota_update_ask { |
618 | sub ota_update_ask { |
617 | my ($ok, $face, $ver, $size, $changes) = @_; |
619 | my ($ok, $face, $ver, $size, $md5, $changes) = @_; |
618 | |
620 | |
619 | $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel |
621 | $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel |
620 | x => "center", |
622 | x => "center", |
621 | y => "center", |
623 | y => "center", |
|
|
624 | z => 55, |
622 | max_w => $::WIDTH * 0.7, |
625 | force_w => $::WIDTH * 0.7, |
623 | max_h => $::WIDTH * 0.7, |
626 | force_h => $::HEIGHT * 0.7, |
624 | title => "Software update available", |
627 | title => "Software update available", |
625 | child => my $vbox = new DC::UI::VBox, |
628 | child => my $vbox = new DC::UI::VBox, |
626 | ; |
629 | ; |
627 | |
630 | |
628 | $vbox->add (new DC::UI::Label |
631 | $vbox->add (new DC::UI::Label |
629 | ellipsise => 0, |
632 | ellipsise => 0, |
630 | text => "The server offers a software update, " |
633 | text => "The server offers a software update, " |
631 | . "do you want to start downloading this update in the background?", |
634 | . "do you want to start downloading this update in the background?", |
632 | ); |
635 | ); |
633 | |
636 | |
634 | $vbox->add (new DC::UI::FancyFrame |
637 | $vbox->add (new DC::UI::FancyFrame |
635 | expand => 1, |
638 | expand => 1, |
636 | label => "Changes", |
639 | label => "Details", |
637 | child => (new DC::UI::TextScroller |
640 | child => (new DC::UI::TextScroller |
638 | expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4, |
641 | expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4, |
639 | par => [{ |
642 | par => [{ |
640 | markup => "<tt>Old revision: $Urlader::EXE_VER\n" |
643 | markup => "<tt>Old revision: $Urlader::EXE_VER\n" |
641 | . "New revision: $ver\n" |
644 | . "New revision: $ver\n" |
642 | . "Download size: $size bytes</tt>\n\n" |
645 | . "Download size: $size bytes</tt>\n\n" |
|
|
646 | . "Changes:\n\n" |
643 | . DC::asxml $changes |
647 | . DC::asxml $changes |
644 | }], |
648 | }], |
645 | ), |
649 | ), |
646 | ); |
650 | ); |
647 | |
651 | |
… | |
… | |
658 | $hbox->add (new DC::UI::Button |
662 | $hbox->add (new DC::UI::Button |
659 | expand => 1, |
663 | expand => 1, |
660 | text => "Yes, start downloading", |
664 | text => "Yes, start downloading", |
661 | on_activate => sub { |
665 | on_activate => sub { |
662 | $dialog->destroy; |
666 | $dialog->destroy; |
663 | ota_update $face, $size; |
667 | ota_update $face, $size, $md5; |
664 | 0 |
668 | 0 |
665 | }, |
669 | }, |
666 | ); |
670 | ); |
667 | |
671 | |
668 | $dialog->show; |
672 | $dialog->show; |
… | |
… | |
672 | return unless defined $Urlader::EXE_ID; |
676 | return unless defined $Urlader::EXE_ID; |
673 | |
677 | |
674 | ::message { markup => "Checking for software update..." }; |
678 | ::message { markup => "Checking for software update..." }; |
675 | |
679 | |
676 | $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub { |
680 | $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub { |
677 | my ($ok, $face, $ver, $size, $changes) = @_; |
681 | my ($ok, $face, $ver, $size, $md5, $changes) = @_; |
678 | |
682 | |
679 | if ($ok) { |
683 | if ($ok) { |
680 | if (defined $ver) { |
684 | if (defined $ver) { |
681 | ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." }; |
685 | ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." }; |
682 | &ota_update_ask; |
686 | &ota_update_ask; |
… | |
… | |
946 | mapw => $mapw, |
950 | mapw => $mapw, |
947 | maph => $maph, |
951 | maph => $maph, |
948 | |
952 | |
949 | c_version => { |
953 | c_version => { |
950 | client => "deliantra", |
954 | client => "deliantra", |
951 | clientver => $DC::VERSION, |
955 | clientver => "$DC::VERSION$Urlader::EXE_VER", |
952 | gl_vendor => DC::OpenGL::gl_vendor, |
956 | gl_vendor => DC::OpenGL::gl_vendor, |
953 | gl_version => DC::OpenGL::gl_version, |
957 | gl_version => DC::OpenGL::gl_version, |
954 | }, |
958 | }, |
955 | |
959 | |
956 | map_widget => $MAPWIDGET, |
960 | map_widget => $MAPWIDGET, |
… | |
… | |
2010 | $table->add_at (2, $row++, new DC::UI::Button |
2014 | $table->add_at (2, $row++, new DC::UI::Button |
2011 | text => "Save Now", |
2015 | text => "Save Now", |
2012 | tooltip => "Use this to manually save configuration and UI layout when " |
2016 | tooltip => "Use this to manually save configuration and UI layout when " |
2013 | . "autosave is disabled.", |
2017 | . "autosave is disabled.", |
2014 | on_activate => sub { |
2018 | on_activate => sub { |
2015 | DC::write_cfg; |
2019 | DC::save_cfg; |
2016 | 0 |
2020 | 0 |
2017 | } |
2021 | } |
2018 | ); |
2022 | ); |
2019 | } |
2023 | } |
2020 | |
2024 | |
… | |
… | |
2453 | sub open_quit_dialog { |
2457 | sub open_quit_dialog { |
2454 | unless ($QUIT_DIALOG) { |
2458 | unless ($QUIT_DIALOG) { |
2455 | $QUIT_DIALOG = new DC::UI::Toplevel |
2459 | $QUIT_DIALOG = new DC::UI::Toplevel |
2456 | x => "center", |
2460 | x => "center", |
2457 | y => "center", |
2461 | y => "center", |
2458 | z => 50, |
2462 | z => 60, |
2459 | title => "Really Quit?", |
2463 | title => "Really Quit?", |
2460 | on_key_down => sub { |
2464 | on_key_down => sub { |
2461 | my ($dialog, $ev) = @_; |
2465 | my ($dialog, $ev) = @_; |
2462 | $ev->{sym} == 27 and $dialog->hide; |
2466 | $ev->{sym} == 27 and $dialog->hide; |
2463 | } |
2467 | } |
… | |
… | |
2679 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
2683 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
2680 | |
2684 | |
2681 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
2685 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
2682 | $FULLSCREEN = $CFG->{fullscreen}; |
2686 | $FULLSCREEN = $CFG->{fullscreen}; |
2683 | $FAST = $CFG->{fast}; |
2687 | $FAST = $CFG->{fast}; |
|
|
2688 | |
|
|
2689 | DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init |
2684 | |
2690 | |
2685 | # due to mac os x braindamage, we simply retry with !fullscreen in case of an error |
2691 | # due to mac os x braindamage, we simply retry with !fullscreen in case of an error |
2686 | DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
2692 | DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
2687 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
2693 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
2688 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
2694 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
… | |
… | |
2946 | EV::unloop; |
2952 | EV::unloop; |
2947 | #d# TODO calling exit here hangs the process in some futex |
2953 | #d# TODO calling exit here hangs the process in some futex |
2948 | }; |
2954 | }; |
2949 | |
2955 | |
2950 | # due to mac os x + sdl combined braindamage, we need this contortion |
2956 | # due to mac os x + sdl combined braindamage, we need this contortion |
2951 | sub DC::Main::main { |
2957 | sub DC::Main::run { |
2952 | { |
2958 | DC::SDL_main_hack { |
|
|
2959 | { |
2953 | DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; |
2960 | DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; |
2954 | |
2961 | |
2955 | if (-e "$Deliantra::VARDIR/client.cf") { |
2962 | DC::load_cfg; |
2956 | DC::read_cfg "$Deliantra::VARDIR/client.cf"; |
2963 | DC::upgrade_cfg; |
2957 | } else { |
|
|
2958 | #TODO: compatibility cruft |
|
|
2959 | DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; |
|
|
2960 | print STDERR "INFO: used old configuration file\n"; |
|
|
2961 | } |
|
|
2962 | |
2964 | |
|
|
2965 | DC::Audio::probe; |
|
|
2966 | |
2963 | DC::DB::Server::run; |
2967 | DC::DB::Server::run; |
2964 | |
2968 | |
2965 | if ($CFG->{db_schema} < 1) { |
2969 | if ($CFG->{db_schema} < 1) { |
2966 | warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; |
2970 | warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; |
2967 | DC::DB::nuke_db; |
2971 | DC::DB::nuke_db; |
2968 | $CFG->{db_schema} = 1; |
2972 | $CFG->{db_schema} = 1; |
2969 | DC::write_cfg; |
2973 | DC::save_cfg; |
2970 | } |
|
|
2971 | |
|
|
2972 | DC::DB::open_db; |
|
|
2973 | |
|
|
2974 | DC::UI::set_layout ($::CFG->{layout}); |
|
|
2975 | |
|
|
2976 | my %DEF_CFG = ( |
|
|
2977 | config_autosave => 1, |
|
|
2978 | sdl_mode => undef, |
|
|
2979 | fullscreen => 1, |
|
|
2980 | fast => 0, |
|
|
2981 | force_opengl11 => undef, |
|
|
2982 | disable_alpha => 0, |
|
|
2983 | smooth_movement => 1, |
|
|
2984 | smooth_transitions => 1, |
|
|
2985 | texture_compression => 1, |
|
|
2986 | map_scale => 1, |
|
|
2987 | fow_enable => 1, |
|
|
2988 | fow_intensity => 0, |
|
|
2989 | fow_texture => 0, |
|
|
2990 | map_smoothing => 1, |
|
|
2991 | gui_fontsize => 1, |
|
|
2992 | log_fontsize => 0.7, |
|
|
2993 | gauge_fontsize => 1, |
|
|
2994 | gauge_size => 0.35, |
|
|
2995 | stat_fontsize => 0.7, |
|
|
2996 | mapsize => 100, |
|
|
2997 | audio_enable => 1, |
|
|
2998 | audio_hw_channels => 0, |
|
|
2999 | audio_hw_frequency => 0, |
|
|
3000 | audio_hw_chunksize => 0, |
|
|
3001 | audio_mix_channels => 8, |
|
|
3002 | effects_enable => 1, |
|
|
3003 | effects_volume => 1, |
|
|
3004 | bgm_enable => 1, |
|
|
3005 | bgm_volume => 0.5, |
|
|
3006 | output_rate => "", |
|
|
3007 | pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES, |
|
|
3008 | inv_sort => "mtime", |
|
|
3009 | default => "profile", # default profile |
|
|
3010 | show_tips => 1, |
|
|
3011 | logview_max_par => 1000, |
|
|
3012 | shift_fire_stop => 0, |
|
|
3013 | uitheme => "wood", |
|
|
3014 | map_shift_x => -24, # arbitrary |
|
|
3015 | map_shift_y => +24, # arbitrary |
|
|
3016 | ); |
|
|
3017 | |
|
|
3018 | while (my ($k, $v) = each %DEF_CFG) { |
|
|
3019 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
|
|
3020 | } |
|
|
3021 | |
|
|
3022 | my @args = @ARGV; |
|
|
3023 | |
|
|
3024 | # OS X passes some process serial number of other shit. they |
|
|
3025 | # could have used an env var or any other sane mechanism. but |
|
|
3026 | # would it be os x then? no... |
|
|
3027 | shift @args if $args[0] =~ /^-psn_/; |
|
|
3028 | |
|
|
3029 | my $profile = 'default'; |
|
|
3030 | |
|
|
3031 | for (my $i = 0; $i < @args; $i++) { |
|
|
3032 | if ($args[$i] =~ /^--?profile$/) { |
|
|
3033 | $profile = $args[$i + 1]; |
|
|
3034 | splice @args, $i, 2, (); |
|
|
3035 | $i = 0; |
|
|
3036 | } elsif ($args[$i] =~ /^--?h/) { |
|
|
3037 | print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n"; |
|
|
3038 | exit 0; |
|
|
3039 | } |
2974 | } |
3040 | } |
|
|
3041 | |
2975 | |
3042 | $CFG->{profile}{$profile} ||= {}; |
2976 | DC::DB::open_db; |
3043 | $PROFILE = $CFG->{profile}{$profile}; |
|
|
3044 | $PROFILE->{host} ||= "gameserver.deliantra.net"; |
|
|
3045 | |
2977 | |
3046 | $PROFILE->{host} = $args[0] if @args > 0; |
2978 | DC::UI::set_layout ($::CFG->{layout}); |
3047 | $PROFILE->{user} = $args[1] if @args > 1; |
|
|
3048 | $PROFILE->{password} = $args[2] if @args > 2; |
|
|
3049 | |
2979 | |
3050 | # convert old bindings (only default profile matters) |
2980 | my @args = @ARGV; |
3051 | if (my $bindings = delete $PROFILE->{bindings}) { |
2981 | |
3052 | while (my ($mod, $syms) = each %$bindings) { |
2982 | # OS X passes some process serial number of other shit. they |
3053 | while (my ($sym, $cmds) = each %$syms) { |
2983 | # could have used an env var or any other sane mechanism. but |
3054 | push @{ $PROFILE->{macro} }, { |
2984 | # would it be os x then? no... |
3055 | accelkey => [$mod*1, $sym*1], |
2985 | shift @args if $args[0] =~ /^-psn_/; |
3056 | action => $cmds, |
2986 | |
|
|
2987 | my $profile = 'default'; |
|
|
2988 | |
|
|
2989 | for (my $i = 0; $i < @args; $i++) { |
|
|
2990 | if ($args[$i] =~ /^--?profile$/) { |
|
|
2991 | $profile = $args[$i + 1]; |
|
|
2992 | splice @args, $i, 2, (); |
3057 | }; |
2993 | $i = 0; |
|
|
2994 | } elsif ($args[$i] =~ /^--?h/) { |
|
|
2995 | print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n"; |
|
|
2996 | exit 0; |
3058 | } |
2997 | } |
3059 | } |
2998 | } |
|
|
2999 | |
|
|
3000 | $CFG->{profile}{$profile} ||= {}; |
|
|
3001 | $PROFILE = $CFG->{profile}{$profile}; |
|
|
3002 | $PROFILE->{host} ||= "gameserver.deliantra.net"; |
|
|
3003 | |
|
|
3004 | $PROFILE->{host} = $args[0] if @args > 0; |
|
|
3005 | $PROFILE->{user} = $args[1] if @args > 1; |
|
|
3006 | $PROFILE->{password} = $args[2] if @args > 2; |
|
|
3007 | |
|
|
3008 | # convert old bindings (only default profile matters) |
|
|
3009 | if (my $bindings = delete $PROFILE->{bindings}) { |
|
|
3010 | while (my ($mod, $syms) = each %$bindings) { |
|
|
3011 | while (my ($sym, $cmds) = each %$syms) { |
|
|
3012 | push @{ $PROFILE->{macro} }, { |
|
|
3013 | accelkey => [$mod*1, $sym*1], |
|
|
3014 | action => $cmds, |
|
|
3015 | }; |
|
|
3016 | } |
|
|
3017 | } |
3060 | } |
3018 | } |
3061 | |
3019 | |
3062 | # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed |
3020 | # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed |
3063 | # these are ignored under windows, for some reason, and thus set in the loader |
3021 | # these are ignored under windows, for some reason, and thus set in the loader |
3064 | $ENV{FONTCONFIG_FILE} = "fonts.conf"; |
3022 | $ENV{FONTCONFIG_FILE} = "fonts.conf"; |
3065 | $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts"; |
3023 | $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts"; |
3066 | $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions |
3024 | $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions |
3067 | |
3025 | |
3068 | { |
3026 | { |
3069 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
3027 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
3070 | DejaVuSans.ttf |
3028 | DejaVuSans.ttf |
3071 | DejaVuSansMono.ttf |
3029 | DejaVuSansMono.ttf |
3072 | DejaVuSans-Bold.ttf |
3030 | DejaVuSans-Bold.ttf |
3073 | DejaVuSansMono-Bold.ttf |
3031 | DejaVuSansMono-Bold.ttf |
3074 | DejaVuSans-Oblique.ttf |
3032 | DejaVuSans-Oblique.ttf |
3075 | DejaVuSansMono-Oblique.ttf |
3033 | DejaVuSansMono-Oblique.ttf |
3076 | DejaVuSans-BoldOblique.ttf |
3034 | DejaVuSans-BoldOblique.ttf |
3077 | DejaVuSansMono-BoldOblique.ttf |
3035 | DejaVuSansMono-BoldOblique.ttf |
3078 | mona.ttf |
3036 | mona.ttf |
3079 | ); |
3037 | ); |
3080 | |
3038 | |
3081 | DC::add_font $_ for @fonts; |
3039 | DC::add_font $_ for @fonts; |
3082 | |
3040 | |
3083 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
3041 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
3084 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
3042 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
3085 | |
3043 | |
3086 | $FONT_PROP->make_default; |
3044 | $FONT_PROP->make_default; |
3087 | |
3045 | |
3088 | DC::pango_init; |
3046 | DC::pango_init; |
3089 | } |
3047 | } |
3090 | |
3048 | |
3091 | # compare mono (ft) vs. rgba (cairo) |
3049 | # compare mono (ft) vs. rgba (cairo) |
3092 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
3050 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
3093 | # for my $rgba (0..1) { |
3051 | # for my $rgba (0..1) { |
3094 | # my $t1 = Time::HiRes::time; |
3052 | # my $t1 = Time::HiRes::time; |
… | |
… | |
3099 | # } |
3057 | # } |
3100 | # my $t2 = Time::HiRes::time; |
3058 | # my $t2 = Time::HiRes::time; |
3101 | # warn $t2-$t1; |
3059 | # warn $t2-$t1; |
3102 | # } |
3060 | # } |
3103 | |
3061 | |
|
|
3062 | } |
|
|
3063 | |
|
|
3064 | DC::SDL_Init 0; |
3104 | DC::IMG_Init; video_init; |
3065 | DC::IMG_Init; video_init; |
3105 | DC::Mix_Init; audio_init; |
3066 | DC::Mix_Init; audio_init; |
3106 | } |
|
|
3107 | |
3067 | |
3108 | show_tip_of_the_day if $CFG->{show_tips}; |
3068 | show_tip_of_the_day if $CFG->{show_tips}; |
3109 | |
3069 | |
3110 | my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { |
3070 | my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { |
3111 | undef $STARTUP_CANCEL; |
3071 | undef $STARTUP_CANCEL; |
3112 | (pop @::STARTUP_DONE)->() |
3072 | (pop @::STARTUP_DONE)->() |
3113 | while @::STARTUP_DONE; |
3073 | while @::STARTUP_DONE; |
|
|
3074 | }; |
|
|
3075 | |
|
|
3076 | debug_toggle 0; |
|
|
3077 | |
|
|
3078 | delete $SIG{__DIE__}; |
|
|
3079 | EV::loop; |
|
|
3080 | |
|
|
3081 | DC::save_cfg if $CFG->{config_autosave}; |
|
|
3082 | |
|
|
3083 | #video_shutdown; |
|
|
3084 | #audio_shutdown; |
|
|
3085 | |
|
|
3086 | DC::OpenGL::quit; |
|
|
3087 | DC::SDL_Quit; |
|
|
3088 | DC::DB::Server::stop; |
3114 | }; |
3089 | }; |
3115 | |
|
|
3116 | debug_toggle 0; |
|
|
3117 | |
|
|
3118 | delete $SIG{__DIE__}; |
|
|
3119 | EV::loop; |
|
|
3120 | |
|
|
3121 | DC::write_cfg if $CFG->{config_autosave}; |
|
|
3122 | |
|
|
3123 | #video_shutdown; |
|
|
3124 | #audio_shutdown; |
|
|
3125 | |
|
|
3126 | DC::OpenGL::quit; |
|
|
3127 | DC::SDL_Quit; |
|
|
3128 | DC::DB::Server::stop; |
|
|
3129 | } |
3090 | } |
3130 | |
|
|
3131 | *DC::Main::run = \&DC::SDL_braino; # see sub above |
|
|
3132 | |
3091 | |
3133 | 1 |
3092 | 1 |