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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.38 by root, Mon May 5 16:26:11 2008 UTC vs.
Revision 1.83 by root, Sun Jan 4 10:22:19 2009 UTC

… …
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 # OS X
56 or die "pangoversion: $!"; 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 59 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 60 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 61 }
75 62
76 unshift @INC, $root; 63 unshift @INC, $root;
77 } 64 }
78} 65}
… …
90 77
91# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 80 if %PAR::LibCache;
94 81
95use Time::HiRes 'time';
96use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
97use List::Util qw(max min); 85use List::Util qw(max min);
98 86
99use Deliantra; 87use Deliantra;
100use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
101 89
90use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket ();
93use AnyEvent::DNS ();
94
102use Compress::LZF; 95use Compress::LZF;
96use JSON::XS;
103 97
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 98use DC;
99
100sub crash($;$) {
101 # nop during compiletime
102}
103
104BEGIN {
105 $SIG{__DIE__} = sub {
106 return if $^S;
107 crash "CRASH/DIE: $_[0]" => 1;
108 DC::fatal Carp::longmess "$_[0]";
109 }
110}
111
105use DC::OpenGL (); 112use DC::OpenGL ();
106use DC::Protocol; 113use DC::Protocol;
107use DC::DB; 114use DC::DB;
108use DC::UI; 115use DC::UI;
109use DC::UI::Canvas; 116use DC::UI::Canvas;
110use DC::UI::Inventory; 117use DC::UI::Inventory;
111use DC::UI::SpellList; 118use DC::UI::SpellList;
112use DC::UI::Dockable; 119use DC::UI::Dockable;
113use DC::UI::Dockbar; 120use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 121use DC::UI::ChatView;
116use DC::MessageDistributor; 122use DC::MessageDistributor;
117use DC::Pod; 123use DC::Pod;
118use DC::MapWidget; 124use DC::MapWidget;
119use DC::Macro; 125use DC::Macro;
120 126
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 127$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 128$SIG{PIPE} = 'IGNORE';
123 129
124$EV::DIED = sub { 130$EV::DIED = sub {
131 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 132 DC::fatal Carp::longmess $@;
126}; 133};
127 134
128my $MAX_FPS = 60; 135my $MAX_FPS = 60;
129 136
… …
131 138
132our $LAST_REFRESH; 139our $LAST_REFRESH;
133our $NOW; 140our $NOW;
134 141
135our $CFG; 142our $CFG;
136our $CONN;
137our $PROFILE; # current profile 143our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 144our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 145
140our $WANT_REFRESH; 146our $WANT_REFRESH;
141 147
148our $MODE_SLIDER;
149our $CAVEAT_LABEL;
150
142our @SDL_MODES; 151our @SDL_MODES;
152our $SDL_REINIT = 1;
143our $WIDTH; 153our $WIDTH;
144our $HEIGHT; 154our $HEIGHT;
145our $FULLSCREEN; 155our $FULLSCREEN;
146our $FONTSIZE; 156our $FONTSIZE;
147 157
148our $FONT_PROP; 158our $FONT_PROP;
149our $FONT_FIXED; 159our $FONT_FIXED;
160
161our $CONN;
150 162
151our $MAP; 163our $MAP;
152our $MAPMAP; 164our $MAPMAP;
153our $MAPWIDGET; 165our $MAPWIDGET;
154our $COMPLETER; 166our $COMPLETER;
… …
196our $DEBUG_STATUS; 208our $DEBUG_STATUS;
197 209
198our $INV; 210our $INV;
199our $INVR; 211our $INVR;
200our $INVR_HB; 212our $INVR_HB;
213
214#############################################################################
215
216# write a crash message blockingly to the socket, if possible
217# this is a bit too complicated for my tastes, but it was easy.
218*crash = sub($;$) {
219 my ($msg, $backtrace) = @_;
220
221 warn $msg;
222
223 return unless $CONN;
224
225 my $fh = $CONN->{fh}
226 or return;
227
228 my $buf = delete $CONN->{wbuf};
229
230 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
231
232 AnyEvent::Util::fh_nonblocking $fh, 0;
233 syswrite $fh, $buf;
234 AnyEvent::Util::fh_nonblocking $fh, 1;
235
236 $msg =~ s/\s+$//;
237
238 # backtrace as second step, in case it crashes, too
239 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
240 if $backtrace;
241};
242
243sub clienterror($;$) {
244 my ($msg, $backtrace) = @_;
245
246 warn $msg;
247
248 return unless $CONN;
249
250 $CONN->send_exti_msg (clientlog => $msg);
251 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
252}
201 253
202############################################################################# 254#############################################################################
203 255
204sub status { 256sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 257 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
360 my $rwops = $meta->{path} 412 my $rwops = $meta->{path}
361 ? new_from_file DC::RW $meta->{path} 413 ? new_from_file DC::RW $meta->{path}
362 : new DC::RW $$MUSIC_PLAYING_DATA; 414 : new DC::RW $$MUSIC_PLAYING_DATA;
363 415
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 416 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 418
367 my $NOW = time; 419 my $NOW = time;
368 420
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 421 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 422 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
725 777
726 $vbox->add (@dialog); 778 $vbox->add (@dialog);
727 $dialog->show; 779 $dialog->show;
728} 780}
729 781
730sub start_game { 782sub dc_connect {
731 status "logging in..."; 783 my ($host, $port) = @_;
732 784
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 785 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
786 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
737 787
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 788 $CONN =
743 new DC::Protocol 789 new DC::Protocol
744 host => $host, 790 host => $host,
745 port => $port || 13327, 791 port => $port,
746 user => $PROFILE->{user}, 792 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 793 pass => $PROFILE->{password},
748 mapw => $mapsize, 794 mapw => $mapw,
749 maph => $mapsize, 795 maph => $maph,
750 796
751 client => "$DC::VERSION $] $^O", 797 client => "$DC::VERSION $] $^O",
752 798
753 map_widget => $MAPWIDGET, 799 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 800 statusbox => $STATUSBOX,
… …
757 query => \&server_query, 803 query => \&server_query,
758 804
759 setup_req => { 805 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 806 smoothing => $CFG->{map_smoothing}*1,
761 }, 807 },
762 };
763 808
764 if ($CONN) { 809 on_connect => sub {
810 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 811 DC::lowdelay fileno $CONN->{fh};
766 812
767 status "login successful"; 813 status "login successful";
814 } else {
815 undef $CONN;
816 status "unable to connect: $!";
817 stop_game();
818 }
819 },
820 ;
821}
822
823sub start_game {
824 status "logging in...";
825
826 $LOGIN_BUTTON->set_text ("Logout");
827 $SETUP_DIALOG->hide;
828
829 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
830
831 $MAP = new DC::Map;
832
833 # hack to make SURE we find the IP address all right
834 # can be removed once AnyEvent::DNS is proven stable.
835 if ($host eq "gameserver.deliantra.net") {
836 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
837 if ($_[0] ne "80.101.114.108") { # Perl
838 status "dns failure, using hardcoded address";
839 $host = "129.13.162.95";
840 }
841
842 dc_connect $host, $port;
843 };
768 } else { 844 } else {
769 warn $@; 845 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 846 }
773} 847}
774 848
775sub stop_game { 849sub stop_game {
850 crash "stop_game";
851
776 $LOGIN_BUTTON->set_text ("Login / Register"); 852 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 853 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 854 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 855 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 856 $SPELL_LIST->clear_spells;
… …
794} 870}
795 871
796sub graphics_setup { 872sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 873 my $vbox = new DC::UI::VBox;
798 874
875 {
876 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
877
799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 878 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
800 879
801 my $row = 0; 880 my $row = 0;
802 881
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 883 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 884 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
889 can_events => 1,
890 tooltip => "This field shows any known issues with your config or driver, such as "
891 . "a non-accelerated display format. You can try to work around these issues "
892 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card.");
894
895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
896 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
897 value => $CFG->{uitheme},
898 options => [
899 [wood => "Wood (the default)"],
900 [plain => "Plain (very)"],
901 [blue => "Blue (dark)"],
902 [metal => "Metal (light)"],
903 ],
904 tooltip => "Choose the User Interface theme that you like most :)",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
906 );
907
808 my $vidmode_tooltip = 908 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 909 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 910 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 911
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 914
815 $hbox->add (my $mode_slider = new DC::UI::Slider 915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 916 force_w => $WIDTH * 0.1, expand => 1,
917 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 918 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 919 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 920 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 921 can_events => 1, tooltip => $vidmode_tooltip);
821 922
822 $mode_slider->connect (changed => sub { 923 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 924 my ($self, $value) = @_;
824 925
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 926 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 927 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 928 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 929 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 930
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 931 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 932 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 933 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 934 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 935 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 936 );
836 937
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 939 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 940 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 941 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 942 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 943 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 944 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 945 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 946 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 947 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 948 );
848 949
950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
951 $table->add_at (1, $row++, new DC::UI::CheckBox
952 state => $CFG->{disable_alpha},
953 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
954 . "by disabling a number of textures and transparency effects. Normally, these "
955 . "effects do not cost a lot of resources, but some graphics cards might fall "
956 . "back to extremely slow rendering if this is enabled. If disabling this option "
957 . "noticably improves the framerate of the client please report this! "
958 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
959 on_changed => sub {
960 my ($self, $value) = @_;
961 $CFG->{disable_alpha} = $value;
962 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
963 0
964 }
965 );
966
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 969 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 970 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 971 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 972 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 973 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 975 );
858 976
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 979 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 980 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 982 );
865 983
866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
867 $table->add_at (1, $row++, new DC::UI::Slider 985 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 986 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 987 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 988 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 989 );
872 990
873 $table->add_at (1, $row++, new DC::UI::Button 991 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 992 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 993 tooltip => "Apply the video settings above.",
876 on_activate => sub { 994 on_activate => sub {
877 video_shutdown (); 995 video_shutdown ();
878 video_init (); 996 video_init ();
997 0
879 0 998 }
880 } 999 );
1000 }
1001
1002 {
1003 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1004
1005 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1006
1007 my $row = 0;
1008 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1009 $table->add_at (1, $row++, new DC::UI::CheckBox
1010 state => $CFG->{smooth_movement},
1011 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1012 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1013 . "then disable this option. Changes take effect immdiately.",
1014 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1015 );
882 1016
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1018 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1021 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
888 ); 1022 );
889 1023
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1025 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1026 state => $CFG->{map_smoothing},
893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1027 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
894 . "This increases load on the graphics subsystem and works only with TRT servers. " 1028 . "This increases load on the graphics subsystem and works only with TRT servers. "
895 . "Changes take effect at next login only.", 1029 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1031 );
898 1032
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1035 state => $CFG->{fow_enable},
902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1036 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1038 );
905 1039
906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
907 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1042 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1043 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1044 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1045 );
912 1046
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
914 $table->add_at (1, $row++, new DC::UI::Slider 1048 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1049 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1050 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1051 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1052 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1053 );
920 1054
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1057 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1058 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1059 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1060 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1061 &set_gauge_window_fontsize;
1062 0
928 0 1063 }
929 } 1064 );
930 );
931 1065
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
933 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1068 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1069 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
936 on_changed => sub { 1070 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1071 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1072 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1073 0
939 0 1074 }
940 } 1075 );
941 ); 1076 }
942 1077
943 $vbox 1078 $vbox
944} 1079}
945 1080
946our $AUDIO_HW_CHUNKSIZE; 1081our $AUDIO_HW_CHUNKSIZE;
… …
1525 1 1660 1
1526 }, 1661 },
1527 ); 1662 );
1528 1663
1529 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1665 label => "How to Play",
1531 min_h => 200, 1666 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1668 markup =>
1669 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1670 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1671 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1672 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1673 ),
1537 ); 1674 );
1538 1675
1539 $vbox 1676 $vbox
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1822 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1823 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1824 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1825 ["Flesh" => PICKUP_FLESH],
1689 ], 1826 ],
1690 ["Weight/Value ratio", 2, 17] 1827 ["Value/Weight ratio", 2, 17]
1691 ) 1828 )
1692 { 1829 {
1693 my ($title, $x, $y, @bits) = @$_; 1830 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1831 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1832
… …
1720 } 1857 }
1721 1858
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1859 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1860 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1861 template => ">= 99",
1862 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1863 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1864 on_changed => sub {
1727 my ($slider, $value) = @_; 1865 my ($slider, $value) = @_;
1728 1866
1729 $::CFG->{pickup} &= ~0xF; 1867 $::CFG->{pickup} &= ~0xF;
… …
1742 1880
1743 $r 1881 $r
1744} 1882}
1745 1883
1746my %SORT_ORDER = ( 1884my %SORT_ORDER = (
1747 type => undef, 1885 type => sub {
1886 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1887 },
1748 mtime => sub { 1888 mtime => sub {
1749 my $NOW = time; 1889 my $NOW = time;
1750 sort { 1890 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1891 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1892 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1783 $::CFG->{inv_sort} = $_[1]; 1923 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1924 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1925 },
1786 ); 1926 );
1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1927 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1788 #TODO# update to weigh/maxweight 1928 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1929 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1930
1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1931 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1932 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1933 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2057 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2058 ); 2198 );
2059 $hb->add (new DC::UI::Button 2199 $hb->add (new DC::UI::Button
2060 text => "Quit anyway", 2200 text => "Quit anyway",
2061 expand => 1, 2201 expand => 1,
2062 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2202 on_activate => sub {
2203 crash "Quit anyway";
2204 EV::unloop EV::UNLOOP_ALL;
2205 },
2063 ); 2206 );
2064 } 2207 }
2065 2208
2066 $QUIT_DIALOG->show; 2209 $QUIT_DIALOG->show;
2067 $QUIT_DIALOG->grab_focus; 2210 $QUIT_DIALOG->grab_focus;
… …
2120 $dialog->show; 2263 $dialog->show;
2121 }; 2264 };
2122} 2265}
2123 2266
2124sub sdl_init { 2267sub sdl_init {
2125 DC::SDL_Init 2268 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2269 and die "SDL::Init failed!\n";
2127} 2270}
2128 2271
2129sub video_init { 2272sub video_init {
2273 DC::set_theme $CFG->{uitheme};
2274
2275 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 $SDL_REINIT = 0;
2277
2278 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2279 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2280 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2281 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2282
2283 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2284
2130 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2285 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2286 $CFG->{sdl_mode} = 0; # lowest resolution by default
2287
2288 # now choose biggest mode <= 1024x768
2289 for (0 .. $#SDL_MODES) {
2290 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2291 $CFG->{sdl_mode} = $_;
2292 }
2293 }
2294 }
2131 2295
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2296 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2297
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2298 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2299 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2300 $FAST = $CFG->{fast};
2137 2301
2302 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2303 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2304 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2305 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2306
2141 $SDL_ACTIVE = 1; 2307 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2308 $LAST_REFRESH = time - 0.01;
2143 2309
… …
2210 x => 0, 2376 x => 0,
2211 y => $FONTSIZE + 8, 2377 y => $FONTSIZE + 8,
2212 border_bg => [1, 1, 1, 192/255], 2378 border_bg => [1, 1, 1, 192/255],
2213 bg => [1, 1, 1, 0], 2379 bg => [1, 1, 1, 0],
2214 child => ($MAPMAP = new DC::MapWidget::MapMap 2380 child => ($MAPMAP = new DC::MapWidget::MapMap
2215 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2381 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2216 ), 2382 ),
2217 )->show; 2383 )->show;
2218 2384
2219 $MAPWIDGET = new DC::MapWidget; 2385 $MAPWIDGET = new DC::MapWidget;
2220 $MAPWIDGET->connect (activate_console => sub { 2386 $MAPWIDGET->connect (activate_console => sub {
… …
2241 force_h => $::HEIGHT * 0.6, 2407 force_h => $::HEIGHT * 0.6,
2242 has_close_button => 1, 2408 has_close_button => 1,
2243 ; 2409 ;
2244 2410
2245 $METASERVER = metaserver_dialog; 2411 $METASERVER = metaserver_dialog;
2412 # the name is changed to not conflict with the older name as users could have hidden it
2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2413 $MESSAGE_WINDOW = new DC::UI::Dockbar
2414 name => "message_window2",
2415 title => 'Messages',
2416 force_w => $::WIDTH * 0.6,
2417 force_h => $::HEIGHT * 0.25,
2418 ;
2419
2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2420 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2248 2421
2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, 2422 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2423 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2251 2424
… …
2312 $BUTTONBAR->show; 2485 $BUTTONBAR->show;
2313 $SETUP_DIALOG->show; 2486 $SETUP_DIALOG->show;
2314 $MESSAGE_WINDOW->show; 2487 $MESSAGE_WINDOW->show;
2315 } 2488 }
2316 2489
2490 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2491 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2492
2493 $CAVEAT_LABEL->set_text ("None :)");
2494 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2495 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2496
2317 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2497 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2318} 2498}
2319 2499
2320sub video_shutdown { 2500sub video_shutdown {
2321 DC::OpenGL::shutdown; 2501 DC::OpenGL::shutdown;
2502 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2322 2503
2323 undef $SDL_ACTIVE; 2504 undef $SDL_ACTIVE;
2324} 2505}
2325 2506
2326my %animate_object; 2507my %animate_object;
… …
2369 delete $animate_object{$widget}; 2550 delete $animate_object{$widget};
2370} 2551}
2371 2552
2372%SDL_CB = ( 2553%SDL_CB = (
2373 DC::SDL_QUIT => sub { 2554 DC::SDL_QUIT => sub {
2555 crash "SDL_QUIT";
2374 EV::unloop EV::UNLOOP_ALL; 2556 EV::unloop EV::UNLOOP_ALL;
2375 }, 2557 },
2376 DC::SDL_VIDEORESIZE => sub { 2558 DC::SDL_VIDEORESIZE => sub {
2377 }, 2559 },
2378 DC::SDL_VIDEOEXPOSE => sub { 2560 DC::SDL_VIDEOEXPOSE => sub {
… …
2387# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2569# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2388 }, 2570 },
2389 DC::SDL_KEYDOWN => sub { 2571 DC::SDL_KEYDOWN => sub {
2390 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2572 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2391 # alt-enter 2573 # alt-enter
2574 video_shutdown;
2392 $FULLSCREEN_ENABLE->toggle; 2575 $FULLSCREEN_ENABLE->toggle;
2393 video_shutdown;
2394 video_init; 2576 video_init;
2395 } else { 2577 } else {
2396 &DC::UI::feed_sdl_key_down_event; 2578 &DC::UI::feed_sdl_key_down_event;
2397 } 2579 }
2398 update_modbox; 2580 update_modbox;
… …
2418$SIG{INT} = $SIG{TERM} = sub { 2600$SIG{INT} = $SIG{TERM} = sub {
2419 EV::unloop; 2601 EV::unloop;
2420 #d# TODO calling exit here hangs the process in some futex 2602 #d# TODO calling exit here hangs the process in some futex
2421}; 2603};
2422 2604
2423{ 2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
2608
2609# due to mac os x + sdl combined braindamage, we need this contortion
2610sub main {
2611 {
2424 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2425 2613
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2615 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2616 } else {
2429 #TODO: compatibility cruft 2617 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2618 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2619 print STDERR "INFO: used old configuration file\n";
2432 } 2620 }
2433 2621
2434 DC::DB::Server::run; 2622 DC::DB::Server::run;
2435 2623
2436 if ($CFG->{db_schema} < 1) { 2624 if ($CFG->{db_schema} < 1) {
2437 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2625 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2438 DC::DB::nuke_db; 2626 DC::DB::nuke_db;
2439 $CFG->{db_schema} = 1; 2627 $CFG->{db_schema} = 1;
2440 DC::write_cfg; 2628 DC::write_cfg;
2441 } 2629 }
2442 2630
2443 DC::DB::open_db; 2631 DC::DB::open_db;
2444 2632
2445 DC::UI::set_layout ($::CFG->{layout}); 2633 DC::UI::set_layout ($::CFG->{layout});
2446 2634
2447 my %DEF_CFG = ( 2635 my %DEF_CFG = (
2448 sdl_mode => 0, 2636 sdl_mode => undef,
2449 fullscreen => 1, 2637 fullscreen => 1,
2450 fast => 0, 2638 fast => 0,
2451 force_opengl11 => undef, 2639 force_opengl11 => undef,
2640 disable_alpha => 0,
2641 smooth_movement => 1,
2452 texture_compression => 1, 2642 texture_compression => 1,
2453 map_scale => 1, 2643 map_scale => 1,
2454 fow_enable => 1, 2644 fow_enable => 1,
2455 fow_intensity => 0, 2645 fow_intensity => 0,
2456 map_smoothing => 1, 2646 map_smoothing => 1,
2457 gui_fontsize => 1, 2647 gui_fontsize => 1,
2458 log_fontsize => 0.7, 2648 log_fontsize => 0.7,
2459 gauge_fontsize => 1, 2649 gauge_fontsize => 1,
2460 gauge_size => 0.35, 2650 gauge_size => 0.35,
2461 stat_fontsize => 0.7, 2651 stat_fontsize => 0.7,
2462 mapsize => 100, 2652 mapsize => 100,
2463 audio_enable => 1, 2653 audio_enable => 1,
2464 audio_hw_channels => 0, 2654 audio_hw_channels => 0,
2465 audio_hw_frequency => 0, 2655 audio_hw_frequency => 0,
2466 audio_hw_chunksize => 0, 2656 audio_hw_chunksize => 0,
2467 audio_mix_channels => 8, 2657 audio_mix_channels => 8,
2468 effects_enable => 1, 2658 effects_enable => 1,
2469 effects_volume => 1, 2659 effects_volume => 1,
2470 bgm_enable => 1, 2660 bgm_enable => 1,
2471 bgm_volume => 0.5, 2661 bgm_volume => 0.5,
2472 output_rate => "", 2662 output_rate => "",
2473 pickup => 0, 2663 pickup => 0,
2474 inv_sort => "mtime", 2664 inv_sort => "mtime",
2475 default => "profile", # default profile 2665 default => "profile", # default profile
2476 show_tips => 1, 2666 show_tips => 1,
2477 logview_max_par => 1000, 2667 logview_max_par => 1000,
2668 shift_fire_stop => 0,
2669 uitheme => "wood",
2478 ); 2670 );
2479 2671
2480 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2481 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2482 } 2674 }
2483 2675
2484 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2676 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2485 $PROFILE = $CFG->{profile}{default}; 2677 $PROFILE = $CFG->{profile}{default};
2486 2678
2487 # convert old bindings (only default profile matters) 2679 # convert old bindings (only default profile matters)
2488 if (my $bindings = delete $PROFILE->{bindings}) { 2680 if (my $bindings = delete $PROFILE->{bindings}) {
2489 while (my ($mod, $syms) = each %$bindings) { 2681 while (my ($mod, $syms) = each %$bindings) {
2490 while (my ($sym, $cmds) = each %$syms) { 2682 while (my ($sym, $cmds) = each %$syms) {
2491 push @{ $PROFILE->{macro} }, { 2683 push @{ $PROFILE->{macro} }, {
2492 accelkey => [$mod*1, $sym*1], 2684 accelkey => [$mod*1, $sym*1],
2493 action => $cmds, 2685 action => $cmds,
2686 };
2494 }; 2687 }
2495 } 2688 }
2496 } 2689 }
2497 }
2498 2690
2499 sdl_init; 2691 sdl_init;
2500 2692
2501 @SDL_MODES = DC::SDL_ListModes 8, 8; 2693 {
2502 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2503 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2504
2505 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2506
2507 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2508
2509 {
2510 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2694 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2511 DejaVuSans.ttf 2695 DejaVuSans.ttf
2512 DejaVuSansMono.ttf 2696 DejaVuSansMono.ttf
2513 DejaVuSans-Bold.ttf 2697 DejaVuSans-Bold.ttf
2514 DejaVuSansMono-Bold.ttf 2698 DejaVuSansMono-Bold.ttf
2515 DejaVuSans-Oblique.ttf 2699 DejaVuSans-Oblique.ttf
2516 DejaVuSansMono-Oblique.ttf 2700 DejaVuSansMono-Oblique.ttf
2517 DejaVuSans-BoldOblique.ttf 2701 DejaVuSans-BoldOblique.ttf
2518 DejaVuSansMono-BoldOblique.ttf 2702 DejaVuSansMono-BoldOblique.ttf
2519 ); 2703 );
2520 2704
2521 DC::add_font $_ for @fonts; 2705 DC::add_font $_ for @fonts;
2522 2706
2523 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2707 $FONT_PROP = new_from_file DC::Font $fonts[0];
2524 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2708 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2525 2709
2526 $FONT_PROP->make_default; 2710 $FONT_PROP->make_default;
2527 2711
2528 DC::pango_init; 2712 DC::pango_init;
2529 } 2713 }
2530 2714
2531# compare mono (ft) vs. rgba (cairo) 2715# compare mono (ft) vs. rgba (cairo)
2532# ft - 1.8s, cairo 3s, even in alpha-only mode 2716# ft - 1.8s, cairo 3s, even in alpha-only mode
2533# for my $rgba (0..1) { 2717# for my $rgba (0..1) {
2534# my $t1 = Time::HiRes::time; 2718# my $t1 = Time::HiRes::time;
… …
2539# } 2723# }
2540# my $t2 = Time::HiRes::time; 2724# my $t2 = Time::HiRes::time;
2541# warn $t2-$t1; 2725# warn $t2-$t1;
2542# } 2726# }
2543 2727
2544 video_init; 2728 video_init;
2545 audio_init; 2729 audio_init;
2546} 2730 }
2547 2731
2548show_tip_of_the_day if $CFG->{show_tips}; 2732 show_tip_of_the_day if $CFG->{show_tips};
2549 2733
2550our $STARTUP_CANCEL = EV::idle sub { 2734 our $STARTUP_CANCEL = EV::idle sub {
2551 undef $::STARTUP_CANCEL; 2735 undef $::STARTUP_CANCEL;
2552 $startup_done->(); 2736 $startup_done->();
2553}; 2737 };
2554 2738
2555delete $SIG{__DIE__}; 2739 delete $SIG{__DIE__};
2556EV::loop; 2740 EV::loop;
2557 2741
2558#video_shutdown; 2742#video_shutdown;
2559#audio_shutdown; 2743#audio_shutdown;
2560DC::OpenGL::quit; 2744 DC::OpenGL::quit;
2561DC::SDL_Quit; 2745 DC::SDL_Quit;
2562DC::DB::Server::stop; 2746 DC::DB::Server::stop;
2747}
2748
2749DC::SDL_braino; # see sub above
2563 2750
2564=head1 NAME 2751=head1 NAME
2565 2752
2566deliantra - A Deliantra MORPG game client 2753deliantra - A Deliantra MORPG game client
2567 2754
… …
2584 4 show fps 2771 4 show fps
2585 8 suppress tooltips 2772 8 suppress tooltips
2586 2773
2587=head1 AUTHOR 2774=head1 AUTHOR
2588 2775
2589Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2776Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2590 2777
2591 2778
2592 2779

Diff Legend

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