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.60 by root, Tue Aug 19 21:48:28 2008 UTC vs.
Revision 1.80 by root, Fri Dec 19 22:19:52 2008 UTC

… …
49 } 49 }
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 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
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";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 54 } else {
75 # OS X 55 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?! 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 59 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 60 chdir $root; # for pango modules, maybe other things
81 } 61 }
82 62
… …
97 77
98# 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
99unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 80 if %PAR::LibCache;
101 81
102use Time::HiRes 'time';
103use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
104use List::Util qw(max min); 85use List::Util qw(max min);
105 86
106use Deliantra; 87use Deliantra;
107use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
108 89
90use AnyEvent::Util ();
109use AnyEvent::DNS; 91use AnyEvent::DNS;
110use AnyEvent::Socket (); 92use AnyEvent::Socket ();
111 93
112use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
113 96
114use DC; 97use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" 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
116use DC::OpenGL (); 111use DC::OpenGL ();
117use DC::Protocol; 112use DC::Protocol;
118use DC::DB; 113use DC::DB;
119use DC::UI; 114use DC::UI;
120use DC::UI::Canvas; 115use DC::UI::Canvas;
121use DC::UI::Inventory; 116use DC::UI::Inventory;
122use DC::UI::SpellList; 117use DC::UI::SpellList;
123use DC::UI::Dockable; 118use DC::UI::Dockable;
124use DC::UI::Dockbar; 119use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 120use DC::UI::ChatView;
127use DC::MessageDistributor; 121use DC::MessageDistributor;
128use DC::Pod; 122use DC::Pod;
129use DC::MapWidget; 123use DC::MapWidget;
130use DC::Macro; 124use DC::Macro;
131 125
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
134 128
135$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1;
136 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
137}; 132};
138 133
139my $MAX_FPS = 60; 134my $MAX_FPS = 60;
140 135
… …
142 137
143our $LAST_REFRESH; 138our $LAST_REFRESH;
144our $NOW; 139our $NOW;
145 140
146our $CFG; 141our $CFG;
147our $CONN;
148our $PROFILE; # current profile 142our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
150 144
151our $WANT_REFRESH; 145our $WANT_REFRESH;
152 146
… …
160our $FULLSCREEN; 154our $FULLSCREEN;
161our $FONTSIZE; 155our $FONTSIZE;
162 156
163our $FONT_PROP; 157our $FONT_PROP;
164our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
165 161
166our $MAP; 162our $MAP;
167our $MAPMAP; 163our $MAPMAP;
168our $MAPWIDGET; 164our $MAPWIDGET;
169our $COMPLETER; 165our $COMPLETER;
… …
211our $DEBUG_STATUS; 207our $DEBUG_STATUS;
212 208
213our $INV; 209our $INV;
214our $INVR; 210our $INVR;
215our $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};
216 239
217############################################################################# 240#############################################################################
218 241
219sub status { 242sub status {
220 $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]);
… …
743} 766}
744 767
745sub dc_connect { 768sub dc_connect {
746 my ($host, $port) = @_; 769 my ($host, $port) = @_;
747 770
748 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;
749 773
750 $CONN = 774 $CONN =
751 new DC::Protocol 775 new DC::Protocol
752 host => $host, 776 host => $host,
753 port => $port, 777 port => $port,
754 user => $PROFILE->{user}, 778 user => $PROFILE->{user},
755 pass => $PROFILE->{password}, 779 pass => $PROFILE->{password},
756 mapw => $mapsize, 780 mapw => $mapw,
757 maph => $mapsize, 781 maph => $maph,
758 782
759 client => "$DC::VERSION $] $^O", 783 client => "$DC::VERSION $] $^O",
760 784
761 map_widget => $MAPWIDGET, 785 map_widget => $MAPWIDGET,
762 statusbox => $STATUSBOX, 786 statusbox => $STATUSBOX,
… …
807 dc_connect $host, $port; 831 dc_connect $host, $port;
808 } 832 }
809} 833}
810 834
811sub stop_game { 835sub stop_game {
836 crash "stop_game";
837
812 $LOGIN_BUTTON->set_text ("Login / Register"); 838 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 839 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 840 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 841 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 842 $SPELL_LIST->clear_spells;
… …
830} 856}
831 857
832sub graphics_setup { 858sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 859 my $vbox = new DC::UI::VBox;
834 860
861 {
862 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
863
835 $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]);
836 865
837 my $row = 0; 866 my $row = 0;
838 867
839 $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");
840 $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,
841 can_events => 1, 870 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 871 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 872
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 874 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 875 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 876 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues " 877 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or " 878 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 879 . "by installing the right driver for your graphics card.");
851 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
852 my $vidmode_tooltip = 894 my $vidmode_tooltip =
853 "<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). "
854 . "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>.";
855 897
856 $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");
857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 900
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
860 force_w => $WIDTH * 0.1, expand => 1, 902 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 903 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 904 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 905 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 906 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 907 can_events => 1, tooltip => $vidmode_tooltip);
866 908
867 $MODE_SLIDER->connect (changed => sub { 909 $MODE_SLIDER->connect (changed => sub {
868 my ($self, $value) = @_;
869
870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
872 });
873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
877 state => $CFG->{fullscreen},
878 tooltip => "Bring the client into fullscreen mode.",
879 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
880 );
881
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
883 $table->add_at (1, $row++, new DC::UI::CheckBox
884 state => $CFG->{force_opengl11},
885 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
886 . "higher memory usage and slower performance. It will, however, help tremendously on "
887 . "cards that claim to support a feature but fall back to software rendering. "
888 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
889 . "but cards and drivers from other vendors (ATI) are often just as bad. "
890 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_; 910 my ($self, $value) = @_;
911
912 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
913 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
914 });
915 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
916
917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
918 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
919 state => $CFG->{fullscreen},
920 tooltip => "Bring the client into fullscreen mode.",
921 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
922 );
923
924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
925 $table->add_at (1, $row++, new DC::UI::CheckBox
926 state => $CFG->{force_opengl11},
927 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
928 . "higher memory usage and slower performance. It will, however, help tremendously on "
929 . "cards that claim to support a feature but fall back to software rendering. "
930 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
931 . "but cards and drivers from other vendors (ATI) are often just as bad. "
932 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
933 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
934 );
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 off 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) = @_;
905 $CFG->{disable_alpha} = $value; 947 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 948 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
949 0
907 0 950 }
908 } 951 );
909 );
910 952
911 $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");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 955 state => $CFG->{texture_compression},
914 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 "
915 . "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). "
916 . "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 "
917 . "forced OpenGL 1.1 mode.", 959 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 961 );
920 962
921 $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");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 964 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 965 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 966 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 968 );
927 969
928 $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");
929 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 972 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
931 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.",
932 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 974 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 975 );
934 976
935 $table->add_at (1, $row++, new DC::UI::Button 977 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 978 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 979 tooltip => "Apply the video settings above.",
938 on_activate => sub { 980 on_activate => sub {
939 video_shutdown (); 981 video_shutdown ();
940 video_init (); 982 video_init ();
983 0
941 0 984 }
942 } 985 );
943 ); 986 }
944 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;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 996 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 997 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 999 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1001 );
953 1002
954 $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");
955 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 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 }
959 ); 1008 );
960 1009
961 $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");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1011 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1012 state => $CFG->{map_smoothing},
964 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. "
965 . "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. "
966 . "Changes take effect at next login only.", 1015 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1017 );
969 1018
970 $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");
971 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1021 state => $CFG->{fow_enable},
973 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.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1024 );
976 1025
977 $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");
978 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
980 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.",
981 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1031 );
983 1032
984 $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");
985 $table->add_at (1, $row++, new DC::UI::Slider 1034 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1035 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
987 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, "
988 . "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.",
989 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 },
990 ); 1039 );
991 1040
992 $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");
993 $table->add_at (1, $row++, new DC::UI::Slider 1042 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1043 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
995 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.",
996 on_changed => sub { 1045 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1046 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1047 &set_gauge_window_fontsize;
1048 0
999 0 1049 }
1000 } 1050 );
1001 );
1002 1051
1003 $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");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1054 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 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.",
1007 on_changed => sub { 1056 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1057 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1058 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1059 0
1010 0 1060 }
1011 } 1061 );
1012 ); 1062 }
1013 1063
1014 $vbox 1064 $vbox
1015} 1065}
1016 1066
1017our $AUDIO_HW_CHUNKSIZE; 1067our $AUDIO_HW_CHUNKSIZE;
… …
1596 1 1646 1
1597 }, 1647 },
1598 ); 1648 );
1599 1649
1600 $vbox->add (new DC::UI::FancyFrame 1650 $vbox->add (new DC::UI::FancyFrame
1601 label => "Registering", 1651 label => "How to Play",
1602 min_h => 200, 1652 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1653 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 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). "
1605 "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 "
1606 . "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.",
1607 ), 1659 ),
1608 ); 1660 );
1609 1661
1610 $vbox 1662 $vbox
… …
2131 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2183 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2132 ); 2184 );
2133 $hb->add (new DC::UI::Button 2185 $hb->add (new DC::UI::Button
2134 text => "Quit anyway", 2186 text => "Quit anyway",
2135 expand => 1, 2187 expand => 1,
2136 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2188 on_activate => sub {
2189 crash "Quit anyway";
2190 EV::unloop EV::UNLOOP_ALL;
2191 },
2137 ); 2192 );
2138 } 2193 }
2139 2194
2140 $QUIT_DIALOG->show; 2195 $QUIT_DIALOG->show;
2141 $QUIT_DIALOG->grab_focus; 2196 $QUIT_DIALOG->grab_focus;
… …
2199 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2254 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2200 and die "SDL::Init failed!\n"; 2255 and die "SDL::Init failed!\n";
2201} 2256}
2202 2257
2203sub video_init { 2258sub video_init {
2259 DC::set_theme $CFG->{uitheme};
2260
2204 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2261 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2205 $SDL_REINIT = 0; 2262 $SDL_REINIT = 0;
2206 2263
2207 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2264 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2208 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2265 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2209 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2266 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2210 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2267 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2211 2268
2212 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2269 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2213 2270
2214 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2271 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2215 $CFG->{sdl_mode} = 0; 2272 $CFG->{sdl_mode} = 0; # lowest resolution by default
2273
2274 # now choose biggest mode <= 1024x768
2216 for (reverse 0 .. $#SDL_MODES) { 2275 for (0 .. $#SDL_MODES) {
2217 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2276 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2277 $CFG->{sdl_mode} = $_;
2278 }
2218 } 2279 }
2219 } 2280 }
2220 2281
2221 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2282 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2222 2283
… …
2301 x => 0, 2362 x => 0,
2302 y => $FONTSIZE + 8, 2363 y => $FONTSIZE + 8,
2303 border_bg => [1, 1, 1, 192/255], 2364 border_bg => [1, 1, 1, 192/255],
2304 bg => [1, 1, 1, 0], 2365 bg => [1, 1, 1, 0],
2305 child => ($MAPMAP = new DC::MapWidget::MapMap 2366 child => ($MAPMAP = new DC::MapWidget::MapMap
2306 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.",
2307 ), 2368 ),
2308 )->show; 2369 )->show;
2309 2370
2310 $MAPWIDGET = new DC::MapWidget; 2371 $MAPWIDGET = new DC::MapWidget;
2311 $MAPWIDGET->connect (activate_console => sub { 2372 $MAPWIDGET->connect (activate_console => sub {
… …
2410 $BUTTONBAR->show; 2471 $BUTTONBAR->show;
2411 $SETUP_DIALOG->show; 2472 $SETUP_DIALOG->show;
2412 $MESSAGE_WINDOW->show; 2473 $MESSAGE_WINDOW->show;
2413 } 2474 }
2414 2475
2415 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2416 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2417 2478
2418 $CAVEAT_LABEL->set_text ("None :)"); 2479 $CAVEAT_LABEL->set_text ("None :)");
2419 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2420 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2475 delete $animate_object{$widget}; 2536 delete $animate_object{$widget};
2476} 2537}
2477 2538
2478%SDL_CB = ( 2539%SDL_CB = (
2479 DC::SDL_QUIT => sub { 2540 DC::SDL_QUIT => sub {
2541 crash "SDL_QUIT";
2480 EV::unloop EV::UNLOOP_ALL; 2542 EV::unloop EV::UNLOOP_ALL;
2481 }, 2543 },
2482 DC::SDL_VIDEORESIZE => sub { 2544 DC::SDL_VIDEORESIZE => sub {
2483 }, 2545 },
2484 DC::SDL_VIDEOEXPOSE => sub { 2546 DC::SDL_VIDEOEXPOSE => sub {
… …
2551 DC::DB::open_db; 2613 DC::DB::open_db;
2552 2614
2553 DC::UI::set_layout ($::CFG->{layout}); 2615 DC::UI::set_layout ($::CFG->{layout});
2554 2616
2555 my %DEF_CFG = ( 2617 my %DEF_CFG = (
2556 sdl_mode => 0, 2618 sdl_mode => undef,
2557 fullscreen => 1, 2619 fullscreen => 1,
2558 fast => 0, 2620 fast => 0,
2559 force_opengl11 => undef, 2621 force_opengl11 => undef,
2560 disable_alpha => 0, 2622 disable_alpha => 0,
2561 smooth_movement => 1, 2623 smooth_movement => 1,
… …
2584 inv_sort => "mtime", 2646 inv_sort => "mtime",
2585 default => "profile", # default profile 2647 default => "profile", # default profile
2586 show_tips => 1, 2648 show_tips => 1,
2587 logview_max_par => 1000, 2649 logview_max_par => 1000,
2588 shift_fire_stop => 0, 2650 shift_fire_stop => 0,
2651 uitheme => "wood",
2589 ); 2652 );
2590 2653
2591 while (my ($k, $v) = each %DEF_CFG) { 2654 while (my ($k, $v) = each %DEF_CFG) {
2592 $CFG->{$k} = $v unless exists $CFG->{$k}; 2655 $CFG->{$k} = $v unless exists $CFG->{$k};
2593 } 2656 }

Diff Legend

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