ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Main.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.2 by root, Tue Dec 27 09:17:27 2011 UTC vs.
Revision 1.3 by root, Thu Dec 29 07:13:44 2011 UTC

17 die if $@; 17 die if $@;
18} 18}
19 19
20use common::sense; 20use common::sense;
21use Carp 'verbose'; 21use Carp 'verbose';
22use Cwd ();
22use EV; 23use EV;
23BEGIN { *time = \&EV::time } 24BEGIN { *time = \&EV::time }
24 25
25use List::Util qw(max min); 26use List::Util qw(max min);
26 27
1131 text => $CFG->{audio_driver}, 1132 text => $CFG->{audio_driver},
1132 template => "dsound1234", 1133 template => "dsound1234",
1133 tooltip => "You can override the audio driver to use here. Leaving it empty will result " 1134 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1134 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific " 1135 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1135 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> " 1136 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1136 . "or other system-specific drivers. Selecting the wrong driver here will simply result" 1137 . "or other system-specific drivers. Selecting the wrong driver here will simply result "
1137 . "in no sound.", 1138 . "in no sound.",
1138 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 } 1139 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1139 ); 1140 );
1140 1141
1141 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1142 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
2838 }; 2839 };
2839 } 2840 }
2840 } 2841 }
2841 } 2842 }
2842 2843
2844 # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
2843 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf"; 2845 $ENV{FONTCONFIG_FILE} = "fonts.conf";
2844 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts"; 2846 $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
2847 $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH};
2845 2848
2846 { 2849 {
2847 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2850 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2848 DejaVuSans.ttf 2851 DejaVuSans.ttf
2849 DejaVuSansMono.ttf 2852 DejaVuSansMono.ttf

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines