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.48 by root, Mon Jul 7 08:02:17 2008 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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