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

Diff Legend

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