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.49 by root, Mon Jul 7 12:56:07 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 ();
102use AnyEvent::DNS; 91use AnyEvent::DNS;
92use AnyEvent::Socket ();
93use AnyEvent::DNS ();
103 94
104use Compress::LZF; 95use Compress::LZF;
96use JSON::XS;
105 97
106use DC; 98use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 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
108use DC::OpenGL (); 112use DC::OpenGL ();
109use DC::Protocol; 113use DC::Protocol;
110use DC::DB; 114use DC::DB;
111use DC::UI; 115use DC::UI;
112use DC::UI::Canvas; 116use DC::UI::Canvas;
113use DC::UI::Inventory; 117use DC::UI::Inventory;
114use DC::UI::SpellList; 118use DC::UI::SpellList;
115use DC::UI::Dockable; 119use DC::UI::Dockable;
116use DC::UI::Dockbar; 120use DC::UI::Dockbar;
117use DC::UI::MessageWindow;
118use DC::UI::ChatView; 121use DC::UI::ChatView;
119use DC::MessageDistributor; 122use DC::MessageDistributor;
120use DC::Pod; 123use DC::Pod;
121use DC::MapWidget; 124use DC::MapWidget;
122use DC::Macro; 125use DC::Macro;
123 126
124$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 127$SIG{QUIT} = sub { Carp::cluck "QUIT" };
125$SIG{PIPE} = 'IGNORE'; 128$SIG{PIPE} = 'IGNORE';
126 129
127$EV::DIED = sub { 130$EV::DIED = sub {
131 crash "CRASH/EV::DIED: $@" => 0;
128 DC::fatal Carp::longmess $@; 132 DC::fatal Carp::longmess $@;
129}; 133};
130 134
131my $MAX_FPS = 60; 135my $MAX_FPS = 60;
132 136
… …
134 138
135our $LAST_REFRESH; 139our $LAST_REFRESH;
136our $NOW; 140our $NOW;
137 141
138our $CFG; 142our $CFG;
139our $CONN;
140our $PROFILE; # current profile 143our $PROFILE; # current profile
141our $FAST; # fast, low-quality mode, possibly useful for software-rendering 144our $FAST; # fast, low-quality mode, possibly useful for software-rendering
142 145
143our $WANT_REFRESH; 146our $WANT_REFRESH;
144 147
148our $MODE_SLIDER;
149our $CAVEAT_LABEL;
150
145our @SDL_MODES; 151our @SDL_MODES;
152our $SDL_REINIT = 1;
146our $WIDTH; 153our $WIDTH;
147our $HEIGHT; 154our $HEIGHT;
148our $FULLSCREEN; 155our $FULLSCREEN;
149our $FONTSIZE; 156our $FONTSIZE;
150 157
151our $FONT_PROP; 158our $FONT_PROP;
152our $FONT_FIXED; 159our $FONT_FIXED;
160
161our $CONN;
153 162
154our $MAP; 163our $MAP;
155our $MAPMAP; 164our $MAPMAP;
156our $MAPWIDGET; 165our $MAPWIDGET;
157our $COMPLETER; 166our $COMPLETER;
… …
199our $DEBUG_STATUS; 208our $DEBUG_STATUS;
200 209
201our $INV; 210our $INV;
202our $INVR; 211our $INVR;
203our $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}
204 253
205############################################################################# 254#############################################################################
206 255
207sub status { 256sub status {
208 $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]);
… …
363 my $rwops = $meta->{path} 412 my $rwops = $meta->{path}
364 ? new_from_file DC::RW $meta->{path} 413 ? new_from_file DC::RW $meta->{path}
365 : new DC::RW $$MUSIC_PLAYING_DATA; 414 : new DC::RW $$MUSIC_PLAYING_DATA;
366 415
367 $MUSIC_PLAYER = new DC::MixMusic $rwops 416 $MUSIC_PLAYER = new DC::MixMusic $rwops
368 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
369 418
370 my $NOW = time; 419 my $NOW = time;
371 420
372 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 421 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
373 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 422 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
731} 780}
732 781
733sub dc_connect { 782sub dc_connect {
734 my ($host, $port) = @_; 783 my ($host, $port) = @_;
735 784
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 $CONN = 788 $CONN =
739 new DC::Protocol 789 new DC::Protocol
740 host => $host, 790 host => $host,
741 port => $port || 13327, 791 port => $port,
742 user => $PROFILE->{user}, 792 user => $PROFILE->{user},
743 pass => $PROFILE->{password}, 793 pass => $PROFILE->{password},
744 mapw => $mapsize, 794 mapw => $mapw,
745 maph => $mapsize, 795 maph => $maph,
746 796
747 client => "$DC::VERSION $] $^O", 797 client => "$DC::VERSION $] $^O",
748 798
749 map_widget => $MAPWIDGET, 799 map_widget => $MAPWIDGET,
750 statusbox => $STATUSBOX, 800 statusbox => $STATUSBOX,
… …
774 status "logging in..."; 824 status "logging in...";
775 825
776 $LOGIN_BUTTON->set_text ("Logout"); 826 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide; 827 $SETUP_DIALOG->hide;
778 828
779 my ($host, $port) = split /:/, $PROFILE->{host}; 829 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
780 830
781 $MAP = new DC::Map; 831 $MAP = new DC::Map;
782 832
783 # hack to make SURE we find the IP address all right 833 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable. 834 # can be removed once AnyEvent::DNS is proven stable.
… …
795 dc_connect $host, $port; 845 dc_connect $host, $port;
796 } 846 }
797} 847}
798 848
799sub stop_game { 849sub stop_game {
850 crash "stop_game";
851
800 $LOGIN_BUTTON->set_text ("Login / Register"); 852 $LOGIN_BUTTON->set_text ("Login / Register");
801 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 853 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
802 $SETUP_DIALOG->show; 854 $SETUP_DIALOG->show;
803 $PL_WINDOW->hide; 855 $PL_WINDOW->hide;
804 $SPELL_LIST->clear_spells; 856 $SPELL_LIST->clear_spells;
… …
818} 870}
819 871
820sub graphics_setup { 872sub graphics_setup {
821 my $vbox = new DC::UI::VBox; 873 my $vbox = new DC::UI::VBox;
822 874
875 {
876 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
877
823 $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]);
824 879
825 my $row = 0; 880 my $row = 0;
826 881
827 $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");
828 $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,
829 can_events => 1, 884 can_events => 1,
830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
831 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
832 my $vidmode_tooltip = 908 my $vidmode_tooltip =
833 "<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). "
834 . "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>.";
835 911
836 $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");
837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838 914
839 $hbox->add (my $mode_slider = new DC::UI::Slider 915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
840 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 ],
841 tooltip => $vidmode_tooltip); 918 tooltip => $vidmode_tooltip);
842 $hbox->add (my $mode_label = new DC::UI::Label 919 $hbox->add (my $mode_label = new DC::UI::Label
843 height => 0.8, template => "9999x9999@9+9", 920 height => 0.8, template => "9999x9999@9+9",
844 can_events => 1, tooltip => $vidmode_tooltip); 921 can_events => 1, tooltip => $vidmode_tooltip);
845 922
846 $mode_slider->connect (changed => sub { 923 $MODE_SLIDER->connect (changed => sub {
847 my ($self, $value) = @_; 924 my ($self, $value) = @_;
848 925
849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 926 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850 $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]});
851 }); 928 });
852 $mode_slider->emit (changed => $mode_slider->{range}[0]); 929 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853 930
854 $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");
855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 932 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856 state => $CFG->{fullscreen}, 933 state => $CFG->{fullscreen},
857 tooltip => "Bring the client into fullscreen mode.", 934 tooltip => "Bring the client into fullscreen mode.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 935 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
859 ); 936 );
860 937
861 $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");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 939 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{force_opengl11}, 940 state => $CFG->{force_opengl11},
864 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 "
865 . "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 "
866 . "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. "
867 . "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, "
868 . "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. "
869 . "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>",
870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 947 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
871 ); 948 );
872 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
873 $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");
874 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
875 state => $CFG->{texture_compression}, 969 state => $CFG->{texture_compression},
876 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 "
877 . "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). "
878 . "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 "
879 . "forced OpenGL 1.1 mode.", 973 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
880 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
881 ); 975 );
882 976
883 $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");
884 $table->add_at (1, $row++, new DC::UI::CheckBox 978 $table->add_at (1, $row++, new DC::UI::CheckBox
885 state => $CFG->{fast}, 979 state => $CFG->{fast},
886 tooltip => "Lower the visual quality considerably to speed up rendering.", 980 tooltip => "Lower the visual quality considerably to speed up rendering.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 981 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
888 ); 982 );
889 983
890 $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");
891 $table->add_at (1, $row++, new DC::UI::Slider 985 $table->add_at (1, $row++, new DC::UI::Slider
892 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 986 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
893 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.",
894 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 988 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
895 ); 989 );
896 990
897 $table->add_at (1, $row++, new DC::UI::Button 991 $table->add_at (1, $row++, new DC::UI::Button
898 expand => 1, text => "Apply", 992 expand => 1, text => "Apply",
899 tooltip => "Apply the video settings above.", 993 tooltip => "Apply the video settings above.",
900 on_activate => sub { 994 on_activate => sub {
901 video_shutdown (); 995 video_shutdown ();
902 video_init (); 996 video_init ();
997 0
903 0 998 }
904 } 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 }
905 ); 1015 );
906 1016
907 $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");
908 $table->add_at (1, $row++, new DC::UI::Slider 1018 $table->add_at (1, $row++, new DC::UI::Slider
909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1019 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
910 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1020 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
911 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 }
912 ); 1022 );
913 1023
914 $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");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1025 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{map_smoothing}, 1026 state => $CFG->{map_smoothing},
917 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. "
918 . "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. "
919 . "Changes take effect at next login only.", 1029 . "Changes take effect at next login only.",
920 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
921 ); 1031 );
922 1032
923 $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");
924 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
925 state => $CFG->{fow_enable}, 1035 state => $CFG->{fow_enable},
926 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.",
927 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
928 ); 1038 );
929 1039
930 $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");
931 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
932 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1042 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
933 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.",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1044 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
935 ); 1045 );
936 1046
937 $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");
938 $table->add_at (1, $row++, new DC::UI::Slider 1048 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1049 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
940 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, "
941 . "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.",
942 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 },
943 ); 1053 );
944 1054
945 $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");
946 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
947 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1057 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
948 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.",
949 on_changed => sub { 1059 on_changed => sub {
950 $CFG->{gauge_fontsize} = $_[1]; 1060 $CFG->{gauge_fontsize} = $_[1];
951 &set_gauge_window_fontsize; 1061 &set_gauge_window_fontsize;
1062 0
952 0 1063 }
953 } 1064 );
954 );
955 1065
956 $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");
957 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
958 range => [$CFG->{gauge_size}, 0.2, 0.8], 1068 range => [$CFG->{gauge_size}, 0.2, 0.8],
959 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.",
960 on_changed => sub { 1070 on_changed => sub {
961 $CFG->{gauge_size} = $_[1]; 1071 $CFG->{gauge_size} = $_[1];
962 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1072 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1073 0
963 0 1074 }
964 } 1075 );
965 ); 1076 }
966 1077
967 $vbox 1078 $vbox
968} 1079}
969 1080
970our $AUDIO_HW_CHUNKSIZE; 1081our $AUDIO_HW_CHUNKSIZE;
… …
1549 1 1660 1
1550 }, 1661 },
1551 ); 1662 );
1552 1663
1553 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1554 label => "Registering", 1665 label => "How to Play",
1555 min_h => 200, 1666 min_h => 240,
1556 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1557 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). "
1558 "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 "
1559 . "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.",
1560 ), 1673 ),
1561 ); 1674 );
1562 1675
1563 $vbox 1676 $vbox
… …
1709 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1822 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710 ["Ignore cursed" => PICKUP_NOT_CURSED], 1823 ["Ignore cursed" => PICKUP_NOT_CURSED],
1711 ["Jewelery" => PICKUP_JEWELS], 1824 ["Jewelery" => PICKUP_JEWELS],
1712 ["Flesh" => PICKUP_FLESH], 1825 ["Flesh" => PICKUP_FLESH],
1713 ], 1826 ],
1714 ["Weight/Value ratio", 2, 17] 1827 ["Value/Weight ratio", 2, 17]
1715 ) 1828 )
1716 { 1829 {
1717 my ($title, $x, $y, @bits) = @$_; 1830 my ($title, $x, $y, @bits) = @$_;
1718 $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]);
1719 1832
… …
1744 } 1857 }
1745 1858
1746 $table->add_at (2, 18, new DC::UI::ValSlider 1859 $table->add_at (2, 18, new DC::UI::ValSlider
1747 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1860 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748 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).",
1749 to_value => sub { ">= " . 5 * $_[0] }, 1863 to_value => sub { ">= " . 5 * $_[0] },
1750 on_changed => sub { 1864 on_changed => sub {
1751 my ($slider, $value) = @_; 1865 my ($slider, $value) = @_;
1752 1866
1753 $::CFG->{pickup} &= ~0xF; 1867 $::CFG->{pickup} &= ~0xF;
… …
1809 $::CFG->{inv_sort} = $_[1]; 1923 $::CFG->{inv_sort} = $_[1];
1810 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1924 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1811 }, 1925 },
1812 ); 1926 );
1813 $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);
1814 #TODO# update to weigh/maxweight 1928 #TODO# update to weight/maxweight
1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1929 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816 1930
1817 $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);
1818 $sw1->add ($INV = new DC::UI::Inventory); 1932 $sw1->add ($INV = new DC::UI::Inventory);
1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1933 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2083 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2084 ); 2198 );
2085 $hb->add (new DC::UI::Button 2199 $hb->add (new DC::UI::Button
2086 text => "Quit anyway", 2200 text => "Quit anyway",
2087 expand => 1, 2201 expand => 1,
2088 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2202 on_activate => sub {
2203 crash "Quit anyway";
2204 EV::unloop EV::UNLOOP_ALL;
2205 },
2089 ); 2206 );
2090 } 2207 }
2091 2208
2092 $QUIT_DIALOG->show; 2209 $QUIT_DIALOG->show;
2093 $QUIT_DIALOG->grab_focus; 2210 $QUIT_DIALOG->grab_focus;
… …
2146 $dialog->show; 2263 $dialog->show;
2147 }; 2264 };
2148} 2265}
2149 2266
2150sub sdl_init { 2267sub sdl_init {
2151 DC::SDL_Init 2268 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2152 and die "SDL::Init failed!\n"; 2269 and die "SDL::Init failed!\n";
2153} 2270}
2154 2271
2155sub 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
2156 $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 }
2157 2295
2158 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2296 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159 2297
2160 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2298 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161 $FULLSCREEN = $CFG->{fullscreen}; 2299 $FULLSCREEN = $CFG->{fullscreen};
2162 $FAST = $CFG->{fast}; 2300 $FAST = $CFG->{fast};
2163 2301
2302 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2164 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
2165 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2305 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166 2306
2167 $SDL_ACTIVE = 1; 2307 $SDL_ACTIVE = 1;
2168 $LAST_REFRESH = time - 0.01; 2308 $LAST_REFRESH = time - 0.01;
2169 2309
… …
2236 x => 0, 2376 x => 0,
2237 y => $FONTSIZE + 8, 2377 y => $FONTSIZE + 8,
2238 border_bg => [1, 1, 1, 192/255], 2378 border_bg => [1, 1, 1, 192/255],
2239 bg => [1, 1, 1, 0], 2379 bg => [1, 1, 1, 0],
2240 child => ($MAPMAP = new DC::MapWidget::MapMap 2380 child => ($MAPMAP = new DC::MapWidget::MapMap
2241 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.",
2242 ), 2382 ),
2243 )->show; 2383 )->show;
2244 2384
2245 $MAPWIDGET = new DC::MapWidget; 2385 $MAPWIDGET = new DC::MapWidget;
2246 $MAPWIDGET->connect (activate_console => sub { 2386 $MAPWIDGET->connect (activate_console => sub {
… …
2345 $BUTTONBAR->show; 2485 $BUTTONBAR->show;
2346 $SETUP_DIALOG->show; 2486 $SETUP_DIALOG->show;
2347 $MESSAGE_WINDOW->show; 2487 $MESSAGE_WINDOW->show;
2348 } 2488 }
2349 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
2350 $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]);
2351} 2498}
2352 2499
2353sub video_shutdown { 2500sub video_shutdown {
2354 DC::OpenGL::shutdown; 2501 DC::OpenGL::shutdown;
2502 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355 2503
2356 undef $SDL_ACTIVE; 2504 undef $SDL_ACTIVE;
2357} 2505}
2358 2506
2359my %animate_object; 2507my %animate_object;
… …
2402 delete $animate_object{$widget}; 2550 delete $animate_object{$widget};
2403} 2551}
2404 2552
2405%SDL_CB = ( 2553%SDL_CB = (
2406 DC::SDL_QUIT => sub { 2554 DC::SDL_QUIT => sub {
2555 crash "SDL_QUIT";
2407 EV::unloop EV::UNLOOP_ALL; 2556 EV::unloop EV::UNLOOP_ALL;
2408 }, 2557 },
2409 DC::SDL_VIDEORESIZE => sub { 2558 DC::SDL_VIDEORESIZE => sub {
2410 }, 2559 },
2411 DC::SDL_VIDEOEXPOSE => sub { 2560 DC::SDL_VIDEOEXPOSE => sub {
… …
2420# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2569# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421 }, 2570 },
2422 DC::SDL_KEYDOWN => sub { 2571 DC::SDL_KEYDOWN => sub {
2423 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2572 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424 # alt-enter 2573 # alt-enter
2574 video_shutdown;
2425 $FULLSCREEN_ENABLE->toggle; 2575 $FULLSCREEN_ENABLE->toggle;
2426 video_shutdown;
2427 video_init; 2576 video_init;
2428 } else { 2577 } else {
2429 &DC::UI::feed_sdl_key_down_event; 2578 &DC::UI::feed_sdl_key_down_event;
2430 } 2579 }
2431 update_modbox; 2580 update_modbox;
… …
2451$SIG{INT} = $SIG{TERM} = sub { 2600$SIG{INT} = $SIG{TERM} = sub {
2452 EV::unloop; 2601 EV::unloop;
2453 #d# TODO calling exit here hangs the process in some futex 2602 #d# TODO calling exit here hangs the process in some futex
2454}; 2603};
2455 2604
2456{ 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 {
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458 2613
2459 if (-e "$Deliantra::VARDIR/client.cf") { 2614 if (-e "$Deliantra::VARDIR/client.cf") {
2460 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2615 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461 } else { 2616 } else {
2462 #TODO: compatibility cruft 2617 #TODO: compatibility cruft
2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2618 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464 print STDERR "INFO: used old configuration file\n"; 2619 print STDERR "INFO: used old configuration file\n";
2465 } 2620 }
2466 2621
2467 DC::DB::Server::run; 2622 DC::DB::Server::run;
2468 2623
2469 if ($CFG->{db_schema} < 1) { 2624 if ($CFG->{db_schema} < 1) {
2470 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";
2471 DC::DB::nuke_db; 2626 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1; 2627 $CFG->{db_schema} = 1;
2473 DC::write_cfg; 2628 DC::write_cfg;
2474 } 2629 }
2475 2630
2476 DC::DB::open_db; 2631 DC::DB::open_db;
2477 2632
2478 DC::UI::set_layout ($::CFG->{layout}); 2633 DC::UI::set_layout ($::CFG->{layout});
2479 2634
2480 my %DEF_CFG = ( 2635 my %DEF_CFG = (
2481 sdl_mode => 0, 2636 sdl_mode => undef,
2482 fullscreen => 1, 2637 fullscreen => 1,
2483 fast => 0, 2638 fast => 0,
2484 force_opengl11 => undef, 2639 force_opengl11 => undef,
2640 disable_alpha => 0,
2641 smooth_movement => 1,
2485 texture_compression => 1, 2642 texture_compression => 1,
2486 map_scale => 1, 2643 map_scale => 1,
2487 fow_enable => 1, 2644 fow_enable => 1,
2488 fow_intensity => 0, 2645 fow_intensity => 0,
2489 map_smoothing => 1, 2646 map_smoothing => 1,
2490 gui_fontsize => 1, 2647 gui_fontsize => 1,
2491 log_fontsize => 0.7, 2648 log_fontsize => 0.7,
2492 gauge_fontsize => 1, 2649 gauge_fontsize => 1,
2493 gauge_size => 0.35, 2650 gauge_size => 0.35,
2494 stat_fontsize => 0.7, 2651 stat_fontsize => 0.7,
2495 mapsize => 100, 2652 mapsize => 100,
2496 audio_enable => 1, 2653 audio_enable => 1,
2497 audio_hw_channels => 0, 2654 audio_hw_channels => 0,
2498 audio_hw_frequency => 0, 2655 audio_hw_frequency => 0,
2499 audio_hw_chunksize => 0, 2656 audio_hw_chunksize => 0,
2500 audio_mix_channels => 8, 2657 audio_mix_channels => 8,
2501 effects_enable => 1, 2658 effects_enable => 1,
2502 effects_volume => 1, 2659 effects_volume => 1,
2503 bgm_enable => 1, 2660 bgm_enable => 1,
2504 bgm_volume => 0.5, 2661 bgm_volume => 0.5,
2505 output_rate => "", 2662 output_rate => "",
2506 pickup => 0, 2663 pickup => 0,
2507 inv_sort => "mtime", 2664 inv_sort => "mtime",
2508 default => "profile", # default profile 2665 default => "profile", # default profile
2509 show_tips => 1, 2666 show_tips => 1,
2510 logview_max_par => 1000, 2667 logview_max_par => 1000,
2511 shift_fire_stop => 0, 2668 shift_fire_stop => 0,
2669 uitheme => "wood",
2512 ); 2670 );
2513 2671
2514 while (my ($k, $v) = each %DEF_CFG) { 2672 while (my ($k, $v) = each %DEF_CFG) {
2515 $CFG->{$k} = $v unless exists $CFG->{$k}; 2673 $CFG->{$k} = $v unless exists $CFG->{$k};
2516 } 2674 }
2517 2675
2518 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2676 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2519 $PROFILE = $CFG->{profile}{default}; 2677 $PROFILE = $CFG->{profile}{default};
2520 2678
2521 # convert old bindings (only default profile matters) 2679 # convert old bindings (only default profile matters)
2522 if (my $bindings = delete $PROFILE->{bindings}) { 2680 if (my $bindings = delete $PROFILE->{bindings}) {
2523 while (my ($mod, $syms) = each %$bindings) { 2681 while (my ($mod, $syms) = each %$bindings) {
2524 while (my ($sym, $cmds) = each %$syms) { 2682 while (my ($sym, $cmds) = each %$syms) {
2525 push @{ $PROFILE->{macro} }, { 2683 push @{ $PROFILE->{macro} }, {
2526 accelkey => [$mod*1, $sym*1], 2684 accelkey => [$mod*1, $sym*1],
2527 action => $cmds, 2685 action => $cmds,
2686 };
2528 }; 2687 }
2529 } 2688 }
2530 } 2689 }
2531 }
2532 2690
2533 sdl_init; 2691 sdl_init;
2534 2692
2535 @SDL_MODES = DC::SDL_ListModes 8, 8; 2693 {
2536 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2537 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2538
2539 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2540
2541 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2542
2543 {
2544 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2694 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545 DejaVuSans.ttf 2695 DejaVuSans.ttf
2546 DejaVuSansMono.ttf 2696 DejaVuSansMono.ttf
2547 DejaVuSans-Bold.ttf 2697 DejaVuSans-Bold.ttf
2548 DejaVuSansMono-Bold.ttf 2698 DejaVuSansMono-Bold.ttf
2549 DejaVuSans-Oblique.ttf 2699 DejaVuSans-Oblique.ttf
2550 DejaVuSansMono-Oblique.ttf 2700 DejaVuSansMono-Oblique.ttf
2551 DejaVuSans-BoldOblique.ttf 2701 DejaVuSans-BoldOblique.ttf
2552 DejaVuSansMono-BoldOblique.ttf 2702 DejaVuSansMono-BoldOblique.ttf
2553 ); 2703 );
2554 2704
2555 DC::add_font $_ for @fonts; 2705 DC::add_font $_ for @fonts;
2556 2706
2557 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2707 $FONT_PROP = new_from_file DC::Font $fonts[0];
2558 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2708 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2559 2709
2560 $FONT_PROP->make_default; 2710 $FONT_PROP->make_default;
2561 2711
2562 DC::pango_init; 2712 DC::pango_init;
2563 } 2713 }
2564 2714
2565# compare mono (ft) vs. rgba (cairo) 2715# compare mono (ft) vs. rgba (cairo)
2566# ft - 1.8s, cairo 3s, even in alpha-only mode 2716# ft - 1.8s, cairo 3s, even in alpha-only mode
2567# for my $rgba (0..1) { 2717# for my $rgba (0..1) {
2568# my $t1 = Time::HiRes::time; 2718# my $t1 = Time::HiRes::time;
… …
2573# } 2723# }
2574# my $t2 = Time::HiRes::time; 2724# my $t2 = Time::HiRes::time;
2575# warn $t2-$t1; 2725# warn $t2-$t1;
2576# } 2726# }
2577 2727
2578 video_init; 2728 video_init;
2579 audio_init; 2729 audio_init;
2580} 2730 }
2581 2731
2582show_tip_of_the_day if $CFG->{show_tips}; 2732 show_tip_of_the_day if $CFG->{show_tips};
2583 2733
2584our $STARTUP_CANCEL = EV::idle sub { 2734 our $STARTUP_CANCEL = EV::idle sub {
2585 undef $::STARTUP_CANCEL; 2735 undef $::STARTUP_CANCEL;
2586 $startup_done->(); 2736 $startup_done->();
2587}; 2737 };
2588 2738
2589delete $SIG{__DIE__}; 2739 delete $SIG{__DIE__};
2590EV::loop; 2740 EV::loop;
2591 2741
2592#video_shutdown; 2742#video_shutdown;
2593#audio_shutdown; 2743#audio_shutdown;
2594DC::OpenGL::quit; 2744 DC::OpenGL::quit;
2595DC::SDL_Quit; 2745 DC::SDL_Quit;
2596DC::DB::Server::stop; 2746 DC::DB::Server::stop;
2747}
2748
2749DC::SDL_braino; # see sub above
2597 2750
2598=head1 NAME 2751=head1 NAME
2599 2752
2600deliantra - A Deliantra MORPG game client 2753deliantra - A Deliantra MORPG game client
2601 2754
… …
2618 4 show fps 2771 4 show fps
2619 8 suppress tooltips 2772 8 suppress tooltips
2620 2773
2621=head1 AUTHOR 2774=head1 AUTHOR
2622 2775
2623Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2776Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624 2777
2625 2778
2626 2779

Diff Legend

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