… | |
… | |
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 | |
28 | use Deliantra; |
29 | use Deliantra; |
|
|
30 | use Deliantra::Util; |
29 | use Deliantra::Protocol::Constants; |
31 | use Deliantra::Protocol::Constants; |
30 | |
32 | |
31 | use AnyEvent::Util (); |
33 | use AnyEvent::Util (); |
32 | use AnyEvent::Socket (); |
34 | use AnyEvent::Socket (); |
33 | use AnyEvent::DNS (); |
35 | use AnyEvent::DNS (); |
34 | |
36 | |
35 | use Compress::LZF; |
37 | use Compress::LZF; |
36 | use JSON::XS; |
38 | use JSON::XS; |
|
|
39 | use Urlader; |
37 | |
40 | |
38 | use DC; |
41 | use DC; |
39 | |
42 | |
40 | sub crash($;$) { |
43 | sub crash($;$) { |
41 | # nop at compiletime |
44 | # nop at compiletime |
… | |
… | |
43 | |
46 | |
44 | BEGIN { |
47 | BEGIN { |
45 | $SIG{__DIE__} = sub { |
48 | $SIG{__DIE__} = sub { |
46 | return if $^S; # quick reject |
49 | return if $^S; # quick reject |
47 | |
50 | |
48 | # return if there are any eval contexts in the csall stack |
51 | # return if there are any eval contexts in the call stack |
49 | for my $i (0..999) { |
52 | for my $i (0..999) { |
50 | my ($sub, $is_require) = (caller $i)[3, 7] |
53 | my ($sub, $is_require) = (caller $i)[3, 7] |
51 | or last; |
54 | or last; |
52 | return if $sub eq "(eval)" && !$is_require; |
55 | return if $sub eq "(eval)" && !$is_require; |
53 | } |
56 | } |
… | |
… | |
56 | DC::fatal Carp::longmess "$_[0]"; |
59 | DC::fatal Carp::longmess "$_[0]"; |
57 | } |
60 | } |
58 | } |
61 | } |
59 | |
62 | |
60 | use DC::OpenGL (); |
63 | use DC::OpenGL (); |
|
|
64 | use DC::Audio (); |
61 | use DC::Protocol; |
65 | use DC::Protocol; |
62 | use DC::DB; |
66 | use DC::DB; |
63 | use DC::UI; |
67 | use DC::UI; |
64 | use DC::UI::Canvas; |
68 | use DC::UI::Canvas; |
65 | use DC::UI::Inventory; |
69 | use DC::UI::Inventory; |
… | |
… | |
125 | our $MENUBAR; # the hbox at the top |
129 | our $MENUBAR; # the hbox at the top |
126 | our $MENUPOPUP; |
130 | our $MENUPOPUP; |
127 | our $BUTTONBAR; # the menu buttons |
131 | our $BUTTONBAR; # the menu buttons |
128 | our $METASERVER; |
132 | our $METASERVER; |
129 | our $LOGIN_BUTTON; |
133 | our $LOGIN_BUTTON; |
|
|
134 | our $LOGIN_ERROR; |
130 | our $QUIT_DIALOG; |
135 | our $QUIT_DIALOG; |
131 | our $HOST_ENTRY; |
136 | our $HOST_ENTRY; |
132 | our $FULLSCREEN_ENABLE; |
137 | our $FULLSCREEN_ENABLE; |
133 | our $PICKUP_ENABLE; |
138 | our $PICKUP_ENABLE; |
134 | our $SERVER_INFO; |
139 | our $SERVER_INFO; |
… | |
… | |
195 | AnyEvent::Util::fh_nonblocking $fh, 1; |
200 | AnyEvent::Util::fh_nonblocking $fh, 1; |
196 | |
201 | |
197 | $msg =~ s/\s+$//; |
202 | $msg =~ s/\s+$//; |
198 | |
203 | |
199 | # backtrace as second step, in case it crashes, too |
204 | # backtrace as second step, in case it crashes, too |
200 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" |
205 | crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated" |
201 | if $backtrace; |
206 | if $backtrace; |
202 | }; |
207 | }; |
203 | |
208 | |
204 | sub clienterror($;$) { |
209 | sub clienterror($;$) { |
205 | my ($msg, $backtrace) = @_; |
210 | my ($msg, $backtrace) = @_; |
… | |
… | |
207 | warn $msg; |
212 | warn $msg; |
208 | |
213 | |
209 | return unless $CONN; |
214 | return unless $CONN; |
210 | |
215 | |
211 | $CONN->send_exti_msg (clientlog => $msg); |
216 | $CONN->send_exti_msg (clientlog => $msg); |
212 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace; |
217 | $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace; |
213 | } |
218 | } |
214 | |
219 | |
215 | ############################################################################# |
220 | ############################################################################# |
216 | |
221 | |
217 | sub status { |
222 | sub status { |
… | |
… | |
248 | : "[<span foreground='#888'>num</span>]"; |
253 | : "[<span foreground='#888'>num</span>]"; |
249 | |
254 | |
250 | # <tt> around next statement works around some bug that keeps the |
255 | # <tt> around next statement works around some bug that keeps the |
251 | # "font =>" from being used on windows |
256 | # "font =>" from being used on windows |
252 | $MODBOX->set_markup ("<tt>$markup</tt>"); |
257 | $MODBOX->set_markup ("<tt>$markup</tt>"); |
|
|
258 | } |
|
|
259 | |
|
|
260 | sub errorbox { |
|
|
261 | my ($msg) = @_; |
|
|
262 | |
|
|
263 | status $msg; |
|
|
264 | |
|
|
265 | my $dialog = new DC::UI::Toplevel |
|
|
266 | x => "center", |
|
|
267 | y => "center", |
|
|
268 | z => 200, |
|
|
269 | title => "Error", |
|
|
270 | child => my $vbox = new DC::UI::VBox, |
|
|
271 | has_close_button => 1, |
|
|
272 | on_delete => sub { |
|
|
273 | $_[0]->destroy; |
|
|
274 | }, |
|
|
275 | ; |
|
|
276 | |
|
|
277 | add $vbox new DC::UI::Label |
|
|
278 | align => 0.5, |
|
|
279 | ellipsise => 0, |
|
|
280 | text => $msg; |
|
|
281 | |
|
|
282 | add $vbox new DC::UI::Button |
|
|
283 | expand => 1, |
|
|
284 | text => "OK", |
|
|
285 | on_activate => sub { |
|
|
286 | $dialog->destroy; |
|
|
287 | 0 |
|
|
288 | } |
|
|
289 | ; |
|
|
290 | |
|
|
291 | $dialog->show; |
253 | } |
292 | } |
254 | |
293 | |
255 | ############################################################################# |
294 | ############################################################################# |
256 | #TODO: maybe move into own audio module... |
295 | #TODO: maybe move into own audio module... |
257 | |
296 | |
… | |
… | |
472 | audio_music_push; |
511 | audio_music_push; |
473 | } |
512 | } |
474 | |
513 | |
475 | sub audio_init { |
514 | sub audio_init { |
476 | if ($CFG->{audio_enable}) { |
515 | if ($CFG->{audio_enable}) { |
477 | if (length $CFG->{audio_driver}) { |
516 | DC::Audio::init; |
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 | |
517 | |
493 | if ($SDL_MIXER) { |
518 | if ($SDL_MIXER) { |
494 | DC::Mix_AllocateChannels $CFG->{audio_mix_channels}; |
|
|
495 | |
|
|
496 | audio_music_finished; |
519 | audio_music_finished; |
497 | } else { |
520 | } else { |
498 | status "Unable to open sound device: there will be no sound"; |
521 | status "Unable to open sound device: there will be no sound"; |
499 | } |
522 | } |
500 | } else { |
523 | } else { |
… | |
… | |
522 | |
545 | |
523 | DC::Mix_CloseAudio if $SDL_MIXER; |
546 | DC::Mix_CloseAudio if $SDL_MIXER; |
524 | undef $SDL_MIXER; |
547 | undef $SDL_MIXER; |
525 | |
548 | |
526 | DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO; |
549 | DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO; |
|
|
550 | } |
|
|
551 | |
|
|
552 | ############################################################################# |
|
|
553 | # Over-the-air updates |
|
|
554 | |
|
|
555 | sub ota_update { |
|
|
556 | my ($face, $size, $md5) = @_; |
|
|
557 | |
|
|
558 | my $coro = Coro::async_pool { |
|
|
559 | my $override = "$Urlader::EXE_DIR/override"; |
|
|
560 | |
|
|
561 | $MESSAGE_DIST->add_channel ({ |
|
|
562 | id => "ota_update", |
|
|
563 | title => "Update", |
|
|
564 | tooltip => "<b>Software Update Log</b>", |
|
|
565 | }); |
|
|
566 | |
|
|
567 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." }); |
|
|
568 | |
|
|
569 | my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777; |
|
|
570 | |
|
|
571 | unless ($fh) { |
|
|
572 | $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") }); |
|
|
573 | return; |
|
|
574 | } |
|
|
575 | |
|
|
576 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." }); |
|
|
577 | |
|
|
578 | my $cv = AE::cv; |
|
|
579 | my $error; |
|
|
580 | |
|
|
581 | $cv->begin (Coro::rouse_cb); |
|
|
582 | $CONN->ask_face ( |
|
|
583 | $face, |
|
|
584 | -1000, |
|
|
585 | sub { |
|
|
586 | $STATUSBOX->add ( |
|
|
587 | (sprintf "update download: %d/%d", $size - $_[1], $size), |
|
|
588 | pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1] |
|
|
589 | ); |
|
|
590 | |
|
|
591 | $cv->begin; |
|
|
592 | my $len = length $_[2]; |
|
|
593 | IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub { |
|
|
594 | $error ||= $_[0] != $len; |
|
|
595 | $cv->end; |
|
|
596 | }; |
|
|
597 | }, |
|
|
598 | sub { |
|
|
599 | $cv->end; |
|
|
600 | }, |
|
|
601 | ); |
|
|
602 | |
|
|
603 | Coro::rouse_wait; |
|
|
604 | |
|
|
605 | $STATUSBOX->clr_group ("ota_update"); |
|
|
606 | |
|
|
607 | $error ||= Coro::AIO::aio_fsync $fh; |
|
|
608 | $error ||= Coro::AIO::aio_close $fh; |
|
|
609 | |
|
|
610 | if ($error) { |
|
|
611 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." }); |
|
|
612 | Coro::AIO::aio_unlink "$override.tmp"; |
|
|
613 | return; |
|
|
614 | } |
|
|
615 | |
|
|
616 | { |
|
|
617 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." }); |
|
|
618 | |
|
|
619 | my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0; |
|
|
620 | |
|
|
621 | if ($fh) { |
|
|
622 | $error ||= Coro::AIO::aio_stat "$override.tmp"; |
|
|
623 | $error ||= -s _ != $size; |
|
|
624 | Coro::AIO::aio_readahead $fh, 0, $size; |
|
|
625 | |
|
|
626 | my $f_md5 = new Digest::MD5; |
|
|
627 | binmode $fh; # ugh :( |
|
|
628 | $f_md5->addfile ($fh); |
|
|
629 | $f_md5 = $f_md5->hexdigest; |
|
|
630 | $error ||= $md5 ne $f_md5; |
|
|
631 | } |
|
|
632 | } |
|
|
633 | |
|
|
634 | if ($error) { |
|
|
635 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." }); |
|
|
636 | Coro::AIO::aio_unlink "$override.tmp"; |
|
|
637 | return; |
|
|
638 | } |
|
|
639 | |
|
|
640 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." }); |
|
|
641 | |
|
|
642 | if (Coro::AIO::aio_rename "$override.tmp", $override) { |
|
|
643 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." }); |
|
|
644 | Coro::AIO::aio_unlink "$override.tmp"; |
|
|
645 | } |
|
|
646 | |
|
|
647 | $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." }); |
|
|
648 | }; |
|
|
649 | |
|
|
650 | $CONN->{ota_update} = Guard::guard { |
|
|
651 | $coro->cancel; |
|
|
652 | }; |
|
|
653 | } |
|
|
654 | |
|
|
655 | sub ota_update_ask { |
|
|
656 | my ($ok, $face, $ver, $size, $md5, $changes) = @_; |
|
|
657 | |
|
|
658 | $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel |
|
|
659 | x => "center", |
|
|
660 | y => "center", |
|
|
661 | z => 55, |
|
|
662 | force_w => $::WIDTH * 0.7, |
|
|
663 | force_h => $::HEIGHT * 0.7, |
|
|
664 | title => "Software update available", |
|
|
665 | child => my $vbox = new DC::UI::VBox, |
|
|
666 | ; |
|
|
667 | |
|
|
668 | $vbox->add (new DC::UI::Label |
|
|
669 | ellipsise => 0, |
|
|
670 | text => "The server offers a software update, " |
|
|
671 | . "do you want to start downloading this update in the background?", |
|
|
672 | ); |
|
|
673 | |
|
|
674 | $vbox->add (new DC::UI::FancyFrame |
|
|
675 | expand => 1, |
|
|
676 | label => "Details", |
|
|
677 | child => (new DC::UI::TextScroller |
|
|
678 | expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4, |
|
|
679 | par => [{ |
|
|
680 | markup => "<tt>Old revision: $Urlader::EXE_VER\n" |
|
|
681 | . "New revision: $ver\n" |
|
|
682 | . "Download size: $size bytes</tt>\n\n" |
|
|
683 | . "Changes:\n\n" |
|
|
684 | . DC::asxml $changes |
|
|
685 | }], |
|
|
686 | ), |
|
|
687 | ); |
|
|
688 | |
|
|
689 | $vbox->add (my $hbox = new DC::UI::HBox); |
|
|
690 | |
|
|
691 | $hbox->add (new DC::UI::Button |
|
|
692 | expand => 1, |
|
|
693 | text => "Not now", |
|
|
694 | on_activate => sub { |
|
|
695 | $dialog->destroy; |
|
|
696 | 0 |
|
|
697 | } |
|
|
698 | ); |
|
|
699 | $hbox->add (new DC::UI::Button |
|
|
700 | expand => 1, |
|
|
701 | text => "Yes, start downloading", |
|
|
702 | on_activate => sub { |
|
|
703 | $dialog->destroy; |
|
|
704 | ota_update $face, $size, $md5; |
|
|
705 | 0 |
|
|
706 | }, |
|
|
707 | ); |
|
|
708 | |
|
|
709 | $dialog->show; |
|
|
710 | } |
|
|
711 | |
|
|
712 | sub ota_update_check { |
|
|
713 | return unless defined $Urlader::EXE_ID; |
|
|
714 | |
|
|
715 | ::message { markup => "Checking for software update..." }; |
|
|
716 | |
|
|
717 | $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub { |
|
|
718 | my ($ok, $face, $ver, $size, $md5, $changes) = @_; |
|
|
719 | |
|
|
720 | if ($ok) { |
|
|
721 | if (defined $ver) { |
|
|
722 | ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." }; |
|
|
723 | &ota_update_ask; |
|
|
724 | } else { |
|
|
725 | ::message { markup => "Server has no newer version." }; |
|
|
726 | } |
|
|
727 | } else { |
|
|
728 | ::message { markup => "Server does not support software update." }; |
|
|
729 | } |
|
|
730 | |
|
|
731 | () |
|
|
732 | }); |
527 | } |
733 | } |
528 | |
734 | |
529 | ############################################################################# |
735 | ############################################################################# |
530 | |
736 | |
531 | sub destroy_query_dialog { |
737 | sub destroy_query_dialog { |
… | |
… | |
758 | $vbox->add (@dialog); |
964 | $vbox->add (@dialog); |
759 | $dialog->show; |
965 | $dialog->show; |
760 | } |
966 | } |
761 | |
967 | |
762 | sub dc_connect { |
968 | sub dc_connect { |
763 | my ($host, $port) = @_; |
969 | my ($host, $port, $create) = @_; |
764 | |
970 | |
765 | my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
971 | my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32; |
766 | my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32; |
972 | my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32; |
767 | |
973 | |
768 | $CONN = |
974 | $CONN = |
769 | new DC::Protocol |
975 | new DC::Protocol |
770 | host => $host, |
976 | host => $host, |
771 | port => $port, |
977 | port => $port, |
|
|
978 | create_login => $create, |
772 | user => $PROFILE->{user}, |
979 | user => $PROFILE->{user}, |
773 | pass => $PROFILE->{password}, |
980 | pass => (pack "H*", $PROFILE->{password}), |
774 | mapw => $mapw, |
981 | mapw => $mapw, |
775 | maph => $maph, |
982 | maph => $maph, |
776 | |
983 | |
777 | c_version => { |
984 | c_version => { |
778 | client => "deliantra", |
985 | client => "deliantra", |
779 | clientver => $DC::VERSION, |
986 | clientver => "$DC::VERSION$Urlader::EXE_VER", |
780 | gl_vendor => DC::OpenGL::gl_vendor, |
987 | gl_vendor => DC::OpenGL::gl_vendor, |
781 | gl_version => DC::OpenGL::gl_version, |
988 | gl_version => DC::OpenGL::gl_version, |
782 | }, |
989 | }, |
783 | |
990 | |
784 | map_widget => $MAPWIDGET, |
991 | map_widget => $MAPWIDGET, |
… | |
… | |
793 | |
1000 | |
794 | on_connect => sub { |
1001 | on_connect => sub { |
795 | if ($_[0]) { |
1002 | if ($_[0]) { |
796 | DC::lowdelay fileno $CONN->{fh}; |
1003 | DC::lowdelay fileno $CONN->{fh}; |
797 | |
1004 | |
|
|
1005 | ota_update_check; |
|
|
1006 | |
798 | status "successfully connected to the server"; |
1007 | status "successfully connected to the server"; |
799 | } else { |
1008 | } else { |
800 | undef $CONN; |
1009 | undef $CONN; |
801 | status "unable to connect: $!"; |
1010 | $LOGIN_ERROR->{fg} = [1, 0, 0]; |
|
|
1011 | $LOGIN_ERROR->set_text ("Unable to connect to server: $!"); |
802 | stop_game(); |
1012 | stop_game(); |
803 | } |
1013 | } |
804 | }, |
1014 | }, |
|
|
1015 | |
|
|
1016 | on_addme => sub { |
|
|
1017 | my ($ok, $msg) = @_; |
|
|
1018 | |
|
|
1019 | $LOGIN_ERROR->{fg} = $ok ? [0, 1, 0] : [1, 0, 0]; |
|
|
1020 | $LOGIN_ERROR->set_text ($msg); |
|
|
1021 | }, |
805 | ; |
1022 | ; |
806 | } |
1023 | } |
807 | |
1024 | |
808 | sub start_game { |
1025 | sub start_game($) { |
|
|
1026 | my ($create) = @_; |
|
|
1027 | |
809 | status "logging in..."; |
1028 | status "logging in..."; |
810 | |
1029 | |
811 | my $server = $PROFILE->{host} || $DEFAULT_SERVER; |
1030 | my $server = $PROFILE->{host} || $DEFAULT_SERVER; |
812 | my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327" |
1031 | my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327" |
813 | or return status "$server: unable to parse server address, try an empty field."; |
1032 | or return status "$server: unable to parse server address, try an empty field."; |
… | |
… | |
828 | status "dns failure, using hardcoded address"; |
1047 | status "dns failure, using hardcoded address"; |
829 | $host = "194.126.175.154"; |
1048 | $host = "194.126.175.154"; |
830 | } |
1049 | } |
831 | } |
1050 | } |
832 | |
1051 | |
833 | dc_connect $host, $port; |
1052 | dc_connect $host, $port, $create; |
834 | }; |
1053 | }; |
835 | } else { |
1054 | } else { |
836 | dc_connect $host, $port; |
1055 | dc_connect $host, $port, $create; |
837 | } |
1056 | } |
838 | } |
1057 | } |
839 | |
1058 | |
840 | sub stop_game { |
1059 | sub stop_game { |
841 | crash "stop_game"; |
1060 | crash "stop_game"; |
… | |
… | |
959 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); |
1178 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); |
960 | $table->add_at (1, $row++, new DC::UI::CheckBox |
1179 | $table->add_at (1, $row++, new DC::UI::CheckBox |
961 | state => $CFG->{texture_compression}, |
1180 | state => $CFG->{texture_compression}, |
962 | tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " |
1181 | tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " |
963 | . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " |
1182 | . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " |
964 | . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " |
1183 | . "The compression algorithm can differ from card to card, so your mileage may vary. This setting is ignored in " |
965 | . "forced OpenGL 1.1 mode and when using the Apple renderer.", |
1184 | . "forced OpenGL 1.1 mode and when using the Apple renderer.", |
966 | on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } |
1185 | on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } |
967 | ); |
1186 | ); |
968 | |
1187 | |
969 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); |
1188 | $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); |
… | |
… | |
1674 | $vbox->add (new DC::UI::FancyFrame |
1893 | $vbox->add (new DC::UI::FancyFrame |
1675 | label => "Login Settings", |
1894 | label => "Login Settings", |
1676 | child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), |
1895 | child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), |
1677 | ); |
1896 | ); |
1678 | |
1897 | |
|
|
1898 | my $nullpw = "\x00" x 16; |
|
|
1899 | |
1679 | $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); |
1900 | $table->add_at (0, 0, new DC::UI::Label align => 1, text => "Username"); |
1680 | $table->add_at (1, 4, new DC::UI::Entry |
1901 | $table->add_at (1, 0, new DC::UI::Entry |
1681 | text => $PROFILE->{user}, |
1902 | text => $PROFILE->{user}, |
1682 | tooltip => "The name of your character on the server. The name is case-sensitive!", |
1903 | tooltip => "The name of your character on the server. The name is case-sensitive!", |
1683 | on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 } |
1904 | on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 } |
1684 | ); |
1905 | ); |
1685 | |
1906 | |
1686 | $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); |
1907 | $table->add_at (0, 1, new DC::UI::Label align => 1, text => "Password"); |
1687 | $table->add_at (1, 5, new DC::UI::Entry |
1908 | $table->add_at (1, 1, my $pw1 = new DC::UI::Entry |
1688 | text => $PROFILE->{password}, |
1909 | text => $PROFILE->{password} ? $nullpw : "", |
1689 | hidden => 1, |
1910 | hidden => 1, |
1690 | tooltip => "The password for your character.", |
1911 | tooltip => "The password for your character.", |
1691 | on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 } |
1912 | on_focus_in => sub { |
|
|
1913 | my ($self) = @_; |
|
|
1914 | $self->set_text ("") |
|
|
1915 | if $self->{text} eq $nullpw; |
|
|
1916 | 0 |
|
|
1917 | }, |
|
|
1918 | on_changed => sub { |
|
|
1919 | my ($self, $value) = @_; |
|
|
1920 | $PROFILE->{password} = unpack "H*", Deliantra::Util::hash_pw $value |
|
|
1921 | if length $value && $value ne $nullpw; |
|
|
1922 | 1 |
|
|
1923 | }, |
1692 | ); |
1924 | ); |
1693 | |
1925 | |
1694 | $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button |
1926 | $table->add_at (1, 2, $LOGIN_BUTTON = new DC::UI::Button |
1695 | expand => 1, |
1927 | expand => 1, |
1696 | text => "Login / Register", |
1928 | text => "Login to Existing Account", |
1697 | tooltip => "This button will either login to the account configured above or register a new account.", |
1929 | tooltip => "This button will login to the account given by the <b>Username</b> and <b>Password</b> fields above.", |
1698 | on_activate => sub { |
1930 | on_activate => sub { |
1699 | $CONN ? stop_game |
1931 | $CONN ? stop_game |
1700 | : start_game; |
1932 | : start_game 0; |
1701 | 1 |
1933 | 1 |
1702 | }, |
1934 | }, |
1703 | ); |
1935 | ); |
1704 | |
1936 | |
|
|
1937 | $table->add_at (0, 3, new DC::UI::Label align => 1, text => "Password"); |
|
|
1938 | $table->add_at (1, 3, my $pw2 = new DC::UI::Entry |
|
|
1939 | hidden => 1, |
|
|
1940 | tooltip => "The new password for your character", |
|
|
1941 | ); |
|
|
1942 | |
|
|
1943 | $table->add_at (1, 4, new DC::UI::Button |
|
|
1944 | expand => 1, |
|
|
1945 | text => "Create New Account", |
|
|
1946 | tooltip => "This button will try to create a new account - you need to fill out the <b>Username</b> and the two <b>Password</b> fields above, using the same password for both <b>Password</b> fields.", |
|
|
1947 | on_activate => sub { |
|
|
1948 | if ($pw1->{text} ne $pw2->{text}) { |
|
|
1949 | $LOGIN_ERROR->{fg} = [1, 0, 0]; |
|
|
1950 | $LOGIN_ERROR->set_text ("The passwords do not match - try to enter them again."); |
|
|
1951 | } else { |
|
|
1952 | $CONN or start_game 1; |
|
|
1953 | } |
|
|
1954 | 1 |
|
|
1955 | }, |
|
|
1956 | ); |
|
|
1957 | |
|
|
1958 | $vbox->add (new DC::UI::FancyFrame |
|
|
1959 | label => "Server Message", |
|
|
1960 | tooltip => "The last message, or error, from the server.", |
|
|
1961 | child => ($LOGIN_ERROR = new DC::UI::Label valign => 0, ellipsise => 0), |
|
|
1962 | ); |
|
|
1963 | |
1705 | $vbox->add (new DC::UI::FancyFrame |
1964 | $vbox->add (new DC::UI::FancyFrame |
1706 | label => "How to Play", |
1965 | label => "How to Play", |
1707 | min_h => 240, |
1966 | min_h => 240,#d# should not be necessary - widget bug |
1708 | child => (new DC::UI::Label valign => 0, ellipsise => 0, |
1967 | child => (new DC::UI::Label valign => 0, ellipsise => 0, |
1709 | markup => |
1968 | markup => |
1710 | "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n" |
1969 | "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n" |
1711 | . "Then register a new account (or use an existing one if you have one). " |
1970 | . "Then create a new account (or use an existing one if you have one).\n\n" |
1712 | . "To register an account, choose a username that hasn't been taken yet (just guess) and " |
1971 | . "To create an account, choose a username that hasn't been taken yet (just guess) and " |
1713 | . "try to log-in. Follow the instructions in the Log tab in the message window.", |
1972 | . "fill out the top two <b>Password</b> fields using the same password, then press <b>Create New Account</b>.", |
1714 | ), |
1973 | ), |
1715 | ); |
1974 | ); |
1716 | |
1975 | |
1717 | $vbox |
1976 | $vbox |
1718 | } |
1977 | } |
… | |
… | |
1836 | $table->add_at (2, $row++, new DC::UI::Button |
2095 | $table->add_at (2, $row++, new DC::UI::Button |
1837 | text => "Save Now", |
2096 | text => "Save Now", |
1838 | tooltip => "Use this to manually save configuration and UI layout when " |
2097 | tooltip => "Use this to manually save configuration and UI layout when " |
1839 | . "autosave is disabled.", |
2098 | . "autosave is disabled.", |
1840 | on_activate => sub { |
2099 | on_activate => sub { |
1841 | DC::write_cfg; |
2100 | DC::save_cfg; |
1842 | 0 |
2101 | 0 |
1843 | } |
2102 | } |
1844 | ); |
2103 | ); |
1845 | } |
2104 | } |
1846 | |
2105 | |
… | |
… | |
1855 | $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => ""); |
2114 | $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)"); |
2115 | $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 => ""); |
2116 | $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)"); |
2117 | $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 => ""); |
2118 | $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)"); |
2119 | $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 => ""); |
2120 | $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => ""); |
1862 | } |
2121 | } |
1863 | |
2122 | |
1864 | $vbox |
2123 | $vbox |
1865 | } |
2124 | } |
… | |
… | |
2279 | sub open_quit_dialog { |
2538 | sub open_quit_dialog { |
2280 | unless ($QUIT_DIALOG) { |
2539 | unless ($QUIT_DIALOG) { |
2281 | $QUIT_DIALOG = new DC::UI::Toplevel |
2540 | $QUIT_DIALOG = new DC::UI::Toplevel |
2282 | x => "center", |
2541 | x => "center", |
2283 | y => "center", |
2542 | y => "center", |
2284 | z => 50, |
2543 | z => 60, |
2285 | title => "Really Quit?", |
2544 | title => "Really Quit?", |
2286 | on_key_down => sub { |
2545 | on_key_down => sub { |
2287 | my ($dialog, $ev) = @_; |
2546 | my ($dialog, $ev) = @_; |
2288 | $ev->{sym} == 27 and $dialog->hide; |
2547 | $ev->{sym} == 27 and $dialog->hide; |
2289 | } |
2548 | } |
… | |
… | |
2336 | make_playerbook; |
2595 | make_playerbook; |
2337 | |
2596 | |
2338 | $MENUPOPUP = DC::UI::Menu->new (items => [ |
2597 | $MENUPOPUP = DC::UI::Menu->new (items => [ |
2339 | ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }], |
2598 | ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }], |
2340 | ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }], |
2599 | ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }], |
2341 | ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }], |
2600 | ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }], |
2342 | ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }], |
2601 | ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }], |
2343 | ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }], |
2602 | ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }], |
2344 | ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }], |
2603 | ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }], |
2345 | ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }], |
2604 | ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }], |
2346 | ["Quit…" , sub { |
2605 | ["Quit…" , sub { |
2347 | if ($CONN) { |
2606 | if ($CONN) { |
2348 | open_quit_dialog; |
2607 | open_quit_dialog; |
2349 | } else { |
2608 | } else { |
2350 | EV::unloop EV::UNLOOP_ALL; |
2609 | EV::break EV::BREAK_ALL; |
2351 | } |
2610 | } |
2352 | }], |
2611 | }], |
2353 | ]); |
2612 | ]); |
2354 | |
2613 | |
2355 | $BUTTONBAR->add (new DC::UI::Button text => "Menu…", |
2614 | $BUTTONBAR->add (new DC::UI::Button text => "Menu…", |
… | |
… | |
2482 | DC::set_theme $CFG->{uitheme}; |
2741 | DC::set_theme $CFG->{uitheme}; |
2483 | |
2742 | |
2484 | DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; |
2743 | DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; |
2485 | $SDL_REINIT = 0; |
2744 | $SDL_REINIT = 0; |
2486 | |
2745 | |
2487 | @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; |
2746 | @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 2; |
2488 | @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; |
2747 | @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; |
2489 | @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; |
2748 | @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; |
2490 | @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
2749 | @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; |
2491 | |
2750 | |
2492 | @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; |
2751 | @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; |
… | |
… | |
2505 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
2764 | my ($old_w, $old_h) = ($WIDTH, $HEIGHT); |
2506 | |
2765 | |
2507 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
2766 | ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; |
2508 | $FULLSCREEN = $CFG->{fullscreen}; |
2767 | $FULLSCREEN = $CFG->{fullscreen}; |
2509 | $FAST = $CFG->{fast}; |
2768 | $FAST = $CFG->{fast}; |
|
|
2769 | |
|
|
2770 | DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init |
2510 | |
2771 | |
2511 | # due to mac os x braindamage, we simply retry with !fullscreen in case of an error |
2772 | # due to mac os x braindamage, we simply retry with !fullscreen in case of an error |
2512 | DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
2773 | DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN |
2513 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
2774 | or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN |
2514 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
2775 | or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; |
… | |
… | |
2724 | delete $animate_object{$widget}; |
2985 | delete $animate_object{$widget}; |
2725 | } |
2986 | } |
2726 | |
2987 | |
2727 | $SDL_CB[DC::SDL_QUIT] = sub { |
2988 | $SDL_CB[DC::SDL_QUIT] = sub { |
2728 | crash "SDL_QUIT"; |
2989 | crash "SDL_QUIT"; |
2729 | EV::unloop EV::UNLOOP_ALL; |
2990 | EV::break EV::BREAK_ALL; |
2730 | }; |
2991 | }; |
2731 | $SDL_CB[DC::SDL_VIDEORESIZE] = sub { }; |
2992 | $SDL_CB[DC::SDL_VIDEORESIZE] = sub { }; |
2732 | $SDL_CB[DC::SDL_VIDEOEXPOSE] = sub { |
2993 | $SDL_CB[DC::SDL_VIDEOEXPOSE] = sub { |
2733 | DC::UI::full_refresh; |
2994 | DC::UI::full_refresh; |
2734 | }; |
2995 | }; |
… | |
… | |
2767 | }; |
3028 | }; |
2768 | |
3029 | |
2769 | ############################################################################# |
3030 | ############################################################################# |
2770 | |
3031 | |
2771 | $SIG{INT} = $SIG{TERM} = sub { |
3032 | $SIG{INT} = $SIG{TERM} = sub { |
2772 | EV::unloop; |
3033 | EV::break; |
2773 | #d# TODO calling exit here hangs the process in some futex |
3034 | #d# TODO calling exit here hangs the process in some futex |
2774 | }; |
3035 | }; |
2775 | |
3036 | |
2776 | # due to mac os x + sdl combined braindamage, we need this contortion |
3037 | # due to mac os x + sdl combined braindamage, we need this contortion |
2777 | sub DC::Main::main { |
3038 | sub DC::Main::run { |
2778 | { |
3039 | DC::SDL_main_hack { |
|
|
3040 | { |
2779 | DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; |
3041 | DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; |
2780 | |
3042 | |
2781 | if (-e "$Deliantra::VARDIR/client.cf") { |
3043 | DC::load_cfg; |
2782 | DC::read_cfg "$Deliantra::VARDIR/client.cf"; |
3044 | DC::upgrade_cfg; |
2783 | } else { |
|
|
2784 | #TODO: compatibility cruft |
|
|
2785 | DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; |
|
|
2786 | print STDERR "INFO: used old configuration file\n"; |
|
|
2787 | } |
|
|
2788 | |
3045 | |
|
|
3046 | DC::Audio::probe; |
|
|
3047 | |
2789 | DC::DB::Server::run; |
3048 | DC::DB::Server::run; |
2790 | |
3049 | |
2791 | if ($CFG->{db_schema} < 1) { |
3050 | if ($CFG->{db_schema} < 1) { |
2792 | warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; |
3051 | warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; |
2793 | DC::DB::nuke_db; |
3052 | DC::DB::nuke_db; |
2794 | $CFG->{db_schema} = 1; |
3053 | $CFG->{db_schema} = 1; |
2795 | DC::write_cfg; |
3054 | DC::save_cfg; |
2796 | } |
|
|
2797 | |
|
|
2798 | DC::DB::open_db; |
|
|
2799 | |
|
|
2800 | DC::UI::set_layout ($::CFG->{layout}); |
|
|
2801 | |
|
|
2802 | my %DEF_CFG = ( |
|
|
2803 | config_autosave => 1, |
|
|
2804 | sdl_mode => undef, |
|
|
2805 | fullscreen => 1, |
|
|
2806 | fast => 0, |
|
|
2807 | force_opengl11 => undef, |
|
|
2808 | disable_alpha => 0, |
|
|
2809 | smooth_movement => 1, |
|
|
2810 | smooth_transitions => 1, |
|
|
2811 | texture_compression => 1, |
|
|
2812 | map_scale => 1, |
|
|
2813 | fow_enable => 1, |
|
|
2814 | fow_intensity => 0, |
|
|
2815 | fow_texture => 0, |
|
|
2816 | map_smoothing => 1, |
|
|
2817 | gui_fontsize => 1, |
|
|
2818 | log_fontsize => 0.7, |
|
|
2819 | gauge_fontsize => 1, |
|
|
2820 | gauge_size => 0.35, |
|
|
2821 | stat_fontsize => 0.7, |
|
|
2822 | mapsize => 100, |
|
|
2823 | audio_enable => 1, |
|
|
2824 | audio_hw_channels => 0, |
|
|
2825 | audio_hw_frequency => 0, |
|
|
2826 | audio_hw_chunksize => 0, |
|
|
2827 | audio_mix_channels => 8, |
|
|
2828 | effects_enable => 1, |
|
|
2829 | effects_volume => 1, |
|
|
2830 | bgm_enable => 1, |
|
|
2831 | bgm_volume => 0.5, |
|
|
2832 | output_rate => "", |
|
|
2833 | pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES, |
|
|
2834 | inv_sort => "mtime", |
|
|
2835 | default => "profile", # default profile |
|
|
2836 | show_tips => 1, |
|
|
2837 | logview_max_par => 1000, |
|
|
2838 | shift_fire_stop => 0, |
|
|
2839 | uitheme => "wood", |
|
|
2840 | map_shift_x => -24, # arbitrary |
|
|
2841 | map_shift_y => +24, # arbitrary |
|
|
2842 | ); |
|
|
2843 | |
|
|
2844 | while (my ($k, $v) = each %DEF_CFG) { |
|
|
2845 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
|
|
2846 | } |
|
|
2847 | |
|
|
2848 | my @args = @ARGV; |
|
|
2849 | |
|
|
2850 | # OS X passes some process serial number of other shit. they |
|
|
2851 | # could have used an env var or any other sane mechanism. but |
|
|
2852 | # would it be os x then? no... |
|
|
2853 | shift @args if $args[0] =~ /^-psn_/; |
|
|
2854 | |
|
|
2855 | my $profile = 'default'; |
|
|
2856 | |
|
|
2857 | for (my $i = 0; $i < @args; $i++) { |
|
|
2858 | if ($args[$i] =~ /^--?profile$/) { |
|
|
2859 | $profile = $args[$i + 1]; |
|
|
2860 | splice @args, $i, 2, (); |
|
|
2861 | $i = 0; |
|
|
2862 | } elsif ($args[$i] =~ /^--?h/) { |
|
|
2863 | print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n"; |
|
|
2864 | exit 0; |
|
|
2865 | } |
3055 | } |
2866 | } |
|
|
2867 | |
3056 | |
2868 | $CFG->{profile}{$profile} ||= {}; |
3057 | DC::DB::open_db; |
2869 | $PROFILE = $CFG->{profile}{$profile}; |
|
|
2870 | $PROFILE->{host} ||= "gameserver.deliantra.net"; |
|
|
2871 | |
3058 | |
2872 | $PROFILE->{host} = $args[0] if @args > 0; |
3059 | DC::UI::set_layout ($::CFG->{layout}); |
2873 | $PROFILE->{user} = $args[1] if @args > 1; |
|
|
2874 | $PROFILE->{password} = $args[2] if @args > 2; |
|
|
2875 | |
3060 | |
2876 | # convert old bindings (only default profile matters) |
3061 | my @args = @ARGV; |
2877 | if (my $bindings = delete $PROFILE->{bindings}) { |
3062 | |
2878 | while (my ($mod, $syms) = each %$bindings) { |
3063 | # OS X passes some process serial number of other shit. they |
2879 | while (my ($sym, $cmds) = each %$syms) { |
3064 | # could have used an env var or any other sane mechanism. but |
2880 | push @{ $PROFILE->{macro} }, { |
3065 | # would it be os x then? no... |
2881 | accelkey => [$mod*1, $sym*1], |
3066 | shift @args if $args[0] =~ /^-psn_/; |
2882 | action => $cmds, |
3067 | |
|
|
3068 | my $profile = 'default'; |
|
|
3069 | |
|
|
3070 | for (my $i = 0; $i < @args; $i++) { |
|
|
3071 | if ($args[$i] =~ /^--?profile$/) { |
|
|
3072 | $profile = $args[$i + 1]; |
|
|
3073 | splice @args, $i, 2, (); |
2883 | }; |
3074 | $i = 0; |
|
|
3075 | } elsif ($args[$i] =~ /^--?h/) { |
|
|
3076 | print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n"; |
|
|
3077 | exit 0; |
2884 | } |
3078 | } |
2885 | } |
3079 | } |
|
|
3080 | |
|
|
3081 | $CFG->{profile}{$profile} ||= {}; |
|
|
3082 | $PROFILE = $CFG->{profile}{$profile}; |
|
|
3083 | $PROFILE->{host} ||= "gameserver.deliantra.net"; |
|
|
3084 | |
|
|
3085 | $PROFILE->{host} = $args[0] if @args > 0; |
|
|
3086 | $PROFILE->{user} = $args[1] if @args > 1; |
|
|
3087 | $PROFILE->{password} = unpack "H*", Deliantra::Util::hash_pw $args[2] if @args > 2; |
|
|
3088 | |
|
|
3089 | # convert old bindings (only default profile matters) |
|
|
3090 | if (my $bindings = delete $PROFILE->{bindings}) { |
|
|
3091 | while (my ($mod, $syms) = each %$bindings) { |
|
|
3092 | while (my ($sym, $cmds) = each %$syms) { |
|
|
3093 | push @{ $PROFILE->{macro} }, { |
|
|
3094 | accelkey => [$mod*1, $sym*1], |
|
|
3095 | action => $cmds, |
|
|
3096 | }; |
|
|
3097 | } |
|
|
3098 | } |
2886 | } |
3099 | } |
2887 | |
3100 | |
2888 | # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed |
3101 | # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed |
2889 | # these are ignored under windows, for some reason, and thus set in the loader |
3102 | # these are ignored under windows, for some reason, and thus set in the loader |
2890 | $ENV{FONTCONFIG_FILE} = "fonts.conf"; |
3103 | $ENV{FONTCONFIG_FILE} = "fonts.conf"; |
2891 | $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts"; |
3104 | $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts"; |
2892 | $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions |
3105 | $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions |
2893 | |
3106 | |
2894 | { |
3107 | { |
2895 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
3108 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
2896 | DejaVuSans.ttf |
3109 | DejaVuSans.ttf |
2897 | DejaVuSansMono.ttf |
3110 | DejaVuSansMono.ttf |
2898 | DejaVuSans-Bold.ttf |
3111 | DejaVuSans-Bold.ttf |
2899 | DejaVuSansMono-Bold.ttf |
3112 | DejaVuSansMono-Bold.ttf |
2900 | DejaVuSans-Oblique.ttf |
3113 | DejaVuSans-Oblique.ttf |
2901 | DejaVuSansMono-Oblique.ttf |
3114 | DejaVuSansMono-Oblique.ttf |
2902 | DejaVuSans-BoldOblique.ttf |
3115 | DejaVuSans-BoldOblique.ttf |
2903 | DejaVuSansMono-BoldOblique.ttf |
3116 | DejaVuSansMono-BoldOblique.ttf |
2904 | mona.ttf |
3117 | mona.ttf |
2905 | ); |
3118 | ); |
2906 | |
3119 | |
2907 | DC::add_font $_ for @fonts; |
3120 | DC::add_font $_ for @fonts; |
2908 | |
3121 | |
2909 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
3122 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
2910 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
3123 | $FONT_FIXED = new_from_file DC::Font $fonts[1]; |
2911 | |
3124 | |
2912 | $FONT_PROP->make_default; |
3125 | $FONT_PROP->make_default; |
2913 | |
3126 | |
2914 | DC::pango_init; |
3127 | DC::pango_init; |
2915 | } |
3128 | } |
2916 | |
3129 | |
2917 | # compare mono (ft) vs. rgba (cairo) |
3130 | # compare mono (ft) vs. rgba (cairo) |
2918 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
3131 | # ft - 1.8s, cairo 3s, even in alpha-only mode |
2919 | # for my $rgba (0..1) { |
3132 | # for my $rgba (0..1) { |
2920 | # my $t1 = Time::HiRes::time; |
3133 | # my $t1 = Time::HiRes::time; |
… | |
… | |
2925 | # } |
3138 | # } |
2926 | # my $t2 = Time::HiRes::time; |
3139 | # my $t2 = Time::HiRes::time; |
2927 | # warn $t2-$t1; |
3140 | # warn $t2-$t1; |
2928 | # } |
3141 | # } |
2929 | |
3142 | |
|
|
3143 | } |
|
|
3144 | |
|
|
3145 | DC::SDL_Init 0; |
2930 | DC::IMG_Init; video_init; |
3146 | DC::IMG_Init; video_init; |
2931 | DC::Mix_Init; audio_init; |
3147 | DC::Mix_Init; audio_init; |
2932 | } |
|
|
2933 | |
3148 | |
2934 | show_tip_of_the_day if $CFG->{show_tips}; |
3149 | show_tip_of_the_day if $CFG->{show_tips}; |
2935 | |
3150 | |
2936 | my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { |
3151 | my $STARTUP_CANCEL; $STARTUP_CANCEL = EV::idle sub { |
2937 | undef $STARTUP_CANCEL; |
3152 | undef $STARTUP_CANCEL; |
2938 | (pop @::STARTUP_DONE)->() |
3153 | (pop @::STARTUP_DONE)->() |
2939 | while @::STARTUP_DONE; |
3154 | while @::STARTUP_DONE; |
|
|
3155 | }; |
|
|
3156 | |
|
|
3157 | debug_toggle 0; |
|
|
3158 | |
|
|
3159 | delete $SIG{__DIE__}; |
|
|
3160 | EV::run; |
|
|
3161 | |
|
|
3162 | DC::save_cfg if $CFG->{config_autosave}; |
|
|
3163 | |
|
|
3164 | #video_shutdown; |
|
|
3165 | #audio_shutdown; |
|
|
3166 | |
|
|
3167 | DC::OpenGL::quit; |
|
|
3168 | DC::SDL_Quit; |
|
|
3169 | DC::DB::Server::stop; |
2940 | }; |
3170 | }; |
2941 | |
|
|
2942 | debug_toggle 0; |
|
|
2943 | |
|
|
2944 | delete $SIG{__DIE__}; |
|
|
2945 | EV::loop; |
|
|
2946 | |
|
|
2947 | DC::write_cfg if $CFG->{config_autosave}; |
|
|
2948 | |
|
|
2949 | #video_shutdown; |
|
|
2950 | #audio_shutdown; |
|
|
2951 | |
|
|
2952 | DC::OpenGL::quit; |
|
|
2953 | DC::SDL_Quit; |
|
|
2954 | DC::DB::Server::stop; |
|
|
2955 | } |
3171 | } |
2956 | |
|
|
2957 | *DC::Main::run = \&DC::SDL_braino; # see sub above |
|
|
2958 | |
3172 | |
2959 | 1 |
3173 | 1 |