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.44 by root, Mon May 26 03:34:02 2008 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

… …
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 # OS X
56 or die "pangoversion: $!"; 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 59 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 60 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 61 }
75 62
76 unshift @INC, $root; 63 unshift @INC, $root;
77 } 64 }
78} 65}
… …
90 77
91# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 80 if %PAR::LibCache;
94 81
95use Time::HiRes 'time';
96use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
97use List::Util qw(max min); 85use List::Util qw(max min);
98 86
99use Deliantra; 87use Deliantra;
100use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
101 89
90use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket ();
93
102use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
103 96
104use DC; 97use DC;
105#d# BEGIN { $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
106use DC::OpenGL (); 111use DC::OpenGL ();
107use DC::Protocol; 112use DC::Protocol;
108use DC::DB; 113use DC::DB;
109use DC::UI; 114use DC::UI;
110use DC::UI::Canvas; 115use DC::UI::Canvas;
111use DC::UI::Inventory; 116use DC::UI::Inventory;
112use DC::UI::SpellList; 117use DC::UI::SpellList;
113use DC::UI::Dockable; 118use DC::UI::Dockable;
114use DC::UI::Dockbar; 119use DC::UI::Dockbar;
115use DC::UI::MessageWindow;
116use DC::UI::ChatView; 120use DC::UI::ChatView;
117use DC::MessageDistributor; 121use DC::MessageDistributor;
118use DC::Pod; 122use DC::Pod;
119use DC::MapWidget; 123use DC::MapWidget;
120use DC::Macro; 124use DC::Macro;
121 125
122$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
123$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
124 128
125$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 0;
126 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
127}; 132};
128 133
129my $MAX_FPS = 60; 134my $MAX_FPS = 60;
130 135
… …
132 137
133our $LAST_REFRESH; 138our $LAST_REFRESH;
134our $NOW; 139our $NOW;
135 140
136our $CFG; 141our $CFG;
137our $CONN;
138our $PROFILE; # current profile 142our $PROFILE; # current profile
139our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
140 144
141our $WANT_REFRESH; 145our $WANT_REFRESH;
142 146
147our $MODE_SLIDER;
148our $CAVEAT_LABEL;
149
143our @SDL_MODES; 150our @SDL_MODES;
151our $SDL_REINIT = 1;
144our $WIDTH; 152our $WIDTH;
145our $HEIGHT; 153our $HEIGHT;
146our $FULLSCREEN; 154our $FULLSCREEN;
147our $FONTSIZE; 155our $FONTSIZE;
148 156
149our $FONT_PROP; 157our $FONT_PROP;
150our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
151 161
152our $MAP; 162our $MAP;
153our $MAPMAP; 163our $MAPMAP;
154our $MAPWIDGET; 164our $MAPWIDGET;
155our $COMPLETER; 165our $COMPLETER;
… …
197our $DEBUG_STATUS; 207our $DEBUG_STATUS;
198 208
199our $INV; 209our $INV;
200our $INVR; 210our $INVR;
201our $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}
202 252
203############################################################################# 253#############################################################################
204 254
205sub status { 255sub status {
206 $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]);
… …
361 my $rwops = $meta->{path} 411 my $rwops = $meta->{path}
362 ? new_from_file DC::RW $meta->{path} 412 ? new_from_file DC::RW $meta->{path}
363 : new DC::RW $$MUSIC_PLAYING_DATA; 413 : new DC::RW $$MUSIC_PLAYING_DATA;
364 414
365 $MUSIC_PLAYER = new DC::MixMusic $rwops 415 $MUSIC_PLAYER = new DC::MixMusic $rwops
366 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
367 417
368 my $NOW = time; 418 my $NOW = time;
369 419
370 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 420 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
371 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 421 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
726 776
727 $vbox->add (@dialog); 777 $vbox->add (@dialog);
728 $dialog->show; 778 $dialog->show;
729} 779}
730 780
731sub start_game { 781sub dc_connect {
732 status "logging in..."; 782 my ($host, $port) = @_;
733 783
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736
737 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;
738 786
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
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,
… …
773 } 817 }
774 }, 818 },
775 ; 819 ;
776} 820}
777 821
822sub start_game {
823 status "logging in...";
824
825 $LOGIN_BUTTON->set_text ("Logout");
826 $SETUP_DIALOG->hide;
827
828 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
829
830 $MAP = new DC::Map;
831
832 # hack to make SURE we find the IP address all right
833 # can be removed once AnyEvent::DNS is proven stable.
834 if ($host eq "gameserver.deliantra.net") {
835 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
836 if ($_[0] ne "80.101.114.108") { # Perl
837 status "dns failure, using hardcoded address";
838 $host = "129.13.162.95";
839 }
840
841 dc_connect $host, $port;
842 };
843 } else {
844 dc_connect $host, $port;
845 }
846}
847
778sub stop_game { 848sub stop_game {
849 crash "stop_game";
850
779 $LOGIN_BUTTON->set_text ("Login / Register"); 851 $LOGIN_BUTTON->set_text ("Login / Register");
780 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 852 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
781 $SETUP_DIALOG->show; 853 $SETUP_DIALOG->show;
782 $PL_WINDOW->hide; 854 $PL_WINDOW->hide;
783 $SPELL_LIST->clear_spells; 855 $SPELL_LIST->clear_spells;
… …
797} 869}
798 870
799sub graphics_setup { 871sub graphics_setup {
800 my $vbox = new DC::UI::VBox; 872 my $vbox = new DC::UI::VBox;
801 873
874 {
875 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
876
802 $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]);
803 878
804 my $row = 0; 879 my $row = 0;
805 880
806 $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");
807 $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,
808 can_events => 1, 883 can_events => 1,
809 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 884 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
810 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
811 my $vidmode_tooltip = 907 my $vidmode_tooltip =
812 "<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). "
813 . "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>.";
814 910
815 $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");
816 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
817 913
818 $hbox->add (my $mode_slider = new DC::UI::Slider 914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
819 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 ],
820 tooltip => $vidmode_tooltip); 917 tooltip => $vidmode_tooltip);
821 $hbox->add (my $mode_label = new DC::UI::Label 918 $hbox->add (my $mode_label = new DC::UI::Label
822 height => 0.8, template => "9999x9999@9+9", 919 height => 0.8, template => "9999x9999@9+9",
823 can_events => 1, tooltip => $vidmode_tooltip); 920 can_events => 1, tooltip => $vidmode_tooltip);
824 921
825 $mode_slider->connect (changed => sub { 922 $MODE_SLIDER->connect (changed => sub {
826 my ($self, $value) = @_; 923 my ($self, $value) = @_;
827 924
828 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 925 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
829 $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]});
830 }); 927 });
831 $mode_slider->emit (changed => $mode_slider->{range}[0]); 928 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
832 929
833 $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");
834 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 931 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
835 state => $CFG->{fullscreen}, 932 state => $CFG->{fullscreen},
836 tooltip => "Bring the client into fullscreen mode.", 933 tooltip => "Bring the client into fullscreen mode.",
837 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 934 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
838 ); 935 );
839 936
840 $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");
841 $table->add_at (1, $row++, new DC::UI::CheckBox 938 $table->add_at (1, $row++, new DC::UI::CheckBox
842 state => $CFG->{force_opengl11}, 939 state => $CFG->{force_opengl11},
843 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 "
844 . "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 "
845 . "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. "
846 . "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, "
847 . "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. "
848 . "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>",
849 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
850 ); 947 );
851 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
852 $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");
853 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
854 state => $CFG->{texture_compression}, 968 state => $CFG->{texture_compression},
855 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 "
856 . "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). "
857 . "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 "
858 . "forced OpenGL 1.1 mode.", 972 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
860 ); 974 );
861 975
862 $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");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{fast}, 978 state => $CFG->{fast},
865 tooltip => "Lower the visual quality considerably to speed up rendering.", 979 tooltip => "Lower the visual quality considerably to speed up rendering.",
866 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
867 ); 981 );
868 982
869 $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");
870 $table->add_at (1, $row++, new DC::UI::Slider 984 $table->add_at (1, $row++, new DC::UI::Slider
871 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 985 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
872 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.",
873 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 987 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
874 ); 988 );
875 989
876 $table->add_at (1, $row++, new DC::UI::Button 990 $table->add_at (1, $row++, new DC::UI::Button
877 expand => 1, text => "Apply", 991 expand => 1, text => "Apply",
878 tooltip => "Apply the video settings above.", 992 tooltip => "Apply the video settings above.",
879 on_activate => sub { 993 on_activate => sub {
880 video_shutdown (); 994 video_shutdown ();
881 video_init (); 995 video_init ();
996 0
882 0 997 }
883 } 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 }
884 ); 1014 );
885 1015
886 $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");
887 $table->add_at (1, $row++, new DC::UI::Slider 1017 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
889 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
890 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 }
891 ); 1021 );
892 1022
893 $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");
894 $table->add_at (1, $row++, new DC::UI::CheckBox 1024 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{map_smoothing}, 1025 state => $CFG->{map_smoothing},
896 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. "
897 . "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. "
898 . "Changes take effect at next login only.", 1028 . "Changes take effect at next login only.",
899 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
900 ); 1030 );
901 1031
902 $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");
903 $table->add_at (1, $row++, new DC::UI::CheckBox 1033 $table->add_at (1, $row++, new DC::UI::CheckBox
904 state => $CFG->{fow_enable}, 1034 state => $CFG->{fow_enable},
905 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.",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
907 ); 1037 );
908 1038
909 $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");
910 $table->add_at (1, $row++, new DC::UI::Slider 1040 $table->add_at (1, $row++, new DC::UI::Slider
911 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
912 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.",
913 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
914 ); 1044 );
915 1045
916 $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");
917 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
918 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1048 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
919 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, "
920 . "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.",
921 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 },
922 ); 1052 );
923 1053
924 $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");
925 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
926 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1056 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
927 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.",
928 on_changed => sub { 1058 on_changed => sub {
929 $CFG->{gauge_fontsize} = $_[1]; 1059 $CFG->{gauge_fontsize} = $_[1];
930 &set_gauge_window_fontsize; 1060 &set_gauge_window_fontsize;
1061 0
931 0 1062 }
932 } 1063 );
933 );
934 1064
935 $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");
936 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
937 range => [$CFG->{gauge_size}, 0.2, 0.8], 1067 range => [$CFG->{gauge_size}, 0.2, 0.8],
938 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.",
939 on_changed => sub { 1069 on_changed => sub {
940 $CFG->{gauge_size} = $_[1]; 1070 $CFG->{gauge_size} = $_[1];
941 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1071 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1072 0
942 0 1073 }
943 } 1074 );
944 ); 1075 }
945 1076
946 $vbox 1077 $vbox
947} 1078}
948 1079
949our $AUDIO_HW_CHUNKSIZE; 1080our $AUDIO_HW_CHUNKSIZE;
… …
1528 1 1659 1
1529 }, 1660 },
1530 ); 1661 );
1531 1662
1532 $vbox->add (new DC::UI::FancyFrame 1663 $vbox->add (new DC::UI::FancyFrame
1533 label => "Registering", 1664 label => "How to Play",
1534 min_h => 200, 1665 min_h => 240,
1535 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1666 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1536 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). "
1537 "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 "
1538 . "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.",
1539 ), 1672 ),
1540 ); 1673 );
1541 1674
1542 $vbox 1675 $vbox
… …
1688 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1821 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1689 ["Ignore cursed" => PICKUP_NOT_CURSED], 1822 ["Ignore cursed" => PICKUP_NOT_CURSED],
1690 ["Jewelery" => PICKUP_JEWELS], 1823 ["Jewelery" => PICKUP_JEWELS],
1691 ["Flesh" => PICKUP_FLESH], 1824 ["Flesh" => PICKUP_FLESH],
1692 ], 1825 ],
1693 ["Weight/Value ratio", 2, 17] 1826 ["Value/Weight ratio", 2, 17]
1694 ) 1827 )
1695 { 1828 {
1696 my ($title, $x, $y, @bits) = @$_; 1829 my ($title, $x, $y, @bits) = @$_;
1697 $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]);
1698 1831
… …
1723 } 1856 }
1724 1857
1725 $table->add_at (2, 18, new DC::UI::ValSlider 1858 $table->add_at (2, 18, new DC::UI::ValSlider
1726 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1859 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1727 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).",
1728 to_value => sub { ">= " . 5 * $_[0] }, 1862 to_value => sub { ">= " . 5 * $_[0] },
1729 on_changed => sub { 1863 on_changed => sub {
1730 my ($slider, $value) = @_; 1864 my ($slider, $value) = @_;
1731 1865
1732 $::CFG->{pickup} &= ~0xF; 1866 $::CFG->{pickup} &= ~0xF;
… …
1788 $::CFG->{inv_sort} = $_[1]; 1922 $::CFG->{inv_sort} = $_[1];
1789 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1923 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1790 }, 1924 },
1791 ); 1925 );
1792 $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);
1793 #TODO# update to weigh/maxweight 1927 #TODO# update to weight/maxweight
1794 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1928 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1795 1929
1796 $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);
1797 $sw1->add ($INV = new DC::UI::Inventory); 1931 $sw1->add ($INV = new DC::UI::Inventory);
1798 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1932 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2062 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2063 ); 2197 );
2064 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2065 text => "Quit anyway", 2199 text => "Quit anyway",
2066 expand => 1, 2200 expand => 1,
2067 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2068 ); 2205 );
2069 } 2206 }
2070 2207
2071 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2072 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
… …
2125 $dialog->show; 2262 $dialog->show;
2126 }; 2263 };
2127} 2264}
2128 2265
2129sub sdl_init { 2266sub sdl_init {
2130 DC::SDL_Init 2267 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2131 and die "SDL::Init failed!\n"; 2268 and die "SDL::Init failed!\n";
2132} 2269}
2133 2270
2134sub 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
2135 $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 }
2136 2294
2137 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2295 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2138 2296
2139 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2297 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2140 $FULLSCREEN = $CFG->{fullscreen}; 2298 $FULLSCREEN = $CFG->{fullscreen};
2141 $FAST = $CFG->{fast}; 2299 $FAST = $CFG->{fast};
2142 2300
2301 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2143 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
2144 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2304 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2145 2305
2146 $SDL_ACTIVE = 1; 2306 $SDL_ACTIVE = 1;
2147 $LAST_REFRESH = time - 0.01; 2307 $LAST_REFRESH = time - 0.01;
2148 2308
… …
2215 x => 0, 2375 x => 0,
2216 y => $FONTSIZE + 8, 2376 y => $FONTSIZE + 8,
2217 border_bg => [1, 1, 1, 192/255], 2377 border_bg => [1, 1, 1, 192/255],
2218 bg => [1, 1, 1, 0], 2378 bg => [1, 1, 1, 0],
2219 child => ($MAPMAP = new DC::MapWidget::MapMap 2379 child => ($MAPMAP = new DC::MapWidget::MapMap
2220 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.",
2221 ), 2381 ),
2222 )->show; 2382 )->show;
2223 2383
2224 $MAPWIDGET = new DC::MapWidget; 2384 $MAPWIDGET = new DC::MapWidget;
2225 $MAPWIDGET->connect (activate_console => sub { 2385 $MAPWIDGET->connect (activate_console => sub {
… …
2324 $BUTTONBAR->show; 2484 $BUTTONBAR->show;
2325 $SETUP_DIALOG->show; 2485 $SETUP_DIALOG->show;
2326 $MESSAGE_WINDOW->show; 2486 $MESSAGE_WINDOW->show;
2327 } 2487 }
2328 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
2329 $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]);
2330} 2497}
2331 2498
2332sub video_shutdown { 2499sub video_shutdown {
2333 DC::OpenGL::shutdown; 2500 DC::OpenGL::shutdown;
2501 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2334 2502
2335 undef $SDL_ACTIVE; 2503 undef $SDL_ACTIVE;
2336} 2504}
2337 2505
2338my %animate_object; 2506my %animate_object;
… …
2381 delete $animate_object{$widget}; 2549 delete $animate_object{$widget};
2382} 2550}
2383 2551
2384%SDL_CB = ( 2552%SDL_CB = (
2385 DC::SDL_QUIT => sub { 2553 DC::SDL_QUIT => sub {
2554 crash "SDL_QUIT";
2386 EV::unloop EV::UNLOOP_ALL; 2555 EV::unloop EV::UNLOOP_ALL;
2387 }, 2556 },
2388 DC::SDL_VIDEORESIZE => sub { 2557 DC::SDL_VIDEORESIZE => sub {
2389 }, 2558 },
2390 DC::SDL_VIDEOEXPOSE => sub { 2559 DC::SDL_VIDEOEXPOSE => sub {
… …
2399# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2568# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2400 }, 2569 },
2401 DC::SDL_KEYDOWN => sub { 2570 DC::SDL_KEYDOWN => sub {
2402 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2571 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2403 # alt-enter 2572 # alt-enter
2573 video_shutdown;
2404 $FULLSCREEN_ENABLE->toggle; 2574 $FULLSCREEN_ENABLE->toggle;
2405 video_shutdown;
2406 video_init; 2575 video_init;
2407 } else { 2576 } else {
2408 &DC::UI::feed_sdl_key_down_event; 2577 &DC::UI::feed_sdl_key_down_event;
2409 } 2578 }
2410 update_modbox; 2579 update_modbox;
… …
2430$SIG{INT} = $SIG{TERM} = sub { 2599$SIG{INT} = $SIG{TERM} = sub {
2431 EV::unloop; 2600 EV::unloop;
2432 #d# TODO calling exit here hangs the process in some futex 2601 #d# TODO calling exit here hangs the process in some futex
2433}; 2602};
2434 2603
2435{ 2604# due to mac os x + sdl combined briandamage, we need this contortion
2605sub main {
2606 {
2436 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2607 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2437 2608
2438 if (-e "$Deliantra::VARDIR/client.cf") { 2609 if (-e "$Deliantra::VARDIR/client.cf") {
2439 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2610 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2440 } else { 2611 } else {
2441 #TODO: compatibility cruft 2612 #TODO: compatibility cruft
2442 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2613 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2443 print STDERR "INFO: used old configuration file\n"; 2614 print STDERR "INFO: used old configuration file\n";
2444 } 2615 }
2445 2616
2446 DC::DB::Server::run; 2617 DC::DB::Server::run;
2447 2618
2448 if ($CFG->{db_schema} < 1) { 2619 if ($CFG->{db_schema} < 1) {
2449 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";
2450 DC::DB::nuke_db; 2621 DC::DB::nuke_db;
2451 $CFG->{db_schema} = 1; 2622 $CFG->{db_schema} = 1;
2452 DC::write_cfg; 2623 DC::write_cfg;
2453 } 2624 }
2454 2625
2455 DC::DB::open_db; 2626 DC::DB::open_db;
2456 2627
2457 DC::UI::set_layout ($::CFG->{layout}); 2628 DC::UI::set_layout ($::CFG->{layout});
2458 2629
2459 my %DEF_CFG = ( 2630 my %DEF_CFG = (
2460 sdl_mode => 0, 2631 sdl_mode => undef,
2461 fullscreen => 1, 2632 fullscreen => 1,
2462 fast => 0, 2633 fast => 0,
2463 force_opengl11 => undef, 2634 force_opengl11 => undef,
2635 disable_alpha => 0,
2636 smooth_movement => 1,
2464 texture_compression => 1, 2637 texture_compression => 1,
2465 map_scale => 1, 2638 map_scale => 1,
2466 fow_enable => 1, 2639 fow_enable => 1,
2467 fow_intensity => 0, 2640 fow_intensity => 0,
2468 map_smoothing => 1, 2641 map_smoothing => 1,
2469 gui_fontsize => 1, 2642 gui_fontsize => 1,
2470 log_fontsize => 0.7, 2643 log_fontsize => 0.7,
2471 gauge_fontsize => 1, 2644 gauge_fontsize => 1,
2472 gauge_size => 0.35, 2645 gauge_size => 0.35,
2473 stat_fontsize => 0.7, 2646 stat_fontsize => 0.7,
2474 mapsize => 100, 2647 mapsize => 100,
2475 audio_enable => 1, 2648 audio_enable => 1,
2476 audio_hw_channels => 0, 2649 audio_hw_channels => 0,
2477 audio_hw_frequency => 0, 2650 audio_hw_frequency => 0,
2478 audio_hw_chunksize => 0, 2651 audio_hw_chunksize => 0,
2479 audio_mix_channels => 8, 2652 audio_mix_channels => 8,
2480 effects_enable => 1, 2653 effects_enable => 1,
2481 effects_volume => 1, 2654 effects_volume => 1,
2482 bgm_enable => 1, 2655 bgm_enable => 1,
2483 bgm_volume => 0.5, 2656 bgm_volume => 0.5,
2484 output_rate => "", 2657 output_rate => "",
2485 pickup => 0, 2658 pickup => 0,
2486 inv_sort => "mtime", 2659 inv_sort => "mtime",
2487 default => "profile", # default profile 2660 default => "profile", # default profile
2488 show_tips => 1, 2661 show_tips => 1,
2489 logview_max_par => 1000, 2662 logview_max_par => 1000,
2490 shift_fire_stop => 0, 2663 shift_fire_stop => 0,
2664 uitheme => "wood",
2491 ); 2665 );
2492 2666
2493 while (my ($k, $v) = each %DEF_CFG) { 2667 while (my ($k, $v) = each %DEF_CFG) {
2494 $CFG->{$k} = $v unless exists $CFG->{$k}; 2668 $CFG->{$k} = $v unless exists $CFG->{$k};
2495 } 2669 }
2496 2670
2497 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2671 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2498 $PROFILE = $CFG->{profile}{default}; 2672 $PROFILE = $CFG->{profile}{default};
2499 2673
2500 # convert old bindings (only default profile matters) 2674 # convert old bindings (only default profile matters)
2501 if (my $bindings = delete $PROFILE->{bindings}) { 2675 if (my $bindings = delete $PROFILE->{bindings}) {
2502 while (my ($mod, $syms) = each %$bindings) { 2676 while (my ($mod, $syms) = each %$bindings) {
2503 while (my ($sym, $cmds) = each %$syms) { 2677 while (my ($sym, $cmds) = each %$syms) {
2504 push @{ $PROFILE->{macro} }, { 2678 push @{ $PROFILE->{macro} }, {
2505 accelkey => [$mod*1, $sym*1], 2679 accelkey => [$mod*1, $sym*1],
2506 action => $cmds, 2680 action => $cmds,
2681 };
2507 }; 2682 }
2508 } 2683 }
2509 } 2684 }
2510 }
2511 2685
2512 sdl_init; 2686 sdl_init;
2513 2687
2514 @SDL_MODES = DC::SDL_ListModes 8, 8; 2688 {
2515 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2516 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2517
2518 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2519
2520 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2521
2522 {
2523 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2689 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2524 DejaVuSans.ttf 2690 DejaVuSans.ttf
2525 DejaVuSansMono.ttf 2691 DejaVuSansMono.ttf
2526 DejaVuSans-Bold.ttf 2692 DejaVuSans-Bold.ttf
2527 DejaVuSansMono-Bold.ttf 2693 DejaVuSansMono-Bold.ttf
2528 DejaVuSans-Oblique.ttf 2694 DejaVuSans-Oblique.ttf
2529 DejaVuSansMono-Oblique.ttf 2695 DejaVuSansMono-Oblique.ttf
2530 DejaVuSans-BoldOblique.ttf 2696 DejaVuSans-BoldOblique.ttf
2531 DejaVuSansMono-BoldOblique.ttf 2697 DejaVuSansMono-BoldOblique.ttf
2532 ); 2698 );
2533 2699
2534 DC::add_font $_ for @fonts; 2700 DC::add_font $_ for @fonts;
2535 2701
2536 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2702 $FONT_PROP = new_from_file DC::Font $fonts[0];
2537 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2703 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2538 2704
2539 $FONT_PROP->make_default; 2705 $FONT_PROP->make_default;
2540 2706
2541 DC::pango_init; 2707 DC::pango_init;
2542 } 2708 }
2543 2709
2544# compare mono (ft) vs. rgba (cairo) 2710# compare mono (ft) vs. rgba (cairo)
2545# ft - 1.8s, cairo 3s, even in alpha-only mode 2711# ft - 1.8s, cairo 3s, even in alpha-only mode
2546# for my $rgba (0..1) { 2712# for my $rgba (0..1) {
2547# my $t1 = Time::HiRes::time; 2713# my $t1 = Time::HiRes::time;
… …
2552# } 2718# }
2553# my $t2 = Time::HiRes::time; 2719# my $t2 = Time::HiRes::time;
2554# warn $t2-$t1; 2720# warn $t2-$t1;
2555# } 2721# }
2556 2722
2557 video_init; 2723 video_init;
2558 audio_init; 2724 audio_init;
2559} 2725 }
2560 2726
2561show_tip_of_the_day if $CFG->{show_tips}; 2727 show_tip_of_the_day if $CFG->{show_tips};
2562 2728
2563our $STARTUP_CANCEL = EV::idle sub { 2729 our $STARTUP_CANCEL = EV::idle sub {
2564 undef $::STARTUP_CANCEL; 2730 undef $::STARTUP_CANCEL;
2565 $startup_done->(); 2731 $startup_done->();
2566}; 2732 };
2567 2733
2568delete $SIG{__DIE__}; 2734 delete $SIG{__DIE__};
2569EV::loop; 2735 EV::loop;
2570 2736
2571#video_shutdown; 2737#video_shutdown;
2572#audio_shutdown; 2738#audio_shutdown;
2573DC::OpenGL::quit; 2739 DC::OpenGL::quit;
2574DC::SDL_Quit; 2740 DC::SDL_Quit;
2575DC::DB::Server::stop; 2741 DC::DB::Server::stop;
2742}
2743
2744DC::SDL_braino; # see sub above
2576 2745
2577=head1 NAME 2746=head1 NAME
2578 2747
2579deliantra - A Deliantra MORPG game client 2748deliantra - A Deliantra MORPG game client
2580 2749
… …
2597 4 show fps 2766 4 show fps
2598 8 suppress tooltips 2767 8 suppress tooltips
2599 2768
2600=head1 AUTHOR 2769=head1 AUTHOR
2601 2770
2602Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2771Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2603 2772
2604 2773
2605 2774

Diff Legend

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