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.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.84 by root, Fri Jan 9 22:38:17 2009 UTC

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

Diff Legend

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