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.42 by elmex, Thu May 8 18:25:25 2008 UTC vs.
Revision 1.81 by root, Mon Dec 22 02:33:30 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; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 97use DC;
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
105use DC::OpenGL (); 111use DC::OpenGL ();
106use DC::Protocol; 112use DC::Protocol;
107use DC::DB; 113use DC::DB;
108use DC::UI; 114use DC::UI;
109use DC::UI::Canvas; 115use DC::UI::Canvas;
110use DC::UI::Inventory; 116use DC::UI::Inventory;
111use DC::UI::SpellList; 117use DC::UI::SpellList;
112use DC::UI::Dockable; 118use DC::UI::Dockable;
113use DC::UI::Dockbar; 119use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 120use DC::UI::ChatView;
116use DC::MessageDistributor; 121use DC::MessageDistributor;
117use DC::Pod; 122use DC::Pod;
118use DC::MapWidget; 123use DC::MapWidget;
119use DC::Macro; 124use DC::Macro;
120 125
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
123 128
124$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1;
125 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
126}; 132};
127 133
128my $MAX_FPS = 60; 134my $MAX_FPS = 60;
129 135
… …
131 137
132our $LAST_REFRESH; 138our $LAST_REFRESH;
133our $NOW; 139our $NOW;
134 140
135our $CFG; 141our $CFG;
136our $CONN;
137our $PROFILE; # current profile 142our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 144
140our $WANT_REFRESH; 145our $WANT_REFRESH;
141 146
147our $MODE_SLIDER;
148our $CAVEAT_LABEL;
149
142our @SDL_MODES; 150our @SDL_MODES;
151our $SDL_REINIT = 1;
143our $WIDTH; 152our $WIDTH;
144our $HEIGHT; 153our $HEIGHT;
145our $FULLSCREEN; 154our $FULLSCREEN;
146our $FONTSIZE; 155our $FONTSIZE;
147 156
148our $FONT_PROP; 157our $FONT_PROP;
149our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
150 161
151our $MAP; 162our $MAP;
152our $MAPMAP; 163our $MAPMAP;
153our $MAPWIDGET; 164our $MAPWIDGET;
154our $COMPLETER; 165our $COMPLETER;
… …
196our $DEBUG_STATUS; 207our $DEBUG_STATUS;
197 208
198our $INV; 209our $INV;
199our $INVR; 210our $INVR;
200our $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 return unless $CONN;
221
222 my $fh = $CONN->{fh}
223 or return;
224
225 my $buf = delete $CONN->{wbuf};
226
227 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
228
229 AnyEvent::Util::fh_nonblocking $fh, 0;
230 syswrite $fh, $buf;
231 AnyEvent::Util::fh_nonblocking $fh, 1;
232
233 $msg =~ s/\s+$//;
234
235 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace;
238};
201 239
202############################################################################# 240#############################################################################
203 241
204sub status { 242sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
725 763
726 $vbox->add (@dialog); 764 $vbox->add (@dialog);
727 $dialog->show; 765 $dialog->show;
728} 766}
729 767
730sub start_game { 768sub dc_connect {
731 status "logging in..."; 769 my ($host, $port) = @_;
732 770
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
772 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
737 773
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 774 $CONN =
743 new DC::Protocol 775 new DC::Protocol
744 host => $host, 776 host => $host,
745 port => $port || 13327, 777 port => $port,
746 user => $PROFILE->{user}, 778 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 779 pass => $PROFILE->{password},
748 mapw => $mapsize, 780 mapw => $mapw,
749 maph => $mapsize, 781 maph => $maph,
750 782
751 client => "$DC::VERSION $] $^O", 783 client => "$DC::VERSION $] $^O",
752 784
753 map_widget => $MAPWIDGET, 785 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 786 statusbox => $STATUSBOX,
… …
757 query => \&server_query, 789 query => \&server_query,
758 790
759 setup_req => { 791 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 792 smoothing => $CFG->{map_smoothing}*1,
761 }, 793 },
762 };
763 794
764 if ($CONN) { 795 on_connect => sub {
796 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 797 DC::lowdelay fileno $CONN->{fh};
766 798
767 status "login successful"; 799 status "login successful";
800 } else {
801 undef $CONN;
802 status "unable to connect: $!";
803 stop_game();
804 }
805 },
806 ;
807}
808
809sub start_game {
810 status "logging in...";
811
812 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816
817 $MAP = new DC::Map;
818
819 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 if ($_[0] ne "80.101.114.108") { # Perl
824 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95";
826 }
827
828 dc_connect $host, $port;
829 };
768 } else { 830 } else {
769 warn $@; 831 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 832 }
773} 833}
774 834
775sub stop_game { 835sub stop_game {
836 crash "stop_game";
837
776 $LOGIN_BUTTON->set_text ("Login / Register"); 838 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 839 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 840 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 841 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 842 $SPELL_LIST->clear_spells;
… …
794} 856}
795 857
796sub graphics_setup { 858sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 859 my $vbox = new DC::UI::VBox;
798 860
861 {
862 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
863
799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 864 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
800 865
801 my $row = 0; 866 my $row = 0;
802 867
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 869 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 870 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 871 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 872
873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
874 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
875 can_events => 1,
876 tooltip => "This field shows any known issues with your config or driver, such as "
877 . "a non-accelerated display format. You can try to work around these issues "
878 . "by selecting a different video mode, changing the settings below or "
879 . "by installing the right driver for your graphics card.");
880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
882 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
883 value => $CFG->{uitheme},
884 options => [
885 [wood => "Wood (the default)"],
886 [plain => "Plain (very)"],
887 [blue => "Blue (dark)"],
888 [metal => "Metal (light)"],
889 ],
890 tooltip => "Choose the User Interface theme that you like most :)",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
892 );
893
808 my $vidmode_tooltip = 894 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 895 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 896 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 897
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 898 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 900
815 $hbox->add (my $mode_slider = new DC::UI::Slider 901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 902 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 904 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 905 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 906 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 907 can_events => 1, tooltip => $vidmode_tooltip);
821 908
822 $mode_slider->connect (changed => sub { 909 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 910 my ($self, $value) = @_;
824 911
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 912 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 913 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 914 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 915 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 916
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 918 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 919 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 920 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 921 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 922 );
836 923
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 925 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 926 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 927 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 928 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 929 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 930 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 931 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 932 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 933 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 934 );
848 935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha},
939 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
945 on_changed => sub {
946 my ($self, $value) = @_;
947 $CFG->{disable_alpha} = $value;
948 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
949 0
950 }
951 );
952
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 955 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 956 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 957 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 958 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 959 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 961 );
858 962
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 964 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 965 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 966 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 968 );
865 969
866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
867 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 972 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 973 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 974 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 975 );
872 976
873 $table->add_at (1, $row++, new DC::UI::Button 977 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 978 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 979 tooltip => "Apply the video settings above.",
876 on_activate => sub { 980 on_activate => sub {
877 video_shutdown (); 981 video_shutdown ();
878 video_init (); 982 video_init ();
983 0
879 0 984 }
880 } 985 );
986 }
987
988 {
989 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
990
991 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
992
993 my $row = 0;
994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
995 $table->add_at (1, $row++, new DC::UI::CheckBox
996 state => $CFG->{smooth_movement},
997 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
999 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1001 );
882 1002
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
888 ); 1008 );
889 1009
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1011 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1012 state => $CFG->{map_smoothing},
893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1013 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
894 . "This increases load on the graphics subsystem and works only with TRT servers. " 1014 . "This increases load on the graphics subsystem and works only with TRT servers. "
895 . "Changes take effect at next login only.", 1015 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1017 );
898 1018
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1021 state => $CFG->{fow_enable},
902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1022 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1024 );
905 1025
906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
907 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1029 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1031 );
912 1032
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
914 $table->add_at (1, $row++, new DC::UI::Slider 1034 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1035 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1036 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1037 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1038 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1039 );
920 1040
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1042 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1043 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1044 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1045 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1046 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1047 &set_gauge_window_fontsize;
1048 0
928 0 1049 }
929 } 1050 );
930 );
931 1051
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
933 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1054 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1055 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
936 on_changed => sub { 1056 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1057 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1058 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1059 0
939 0 1060 }
940 } 1061 );
941 ); 1062 }
942 1063
943 $vbox 1064 $vbox
944} 1065}
945 1066
946our $AUDIO_HW_CHUNKSIZE; 1067our $AUDIO_HW_CHUNKSIZE;
… …
1525 1 1646 1
1526 }, 1647 },
1527 ); 1648 );
1528 1649
1529 $vbox->add (new DC::UI::FancyFrame 1650 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1651 label => "How to Play",
1531 min_h => 200, 1652 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1653 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1654 markup =>
1655 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1656 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1657 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1658 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1659 ),
1537 ); 1660 );
1538 1661
1539 $vbox 1662 $vbox
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1808 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1809 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1810 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1811 ["Flesh" => PICKUP_FLESH],
1689 ], 1812 ],
1690 ["Weight/Value ratio", 2, 17] 1813 ["Value/Weight ratio", 2, 17]
1691 ) 1814 )
1692 { 1815 {
1693 my ($title, $x, $y, @bits) = @$_; 1816 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1817 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1818
… …
1720 } 1843 }
1721 1844
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1845 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1846 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1847 template => ">= 99",
1848 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1849 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1850 on_changed => sub {
1727 my ($slider, $value) = @_; 1851 my ($slider, $value) = @_;
1728 1852
1729 $::CFG->{pickup} &= ~0xF; 1853 $::CFG->{pickup} &= ~0xF;
… …
1785 $::CFG->{inv_sort} = $_[1]; 1909 $::CFG->{inv_sort} = $_[1];
1786 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1910 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1787 }, 1911 },
1788 ); 1912 );
1789 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1913 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1790 #TODO# update to weigh/maxweight 1914 #TODO# update to weight/maxweight
1791 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1915 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1792 1916
1793 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1917 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1794 $sw1->add ($INV = new DC::UI::Inventory); 1918 $sw1->add ($INV = new DC::UI::Inventory);
1795 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1919 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2059 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2183 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2060 ); 2184 );
2061 $hb->add (new DC::UI::Button 2185 $hb->add (new DC::UI::Button
2062 text => "Quit anyway", 2186 text => "Quit anyway",
2063 expand => 1, 2187 expand => 1,
2064 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2188 on_activate => sub {
2189 crash "Quit anyway";
2190 EV::unloop EV::UNLOOP_ALL;
2191 },
2065 ); 2192 );
2066 } 2193 }
2067 2194
2068 $QUIT_DIALOG->show; 2195 $QUIT_DIALOG->show;
2069 $QUIT_DIALOG->grab_focus; 2196 $QUIT_DIALOG->grab_focus;
… …
2122 $dialog->show; 2249 $dialog->show;
2123 }; 2250 };
2124} 2251}
2125 2252
2126sub sdl_init { 2253sub sdl_init {
2127 DC::SDL_Init 2254 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2128 and die "SDL::Init failed!\n"; 2255 and die "SDL::Init failed!\n";
2129} 2256}
2130 2257
2131sub video_init { 2258sub video_init {
2259 DC::set_theme $CFG->{uitheme};
2260
2261 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2262 $SDL_REINIT = 0;
2263
2264 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2265 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2266 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2267 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2268
2269 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2270
2132 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2271 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2272 $CFG->{sdl_mode} = 0; # lowest resolution by default
2273
2274 # now choose biggest mode <= 1024x768
2275 for (0 .. $#SDL_MODES) {
2276 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2277 $CFG->{sdl_mode} = $_;
2278 }
2279 }
2280 }
2133 2281
2134 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2282 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2135 2283
2136 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2284 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2137 $FULLSCREEN = $CFG->{fullscreen}; 2285 $FULLSCREEN = $CFG->{fullscreen};
2138 $FAST = $CFG->{fast}; 2286 $FAST = $CFG->{fast};
2139 2287
2288 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2140 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2289 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2290 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2141 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2291 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2142 2292
2143 $SDL_ACTIVE = 1; 2293 $SDL_ACTIVE = 1;
2144 $LAST_REFRESH = time - 0.01; 2294 $LAST_REFRESH = time - 0.01;
2145 2295
… …
2212 x => 0, 2362 x => 0,
2213 y => $FONTSIZE + 8, 2363 y => $FONTSIZE + 8,
2214 border_bg => [1, 1, 1, 192/255], 2364 border_bg => [1, 1, 1, 192/255],
2215 bg => [1, 1, 1, 0], 2365 bg => [1, 1, 1, 0],
2216 child => ($MAPMAP = new DC::MapWidget::MapMap 2366 child => ($MAPMAP = new DC::MapWidget::MapMap
2217 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2218 ), 2368 ),
2219 )->show; 2369 )->show;
2220 2370
2221 $MAPWIDGET = new DC::MapWidget; 2371 $MAPWIDGET = new DC::MapWidget;
2222 $MAPWIDGET->connect (activate_console => sub { 2372 $MAPWIDGET->connect (activate_console => sub {
… …
2321 $BUTTONBAR->show; 2471 $BUTTONBAR->show;
2322 $SETUP_DIALOG->show; 2472 $SETUP_DIALOG->show;
2323 $MESSAGE_WINDOW->show; 2473 $MESSAGE_WINDOW->show;
2324 } 2474 }
2325 2475
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478
2479 $CAVEAT_LABEL->set_text ("None :)");
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482
2326 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2483 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2327} 2484}
2328 2485
2329sub video_shutdown { 2486sub video_shutdown {
2330 DC::OpenGL::shutdown; 2487 DC::OpenGL::shutdown;
2488 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2331 2489
2332 undef $SDL_ACTIVE; 2490 undef $SDL_ACTIVE;
2333} 2491}
2334 2492
2335my %animate_object; 2493my %animate_object;
… …
2378 delete $animate_object{$widget}; 2536 delete $animate_object{$widget};
2379} 2537}
2380 2538
2381%SDL_CB = ( 2539%SDL_CB = (
2382 DC::SDL_QUIT => sub { 2540 DC::SDL_QUIT => sub {
2541 crash "SDL_QUIT";
2383 EV::unloop EV::UNLOOP_ALL; 2542 EV::unloop EV::UNLOOP_ALL;
2384 }, 2543 },
2385 DC::SDL_VIDEORESIZE => sub { 2544 DC::SDL_VIDEORESIZE => sub {
2386 }, 2545 },
2387 DC::SDL_VIDEOEXPOSE => sub { 2546 DC::SDL_VIDEOEXPOSE => sub {
… …
2396# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2397 }, 2556 },
2398 DC::SDL_KEYDOWN => sub { 2557 DC::SDL_KEYDOWN => sub {
2399 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2400 # alt-enter 2559 # alt-enter
2560 video_shutdown;
2401 $FULLSCREEN_ENABLE->toggle; 2561 $FULLSCREEN_ENABLE->toggle;
2402 video_shutdown;
2403 video_init; 2562 video_init;
2404 } else { 2563 } else {
2405 &DC::UI::feed_sdl_key_down_event; 2564 &DC::UI::feed_sdl_key_down_event;
2406 } 2565 }
2407 update_modbox; 2566 update_modbox;
… …
2427$SIG{INT} = $SIG{TERM} = sub { 2586$SIG{INT} = $SIG{TERM} = sub {
2428 EV::unloop; 2587 EV::unloop;
2429 #d# TODO calling exit here hangs the process in some futex 2588 #d# TODO calling exit here hangs the process in some futex
2430}; 2589};
2431 2590
2432{ 2591# due to mac os x + sdl combined briandamage, we need this contortion
2592sub main {
2593 {
2433 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2434 2595
2435 if (-e "$Deliantra::VARDIR/client.cf") { 2596 if (-e "$Deliantra::VARDIR/client.cf") {
2436 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2597 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2437 } else { 2598 } else {
2438 #TODO: compatibility cruft 2599 #TODO: compatibility cruft
2439 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2600 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2440 print STDERR "INFO: used old configuration file\n"; 2601 print STDERR "INFO: used old configuration file\n";
2441 } 2602 }
2442 2603
2443 DC::DB::Server::run; 2604 DC::DB::Server::run;
2444 2605
2445 if ($CFG->{db_schema} < 1) { 2606 if ($CFG->{db_schema} < 1) {
2446 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2607 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2447 DC::DB::nuke_db; 2608 DC::DB::nuke_db;
2448 $CFG->{db_schema} = 1; 2609 $CFG->{db_schema} = 1;
2449 DC::write_cfg; 2610 DC::write_cfg;
2450 } 2611 }
2451 2612
2452 DC::DB::open_db; 2613 DC::DB::open_db;
2453 2614
2454 DC::UI::set_layout ($::CFG->{layout}); 2615 DC::UI::set_layout ($::CFG->{layout});
2455 2616
2456 my %DEF_CFG = ( 2617 my %DEF_CFG = (
2457 sdl_mode => 0, 2618 sdl_mode => undef,
2458 fullscreen => 1, 2619 fullscreen => 1,
2459 fast => 0, 2620 fast => 0,
2460 force_opengl11 => undef, 2621 force_opengl11 => undef,
2622 disable_alpha => 0,
2623 smooth_movement => 1,
2461 texture_compression => 1, 2624 texture_compression => 1,
2462 map_scale => 1, 2625 map_scale => 1,
2463 fow_enable => 1, 2626 fow_enable => 1,
2464 fow_intensity => 0, 2627 fow_intensity => 0,
2465 map_smoothing => 1, 2628 map_smoothing => 1,
2466 gui_fontsize => 1, 2629 gui_fontsize => 1,
2467 log_fontsize => 0.7, 2630 log_fontsize => 0.7,
2468 gauge_fontsize => 1, 2631 gauge_fontsize => 1,
2469 gauge_size => 0.35, 2632 gauge_size => 0.35,
2470 stat_fontsize => 0.7, 2633 stat_fontsize => 0.7,
2471 mapsize => 100, 2634 mapsize => 100,
2472 audio_enable => 1, 2635 audio_enable => 1,
2473 audio_hw_channels => 0, 2636 audio_hw_channels => 0,
2474 audio_hw_frequency => 0, 2637 audio_hw_frequency => 0,
2475 audio_hw_chunksize => 0, 2638 audio_hw_chunksize => 0,
2476 audio_mix_channels => 8, 2639 audio_mix_channels => 8,
2477 effects_enable => 1, 2640 effects_enable => 1,
2478 effects_volume => 1, 2641 effects_volume => 1,
2479 bgm_enable => 1, 2642 bgm_enable => 1,
2480 bgm_volume => 0.5, 2643 bgm_volume => 0.5,
2481 output_rate => "", 2644 output_rate => "",
2482 pickup => 0, 2645 pickup => 0,
2483 inv_sort => "mtime", 2646 inv_sort => "mtime",
2484 default => "profile", # default profile 2647 default => "profile", # default profile
2485 show_tips => 1, 2648 show_tips => 1,
2486 logview_max_par => 1000, 2649 logview_max_par => 1000,
2487 shift_fire_stop => 0, 2650 shift_fire_stop => 0,
2651 uitheme => "wood",
2488 ); 2652 );
2489 2653
2490 while (my ($k, $v) = each %DEF_CFG) { 2654 while (my ($k, $v) = each %DEF_CFG) {
2491 $CFG->{$k} = $v unless exists $CFG->{$k}; 2655 $CFG->{$k} = $v unless exists $CFG->{$k};
2492 } 2656 }
2493 2657
2494 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2495 $PROFILE = $CFG->{profile}{default}; 2659 $PROFILE = $CFG->{profile}{default};
2496 2660
2497 # convert old bindings (only default profile matters) 2661 # convert old bindings (only default profile matters)
2498 if (my $bindings = delete $PROFILE->{bindings}) { 2662 if (my $bindings = delete $PROFILE->{bindings}) {
2499 while (my ($mod, $syms) = each %$bindings) { 2663 while (my ($mod, $syms) = each %$bindings) {
2500 while (my ($sym, $cmds) = each %$syms) { 2664 while (my ($sym, $cmds) = each %$syms) {
2501 push @{ $PROFILE->{macro} }, { 2665 push @{ $PROFILE->{macro} }, {
2502 accelkey => [$mod*1, $sym*1], 2666 accelkey => [$mod*1, $sym*1],
2503 action => $cmds, 2667 action => $cmds,
2668 };
2504 }; 2669 }
2505 } 2670 }
2506 } 2671 }
2507 }
2508 2672
2509 sdl_init; 2673 sdl_init;
2510 2674
2511 @SDL_MODES = DC::SDL_ListModes 8, 8; 2675 {
2512 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2513 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2514
2515 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2516
2517 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2518
2519 {
2520 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2676 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2521 DejaVuSans.ttf 2677 DejaVuSans.ttf
2522 DejaVuSansMono.ttf 2678 DejaVuSansMono.ttf
2523 DejaVuSans-Bold.ttf 2679 DejaVuSans-Bold.ttf
2524 DejaVuSansMono-Bold.ttf 2680 DejaVuSansMono-Bold.ttf
2525 DejaVuSans-Oblique.ttf 2681 DejaVuSans-Oblique.ttf
2526 DejaVuSansMono-Oblique.ttf 2682 DejaVuSansMono-Oblique.ttf
2527 DejaVuSans-BoldOblique.ttf 2683 DejaVuSans-BoldOblique.ttf
2528 DejaVuSansMono-BoldOblique.ttf 2684 DejaVuSansMono-BoldOblique.ttf
2529 ); 2685 );
2530 2686
2531 DC::add_font $_ for @fonts; 2687 DC::add_font $_ for @fonts;
2532 2688
2533 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2689 $FONT_PROP = new_from_file DC::Font $fonts[0];
2534 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2690 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2535 2691
2536 $FONT_PROP->make_default; 2692 $FONT_PROP->make_default;
2537 2693
2538 DC::pango_init; 2694 DC::pango_init;
2539 } 2695 }
2540 2696
2541# compare mono (ft) vs. rgba (cairo) 2697# compare mono (ft) vs. rgba (cairo)
2542# ft - 1.8s, cairo 3s, even in alpha-only mode 2698# ft - 1.8s, cairo 3s, even in alpha-only mode
2543# for my $rgba (0..1) { 2699# for my $rgba (0..1) {
2544# my $t1 = Time::HiRes::time; 2700# my $t1 = Time::HiRes::time;
… …
2549# } 2705# }
2550# my $t2 = Time::HiRes::time; 2706# my $t2 = Time::HiRes::time;
2551# warn $t2-$t1; 2707# warn $t2-$t1;
2552# } 2708# }
2553 2709
2554 video_init; 2710 video_init;
2555 audio_init; 2711 audio_init;
2556} 2712 }
2557 2713
2558show_tip_of_the_day if $CFG->{show_tips}; 2714 show_tip_of_the_day if $CFG->{show_tips};
2559 2715
2560our $STARTUP_CANCEL = EV::idle sub { 2716 our $STARTUP_CANCEL = EV::idle sub {
2561 undef $::STARTUP_CANCEL; 2717 undef $::STARTUP_CANCEL;
2562 $startup_done->(); 2718 $startup_done->();
2563}; 2719 };
2564 2720
2565delete $SIG{__DIE__}; 2721 delete $SIG{__DIE__};
2566EV::loop; 2722 EV::loop;
2567 2723
2568#video_shutdown; 2724#video_shutdown;
2569#audio_shutdown; 2725#audio_shutdown;
2570DC::OpenGL::quit; 2726 DC::OpenGL::quit;
2571DC::SDL_Quit; 2727 DC::SDL_Quit;
2572DC::DB::Server::stop; 2728 DC::DB::Server::stop;
2729}
2730
2731DC::SDL_braino; # see sub above
2573 2732
2574=head1 NAME 2733=head1 NAME
2575 2734
2576deliantra - A Deliantra MORPG game client 2735deliantra - A Deliantra MORPG game client
2577 2736
… …
2594 4 show fps 2753 4 show fps
2595 8 suppress tooltips 2754 8 suppress tooltips
2596 2755
2597=head1 AUTHOR 2756=head1 AUTHOR
2598 2757
2599Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2758Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2600 2759
2601 2760
2602 2761

Diff Legend

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