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.66 by root, Mon Sep 1 09:12:08 2008 UTC vs.
Revision 1.94 by root, Sun Mar 29 22:28:13 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # 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 { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
… …
97 80
98# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 83 if %PAR::LibCache;
101 84
102use Time::HiRes 'time';
103use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
104use List::Util qw(max min); 88use List::Util qw(max min);
105 89
106use Deliantra; 90use Deliantra;
107use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
108 92
109use AnyEvent::Util (); 93use AnyEvent::Util ();
110use AnyEvent::DNS;
111use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
112 96
113use Compress::LZF; 97use Compress::LZF;
114use JSON::XS; 98use JSON::XS;
115 99
116use DC; 100use DC;
117 101
118#############################################################################
119
120our $CONN;
121
122# write a crash message blockingly to the socket, if possible
123# this is a bit too complicated for my tastes, but it was easy.
124sub crash($;$) { 102sub crash($;$) {
125 my ($msg, $backtrace) = @_; 103 # nop during compiletime
126
127 return unless $CONN;
128
129 my $fh = $CONN->{fh}
130 or return;
131
132 my $buf = delete $CONN->{wbuf};
133
134 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
135
136 AnyEvent::Util::fh_nonblocking $fh, 0;
137
138 syswrite $fh, $buf;
139 AnyEvent::Util::fh_nonblocking $fh, 1;
140
141 $msg =~ s/\s+$//;
142
143 # backtrace as second step, in case it crashes, too
144 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
145 if $backtrace;
146} 104}
147
148#############################################################################
149 105
150BEGIN { 106BEGIN {
151 $SIG{__DIE__} = sub { 107 $SIG{__DIE__} = sub {
152 return if $^S; 108 return if $^S;
153 crash ("CRASH/DIE: $_[0]" => 1); 109 crash "CRASH/DIE: $_[0]" => 1;
154 DC::fatal Carp::longmess "$_[0]"; 110 DC::fatal Carp::longmess "$_[0]";
155 } 111 }
156} 112}
157 113
158use DC::OpenGL (); 114use DC::OpenGL ();
… …
172 128
173$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
174$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
175 131
176$EV::DIED = sub { 132$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1); 133 crash "CRASH/EV::DIED: $@" => 0;
178 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
179}; 135};
180 136
181my $MAX_FPS = 60; 137my $MAX_FPS = 60;
182 138
… …
202our $FONTSIZE; 158our $FONTSIZE;
203 159
204our $FONT_PROP; 160our $FONT_PROP;
205our $FONT_FIXED; 161our $FONT_FIXED;
206 162
163our $CONN;
164
207our $MAP; 165our $MAP;
208our $MAPMAP; 166our $MAPMAP;
209our $MAPWIDGET; 167our $MAPWIDGET;
210our $COMPLETER; 168our $COMPLETER;
211our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
212our $METASERVER; 173our $METASERVER;
213our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
214our $QUIT_DIALOG; 175our $QUIT_DIALOG;
215our $HOST_ENTRY; 176our $HOST_ENTRY;
216our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
242our $FLOORBOX; 203our $FLOORBOX;
243our $GAUGES; 204our $GAUGES;
244our $STATWIDS; 205our $STATWIDS;
245 206
246our $SDL_ACTIVE; 207our $SDL_ACTIVE;
247our %SDL_CB; 208our @SDL_CB;
248 209
249our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
250our $STATUSBOX; 211our $STATUSBOX;
251our $MODBOX; 212our $MODBOX;
252our $DEBUG_STATUS; 213our $DEBUG_STATUS;
253 214
254our $INV; 215our $INV;
255our $INVR; 216our $INVR;
256our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
257 258
258############################################################################# 259#############################################################################
259 260
260sub status { 261sub status {
261 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
343 or return; 344 or return;
344 345
345 $meta->{data} 346 $meta->{data}
346 or return; 347 or return;
347 348
348 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
349 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
350 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
351 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
352 &audio_music_push ($face); 353 &audio_music_push ($face);
353 } 354 }
354 } else { 355 } else {
355 # fetch from database 356 # fetch from database
356 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
357 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
358 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
359 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
360 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
361 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
362 363
363 audio_sound_push ($face); 364 audio_sound_push ($face);
364 }; 365 };
… …
411 412
412 audio_music_update_volume; 413 audio_music_update_volume;
413 414
414 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
415 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
416 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
417 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
418 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
419 423
420 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
421 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
422 426
423 my $NOW = time; 427 my $NOW = time;
424 428
425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
426 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
784} 788}
785 789
786sub dc_connect { 790sub dc_connect {
787 my ($host, $port) = @_; 791 my ($host, $port) = @_;
788 792
789 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 793 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
794 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
790 795
791 $CONN = 796 $CONN =
792 new DC::Protocol 797 new DC::Protocol
793 host => $host, 798 host => $host,
794 port => $port, 799 port => $port,
795 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
796 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
797 mapw => $mapsize, 802 mapw => $mapw,
798 maph => $mapsize, 803 maph => $maph,
799 804
800 client => "$DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
801 806
802 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
803 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
… …
811 816
812 on_connect => sub { 817 on_connect => sub {
813 if ($_[0]) { 818 if ($_[0]) {
814 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
815 820
816 status "login successful"; 821 status "successfully connected to the server";
817 } else { 822 } else {
818 undef $CONN; 823 undef $CONN;
819 status "unable to connect: $!"; 824 status "unable to connect: $!";
820 stop_game(); 825 stop_game();
821 } 826 }
… …
873} 878}
874 879
875sub graphics_setup { 880sub graphics_setup {
876 my $vbox = new DC::UI::VBox; 881 my $vbox = new DC::UI::VBox;
877 882
883 {
884 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
885
878 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 886 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
879 887
880 my $row = 0; 888 my $row = 0;
881 889
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
883 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 891 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
884 can_events => 1, 892 can_events => 1,
885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 893 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
886 894
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
888 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 896 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
889 can_events => 1, 897 can_events => 1,
890 tooltip => "This field shows any known issues with your config or driver, such as " 898 tooltip => "This field shows any known issues with your config or driver, such as "
891 . "a non-accelerated display format. You can try to work around these issues " 899 . "a non-accelerated display format. You can try to work around these issues "
892 . "by selecting a different video mode, changing the settings below or " 900 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card."); 901 . "by installing the right driver for your graphics card.");
894 902
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
904 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
905 value => $CFG->{uitheme},
906 options => [
907 [wood => "Wood (the default)"],
908 [plain => "Plain (very)"],
909 [blue => "Blue (dark)"],
910 [metal => "Metal (light)"],
911 ],
912 tooltip => "Choose the User Interface theme that you like most :)",
913 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
914 );
915
895 my $vidmode_tooltip = 916 my $vidmode_tooltip =
896 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 917 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
897 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 918 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
898 919
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 921 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
901 922
902 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 923 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
924 c_rescale => 1,
903 force_w => $WIDTH * 0.1, expand => 1, 925 force_w => $WIDTH * 0.1, expand => 1,
904 range => [ ($CFG->{sdl_mode}) x 3 ], 926 range => [ ($CFG->{sdl_mode}) x 3 ],
905 tooltip => $vidmode_tooltip); 927 tooltip => $vidmode_tooltip);
906 $hbox->add (my $mode_label = new DC::UI::Label 928 $hbox->add (my $mode_label = new DC::UI::Label
907 height => 0.8, template => "9999x9999@9+9", 929 height => 0.8, template => "9999x9999@9+9",
908 can_events => 1, tooltip => $vidmode_tooltip); 930 can_events => 1, tooltip => $vidmode_tooltip);
909 931
910 $MODE_SLIDER->connect (changed => sub { 932 $MODE_SLIDER->connect (changed => sub {
911 my ($self, $value) = @_;
912
913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
914 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
915 });
916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
917
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
920 state => $CFG->{fullscreen},
921 tooltip => "Bring the client into fullscreen mode.",
922 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
923 );
924
925 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
926 $table->add_at (1, $row++, new DC::UI::CheckBox
927 state => $CFG->{force_opengl11},
928 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
929 . "higher memory usage and slower performance. It will, however, help tremendously on "
930 . "cards that claim to support a feature but fall back to software rendering. "
931 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
932 . "but cards and drivers from other vendors (ATI) are often just as bad. "
933 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{disable_alpha},
940 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
941 . "by disabling a number of textures and transparency effects. Normally, these "
942 . "effects do not cost a lot of resources, but some graphics cards might fall "
943 . "back to etxremely slow rendering if this is enabled. If disabling this option "
944 . "noticably improves the framerate of the client please report this! "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub {
947 my ($self, $value) = @_; 933 my ($self, $value) = @_;
934
935 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
936 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
937 });
938 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
941 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
942 state => $CFG->{fullscreen},
943 tooltip => "Bring the client into fullscreen mode.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
945 );
946
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
948 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{force_opengl11},
950 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
951 . "higher memory usage and slower performance. It will, however, help tremendously on "
952 . "cards that claim to support a feature but fall back to software rendering. "
953 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
954 . "but cards and drivers from other vendors (ATI) are often just as bad. "
955 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
956 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
957 );
958
959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{disable_alpha},
962 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
963 . "by disabling a number of textures and transparency effects. Normally, these "
964 . "effects do not cost a lot of resources, but some graphics cards might fall "
965 . "back to extremely slow rendering if this is enabled. If disabling this option "
966 . "noticably improves the framerate of the client please report this! "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub {
969 my ($self, $value) = @_;
948 $CFG->{disable_alpha} = $value; 970 $CFG->{disable_alpha} = $value;
949 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 971 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
972 0
950 0 973 }
951 } 974 );
952 );
953 975
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{texture_compression}, 978 state => $CFG->{texture_compression},
957 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 979 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
958 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 980 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
959 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 981 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
960 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 982 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 983 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
962 ); 984 );
963 985
964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
965 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{fast}, 988 state => $CFG->{fast},
967 tooltip => "Lower the visual quality considerably to speed up rendering.", 989 tooltip => "Lower the visual quality considerably to speed up rendering.",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
969 ); 991 );
970 992
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
972 $table->add_at (1, $row++, new DC::UI::Slider 994 $table->add_at (1, $row++, new DC::UI::Slider
973 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 995 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
974 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 996 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
975 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 997 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
976 ); 998 );
977 999
978 $table->add_at (1, $row++, new DC::UI::Button 1000 $table->add_at (1, $row++, new DC::UI::Button
979 expand => 1, text => "Apply", 1001 expand => 1, text => "Apply",
980 tooltip => "Apply the video settings above.", 1002 tooltip => "Apply the video settings above.",
981 on_activate => sub { 1003 on_activate => sub {
982 video_shutdown (); 1004 video_shutdown ();
983 video_init (); 1005 video_init ();
1006 0
984 0 1007 }
985 } 1008 );
986 ); 1009 }
987 1010
1011 {
1012 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1013
1014 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1015
1016 my $row = 0;
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
989 $table->add_at (1, $row++, new DC::UI::CheckBox 1018 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{smooth_movement}, 1019 state => $CFG->{smooth_movement},
991 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1020 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
992 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1021 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
993 . "then disable this option. Changes take effect immdiately.", 1022 . "then disable this option. Changes take effect immdiately.",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
995 ); 1024 );
996 1025
997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
998 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1028 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1000 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1029 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1001 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1002 ); 1031 );
1003 1032
1004 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
1005 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
1006 state => $CFG->{map_smoothing}, 1035 state => $CFG->{map_smoothing},
1007 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1036 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1008 . "This increases load on the graphics subsystem and works only with TRT servers. " 1037 . "This increases load on the graphics subsystem and works only with TRT servers. "
1009 . "Changes take effect at next login only.", 1038 . "Changes take effect at next login only.",
1010 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1039 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1011 ); 1040 );
1012 1041
1013 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1014 $table->add_at (1, $row++, new DC::UI::CheckBox 1043 $table->add_at (1, $row++, new DC::UI::CheckBox
1015 state => $CFG->{fow_enable}, 1044 state => $CFG->{fow_enable},
1016 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1045 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1046 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1018 ); 1047 );
1019 1048
1020 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1021 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
1022 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1051 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1023 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1052 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1025 ); 1054 );
1026 1055
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
1028 $table->add_at (1, $row++, new DC::UI::Slider 1057 $table->add_at (1, $row++, new DC::UI::Slider
1029 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1058 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1030 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1059 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
1031 . "but you still need to press apply to correctly re-layout the widget.", 1060 . "but you still need to press apply to correctly re-layout the widget.",
1032 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1061 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1033 ); 1062 );
1034 1063
1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1065 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1066 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1038 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1067 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1039 on_changed => sub { 1068 on_changed => sub {
1040 $CFG->{gauge_fontsize} = $_[1]; 1069 $CFG->{gauge_fontsize} = $_[1];
1041 &set_gauge_window_fontsize; 1070 &set_gauge_window_fontsize;
1071 0
1042 0 1072 }
1043 } 1073 );
1044 );
1045 1074
1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1075 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1047 $table->add_at (1, $row++, new DC::UI::Slider 1076 $table->add_at (1, $row++, new DC::UI::Slider
1048 range => [$CFG->{gauge_size}, 0.2, 0.8], 1077 range => [$CFG->{gauge_size}, 0.2, 0.8],
1049 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1078 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1050 on_changed => sub { 1079 on_changed => sub {
1051 $CFG->{gauge_size} = $_[1]; 1080 $CFG->{gauge_size} = $_[1];
1052 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1081 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1082 0
1053 0 1083 }
1054 } 1084 );
1055 ); 1085 }
1056 1086
1057 $vbox 1087 $vbox
1058} 1088}
1059 1089
1060our $AUDIO_HW_CHUNKSIZE; 1090our $AUDIO_HW_CHUNKSIZE;
… …
1223} 1253}
1224 1254
1225sub make_gauge_window { 1255sub make_gauge_window {
1226 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1256 my $gh = int $HEIGHT * $CFG->{gauge_size};
1227 1257
1228 my $win = new DC::UI::Frame ( 1258 $GAUGES->{win} = my $win = new DC::UI::Frame (
1229 force_x => 0, 1259 force_x => 0,
1230 force_y => "max", 1260 force_y => "max",
1231 force_w => $WIDTH, 1261 force_w => $WIDTH,
1232 force_h => $gh, 1262 force_h => $gh,
1233 ); 1263 );
… …
1249 (new DC::UI::Empty expand => 1), 1279 (new DC::UI::Empty expand => 1),
1250 (my $hb = new DC::UI::HBox), 1280 (my $hb = new DC::UI::HBox),
1251 ], 1281 ],
1252 ); 1282 );
1253 1283
1254 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1284 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1255 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1285 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1256 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1286 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1257 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1287 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1258
1259 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1260 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1261 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1262 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1263
1264 $GAUGES = {
1265 exp => $exp, prg => $prg, sklprg => $sklprg,
1266 win => $win, range => $rng,
1267 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1268 };
1269 1288
1270 &set_gauge_window_fontsize; 1289 &set_gauge_window_fontsize;
1271 1290
1272 $win 1291 $win
1273} 1292}
… …
1615 ); 1634 );
1616 1635
1617 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1636 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1618 $table->add_at (1, 4, new DC::UI::Entry 1637 $table->add_at (1, 4, new DC::UI::Entry
1619 text => $CFG->{profile}{default}{user}, 1638 text => $CFG->{profile}{default}{user},
1620 tooltip => "The name of your character on the server.", 1639 tooltip => "The name of your character on the server. The name is case-sensitive!",
1621 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1640 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1622 ); 1641 );
1623 1642
1624 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1643 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1625 $table->add_at (1, 5, new DC::UI::Entry 1644 $table->add_at (1, 5, new DC::UI::Entry
… …
1727 1746
1728 my $row = 0; 1747 my $row = 0;
1729 1748
1730 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1749 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1731 $table->add_at (1, $row++, new DC::UI::CheckBox 1750 $table->add_at (1, $row++, new DC::UI::CheckBox
1751 c_colspan => 2,
1732 state => $CFG->{show_tips}, 1752 state => $CFG->{show_tips},
1733 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1753 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1734 on_changed => sub { 1754 on_changed => sub {
1735 my ($self, $value) = @_; 1755 my ($self, $value) = @_;
1736 $CFG->{show_tips} = $value; 1756 $CFG->{show_tips} = $value;
… …
1738 } 1758 }
1739 ); 1759 );
1740 1760
1741 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1742 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1763 c_colspan => 2,
1743 text => $CFG->{logview_max_par}, 1764 text => $CFG->{logview_max_par},
1744 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1745 . "sends more messages than this number, older messages get removed to save memory and " 1766 . "sends more messages than this number, older messages get removed to save memory and "
1746 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1747 on_changed => sub { 1768 on_changed => sub {
… …
1749 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1750 0 1771 0
1751 }, 1772 },
1752 ); 1773 );
1753 1774
1775 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1776 $table->add_at (1, $row, new DC::UI::CheckBox
1777 state => $CFG->{config_autosave},
1778 tooltip => "Normally, configuration settings and the user interface layout "
1779 . "are saved on client exit. You can disable this behaviour by "
1780 . "unchecking this checkbox.",
1781 on_changed => sub {
1782 my ($self, $value) = @_;
1783 $CFG->{config_autosave} = $value;
1784 0
1785 }
1786 );
1787 $table->add_at (2, $row++, new DC::UI::Button
1788 text => "Save Now",
1789 tooltip => "Use this to manually save configuration and UI layout when "
1790 . "autosave is disabled.",
1791 on_activate => sub {
1792 DC::write_cfg;
1793 0
1794 }
1795 );
1796
1754 $table 1797 $table
1755} 1798}
1756 1799
1757sub autopickup_setup { 1800sub autopickup_setup {
1758 my $r = new DC::UI::ScrolledWindow ( 1801 my $r = new DC::UI::ScrolledWindow (
… …
1764 col_expand => [0, 1, 0, 1], 1807 col_expand => [0, 1, 0, 1],
1765 ); 1808 );
1766 1809
1767 for ( 1810 for (
1768 ["General", 0, 0, 1811 ["General", 0, 0,
1769 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1770 ["Inhibit autopickup" => PICKUP_INHIBIT], 1812# ["Inhibit autopickup" => PICKUP_INHIBIT],
1771 ["Stop before pickup" => PICKUP_STOP], 1813 ["Stop before pickup" => PICKUP_STOP],
1772 ["Debug autopickup" => PICKUP_DEBUG], 1814 ["Debug autopickup" => PICKUP_DEBUG],
1773 ], 1815 ],
1774 ["Weapons", 0, 6, 1816 ["Weapons", 0, 6,
1775 ["All weapons" => PICKUP_ALLWEAPON], 1817 ["All weapons" => PICKUP_ALLWEAPON],
… …
1823 $::CFG->{pickup} |= $mask; 1865 $::CFG->{pickup} |= $mask;
1824 } else { 1866 } else {
1825 $::CFG->{pickup} &= ~$mask; 1867 $::CFG->{pickup} &= ~$mask;
1826 } 1868 }
1827 1869
1828 $::CONN->send_command ("pickup $::CFG->{pickup}") 1870 $::CONN->send_pickup ($::CFG->{pickup})
1829 if defined $::CONN; 1871 if defined $::CONN;
1830 1872
1831 0 1873 0
1832 }); 1874 });
1833 1875
… …
1850 }); 1892 });
1851 1893
1852 $table->add_at (3, 18, new DC::UI::Button 1894 $table->add_at (3, 18, new DC::UI::Button
1853 text => "set", 1895 text => "set",
1854 on_activate => sub { 1896 on_activate => sub {
1855 $::CONN->send_command ("pickup $::CFG->{pickup}") 1897 $::CONN->send_pickup ($::CFG->{pickup})
1856 if defined $::CONN; 1898 if defined $::CONN;
1857 0 1899 0
1858 }); 1900 });
1859 1901
1860 $r 1902 $r
… …
1973 $PL_NOTEBOOK->set_current_page ($widget); 2015 $PL_NOTEBOOK->set_current_page ($widget);
1974 $PL_WINDOW->show; 2016 $PL_WINDOW->show;
1975 } 2017 }
1976} 2018}
1977 2019
1978sub player_window { 2020sub make_playerbook {
1979 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2021 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1980 x => "center", 2022 x => "center",
1981 y => "center", 2023 y => "center",
1982 force_w => $WIDTH * 9/10, 2024 force_w => $WIDTH * 9/10,
1983 force_h => $HEIGHT * 9/10, 2025 force_h => $HEIGHT * 9/10,
… …
2017 "License, Author and Source info for media sent by the server."); 2059 "License, Author and Source info for media sent by the server.");
2018 2060
2019 $ntb->set_current_page ($INVENTORY_PAGE); 2061 $ntb->set_current_page ($INVENTORY_PAGE);
2020 2062
2021 $plwin->add ($ntb); 2063 $plwin->add ($ntb);
2022 $plwin
2023} 2064}
2024 2065
2025sub keyboard_setup { 2066sub keyboard_setup {
2026 DC::Macro::keyboard_setup 2067 DC::Macro::keyboard_setup
2027} 2068}
2028 2069
2029sub help_window { 2070sub make_help_window {
2030 my $win = new DC::UI::Toplevel 2071 my $win = new DC::UI::Toplevel
2031 x => 'center', 2072 x => 'center',
2032 y => 'center', 2073 y => 'center',
2033 z => 4, 2074 z => 4,
2034 name => 'doc_browser', 2075 name => 'doc_browser',
… …
2123 2164
2124 $load_node->((DC::Pod::find @path)[0]); 2165 $load_node->((DC::Pod::find @path)[0]);
2125 $win->show; 2166 $win->show;
2126 }; 2167 };
2127 2168
2128 $win 2169 $HELP_WINDOW = $win;
2129}
2130
2131sub open_string_query {
2132 my ($title, $cb, $txt, $tooltip) = @_;
2133 my $dialog = new DC::UI::Toplevel
2134 x => "center",
2135 y => "center",
2136 z => 50,
2137 force_w => $WIDTH * 4/5,
2138 title => $title;
2139
2140 $dialog->add (
2141 my $e = new DC::UI::Entry
2142 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2143 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2144 tooltip => $tooltip
2145 );
2146
2147 $e->grab_focus;
2148 $e->set_text ($txt) if $txt;
2149 $dialog->show;
2150} 2170}
2151 2171
2152sub open_quit_dialog { 2172sub open_quit_dialog {
2153 unless ($QUIT_DIALOG) { 2173 unless ($QUIT_DIALOG) {
2154 $QUIT_DIALOG = new DC::UI::Toplevel 2174 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2187 2207
2188 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2189 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
2190} 2210}
2191 2211
2212sub make_menubar {
2213 $MENUFRAME = new DC::UI::Toplevel
2214 border => 0,
2215 force_x => 0,
2216 force_y => 0,
2217 force_w => $::WIDTH,
2218 child => ($MENUBAR = new DC::UI::HBox),
2219 ;
2220
2221 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2222
2223 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2224 make_gauge_window->show;
2225
2226# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228
2229 make_playerbook;
2230
2231 $MENUPOPUP = DC::UI::Menu->new (items => [
2232 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2233 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2234 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2235 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2236 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2237 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2238 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2239 ["Quit…" , sub {
2240 if ($CONN) {
2241 open_quit_dialog;
2242 } else {
2243 EV::unloop EV::UNLOOP_ALL;
2244 }
2245 }],
2246 ]);
2247
2248 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2249 tooltip => "Shows the main menu",
2250 on_button_down => sub {
2251 my ($self, $ev) = @_;
2252 local $ev->{x} = 0;
2253 local $ev->{y} = 0;
2254 $MENUPOPUP->popup ($ev);
2255 },
2256 );
2257
2258 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2259 padding_x => 6,
2260 padding_y => 3,
2261 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2262 template => " Exp: 888,888,888,888 (lvl 188) ",
2263 );
2264
2265 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2266 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2267 . "will automatically pick up items as defined by your item pickup settings "
2268 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2269 . "disable autopickup by disabling this checkbox.",
2270 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2271 on_changed => sub {
2272 my ($self, $value) = @_;
2273 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2274 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2275 $CONN->send_pickup ($CFG->{pickup})
2276 if $CONN;
2277 },
2278 );
2279
2280 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2281 c_rescale => 1,
2282 padding_x => 6,
2283 padding_y => 3,
2284 force_w => $::WIDTH * 0.2,
2285 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2286 template => "two handed weapons 99%",
2287 );
2288
2289 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2290 expand => 1,
2291 align => 1, can_hover => 1, can_events => 1,
2292 text => "Range and Combat Slots",
2293 tooltip => "#stat_ranged",
2294 );
2295
2296 $MENUFRAME->show;
2297}
2298
2299sub open_string_query {
2300 my ($title, $cb, $txt, $tooltip) = @_;
2301 my $dialog = new DC::UI::Toplevel
2302 x => "center",
2303 y => "center",
2304 z => 50,
2305 force_w => $WIDTH * 4/5,
2306 title => $title;
2307
2308 $dialog->add (
2309 my $e = new DC::UI::Entry
2310 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2311 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2312 tooltip => $tooltip
2313 );
2314
2315 $e->grab_focus;
2316 $e->set_text ($txt) if $txt;
2317 $dialog->show;
2318}
2319
2192sub show_tip_of_the_day { 2320sub show_tip_of_the_day {
2193 # find all tips 2321 # find all tips
2194 my @tod = DC::Pod::find tip_of_the_day => "*"; 2322 my @tod = DC::Pod::find tip_of_the_day => "*";
2195 2323
2196 DC::DB::get state => "tip_of_the_day", sub { 2324 DC::DB::get state => "tip_of_the_day", sub {
… …
2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2375 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2248 and die "SDL::Init failed!\n"; 2376 and die "SDL::Init failed!\n";
2249} 2377}
2250 2378
2251sub video_init { 2379sub video_init {
2380 DC::set_theme $CFG->{uitheme};
2381
2252 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2382 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2253 $SDL_REINIT = 0; 2383 $SDL_REINIT = 0;
2254 2384
2255 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2385 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2256 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2386 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2260 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2390 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2261 2391
2262 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2392 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2263 $CFG->{sdl_mode} = 0; # lowest resolution by default 2393 $CFG->{sdl_mode} = 0; # lowest resolution by default
2264 2394
2265 # now choose biggets mode <= 1024x768 2395 # now choose biggest mode <= 1024x768
2266 for (0 .. $#SDL_MODES) { 2396 for (0 .. $#SDL_MODES) {
2267 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2397 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2268 $CFG->{sdl_mode} = $_; 2398 $CFG->{sdl_mode} = $_;
2269 } 2399 }
2270 } 2400 }
… …
2333 2463
2334 (new DC::UI::Frame 2464 (new DC::UI::Frame
2335 bg => [0, 0, 0, 0.4], 2465 bg => [0, 0, 0, 0.4],
2336 force_x => 0, 2466 force_x => 0,
2337 force_y => "max", 2467 force_y => "max",
2338 child => (my $LR = new DC::UI::VBox), 2468 child => (my $LL = new DC::UI::VBox),
2339 )->show; 2469 )->show;
2340 2470
2341 $LR->add ($STATUSBOX); 2471 $LL->add ($STATUSBOX);
2342 $LR->add ($MODBOX); 2472 $LL->add ($MODBOX);
2343 $LR->add (new DC::UI::Label 2473 $LL->add (new DC::UI::Label
2344 align => 0, 2474 align => 0,
2345 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2475 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2346 fontsize => 0.5, 2476 fontsize => 0.5,
2347 fg => [1, 1, 0, 0.7], 2477 fg => [1, 1, 0, 0.7],
2348 ); 2478 );
2349 2479
2350 DC::UI::Toplevel->new ( 2480 DC::UI::Toplevel->new (
2351 title => "Minimap", 2481 title => "Minimap",
2352 name => "mapmap", 2482 name => "mapmap",
2353 x => 0, 2483 x => 0,
2354 y => $FONTSIZE + 8, 2484 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2355 border_bg => [1, 1, 1, 192/255], 2485 border_bg => [1, 1, 1, 192/255],
2356 bg => [1, 1, 1, 0], 2486 bg => [1, 1, 1, 0],
2357 child => ($MAPMAP = new DC::MapWidget::MapMap 2487 child => ($MAPMAP = new DC::MapWidget::MapMap
2358 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2488 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2359 ), 2489 ),
2360 )->show; 2490 )->show;
2361 2491
2362 $MAPWIDGET = new DC::MapWidget; 2492 $MAPWIDGET = new DC::MapWidget;
2363 $MAPWIDGET->connect (activate_console => sub { 2493 $MAPWIDGET->connect (activate_console => sub {
… …
2388 $METASERVER = metaserver_dialog; 2518 $METASERVER = metaserver_dialog;
2389 # the name is changed to not conflict with the older name as users could have hidden it 2519 # the name is changed to not conflict with the older name as users could have hidden it
2390 $MESSAGE_WINDOW = new DC::UI::Dockbar 2520 $MESSAGE_WINDOW = new DC::UI::Dockbar
2391 name => "message_window2", 2521 name => "message_window2",
2392 title => 'Messages', 2522 title => 'Messages',
2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2393 force_w => $::WIDTH * 0.6, 2524 force_w => $::WIDTH * 0.6,
2394 force_h => $::HEIGHT * 0.25, 2525 force_h => $::HEIGHT * 0.25,
2395 ; 2526 ;
2396 2527
2397 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2528 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2417 . "After pressing the combo the binding will be saved automatically and the " 2548 . "After pressing the combo the binding will be saved automatically and the "
2418 . "binding editor closes"); 2549 . "binding editor closes");
2419 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2550 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2420 "Some debuggin' options. Do not ask."); 2551 "Some debuggin' options. Do not ask.");
2421 2552
2422 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2553 make_help_window;
2554 make_menubar;
2423 2555
2424 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2425 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2426
2427# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2428# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2429
2430 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2431
2432 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2433 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2434
2435 $BUTTONBAR->add (new DC::UI::Button
2436 text => "Save Config",
2437 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2438 on_activate => sub {
2439 $::CFG->{layout} = DC::UI::get_layout;
2440 DC::write_cfg;
2441 status "Configuration Saved";
2442 0
2443 },
2444 );
2445
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2447 tooltip => "View Documentation");
2448
2449 $BUTTONBAR->add (new DC::UI::Button
2450 text => "Quit",
2451 tooltip => "Terminates the program",
2452 on_activate => sub {
2453 if ($CONN) {
2454 open_quit_dialog;
2455 } else {
2456 EV::unloop EV::UNLOOP_ALL;
2457 }
2458 0
2459 },
2460 );
2461
2462 $BUTTONBAR->show;
2463 $SETUP_DIALOG->show; 2556 $SETUP_DIALOG->show;
2464 $MESSAGE_WINDOW->show; 2557 $MESSAGE_WINDOW->show;
2465 } 2558 }
2466 2559
2467 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2560 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2468 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2561 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2469 2562
2470 $CAVEAT_LABEL->set_text ("None :)"); 2563 $CAVEAT_LABEL->set_text ("None :)");
2471 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2564 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2472 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2565 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2503my $want_refresh = EV::prepare_ns \&force_refresh; 2596my $want_refresh = EV::prepare_ns \&force_refresh;
2504 2597
2505my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2598my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2506 $NOW = EV::now; 2599 $NOW = EV::now;
2507 2600
2508 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2601 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2509 for DC::poll_events; 2602 for DC::poll_events;
2510 2603
2511 if (%animate_object) { 2604 if (%animate_object) {
2512 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2605 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2513 $WANT_REFRESH = 1; 2606 $WANT_REFRESH = 1;
… …
2525sub animation_stop { 2618sub animation_stop {
2526 my ($widget) = @_; 2619 my ($widget) = @_;
2527 delete $animate_object{$widget}; 2620 delete $animate_object{$widget};
2528} 2621}
2529 2622
2530%SDL_CB = (
2531 DC::SDL_QUIT => sub { 2623$SDL_CB[DC::SDL_QUIT] = sub {
2532 crash "SDL_QUIT"; 2624 crash "SDL_QUIT";
2533 EV::unloop EV::UNLOOP_ALL; 2625 EV::unloop EV::UNLOOP_ALL;
2534 }, 2626};
2535 DC::SDL_VIDEORESIZE => sub { 2627$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2536 },
2537 DC::SDL_VIDEOEXPOSE => sub { 2628$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2538 DC::UI::full_refresh; 2629 DC::UI::full_refresh;
2539 }, 2630};
2540 DC::SDL_ACTIVEEVENT => sub { 2631$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2541# not useful, as APPACTIVE includes only iconified state, not unmapped 2632# not useful, as APPACTIVE includes only iconified state, not unmapped
2542# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2633# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2543# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2634# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2544# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2635# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2545# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2636# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2546# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2637# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2547 }, 2638};
2548 DC::SDL_KEYDOWN => sub { 2639$SDL_CB[DC::SDL_KEYDOWN] = sub {
2549 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2640 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2550 # alt-enter 2641 # alt-enter
2551 video_shutdown; 2642 video_shutdown;
2552 $FULLSCREEN_ENABLE->toggle; 2643 $FULLSCREEN_ENABLE->toggle;
2553 video_init; 2644 video_init;
2554 } else { 2645 } else {
2555 &DC::UI::feed_sdl_key_down_event; 2646 &DC::UI::feed_sdl_key_down_event;
2556 } 2647 }
2557 update_modbox; 2648 update_modbox;
2558 }, 2649};
2559 DC::SDL_KEYUP => sub { 2650$SDL_CB[DC::SDL_KEYUP] = sub {
2560 &DC::UI::feed_sdl_key_up_event; 2651 &DC::UI::feed_sdl_key_up_event;
2561 update_modbox; 2652 update_modbox;
2562 }, 2653};
2563 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2654$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2564 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2655$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2565 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2566 DC::SDL_USEREVENT => sub { 2657$SDL_CB[DC::SDL_USEREVENT] = sub {
2567 if ($_[0]{code} == 1) { 2658 if ($_[0]{code} == 1) {
2568 audio_channel_finished $_[0]{data1}; 2659 audio_channel_finished $_[0]{data1};
2569 } elsif ($_[0]{code} == 0) { 2660 } elsif ($_[0]{code} == 0) {
2570 audio_music_finished; 2661 audio_music_finished;
2571 }
2572 }, 2662 }
2573); 2663};
2574 2664
2575############################################################################# 2665#############################################################################
2576 2666
2577$SIG{INT} = $SIG{TERM} = sub { 2667$SIG{INT} = $SIG{TERM} = sub {
2578 EV::unloop; 2668 EV::unloop;
2579 #d# TODO calling exit here hangs the process in some futex 2669 #d# TODO calling exit here hangs the process in some futex
2580}; 2670};
2581 2671
2582# due to mac os x + sdl combined briandamage, we need this contortion 2672# due to mac os x + sdl combined braindamage, we need this contortion
2583sub main { 2673sub main {
2584 { 2674 {
2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2675 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2586 2676
2587 if (-e "$Deliantra::VARDIR/client.cf") { 2677 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2604 DC::DB::open_db; 2694 DC::DB::open_db;
2605 2695
2606 DC::UI::set_layout ($::CFG->{layout}); 2696 DC::UI::set_layout ($::CFG->{layout});
2607 2697
2608 my %DEF_CFG = ( 2698 my %DEF_CFG = (
2699 config_autosave => 1,
2609 sdl_mode => undef, 2700 sdl_mode => undef,
2610 fullscreen => 1, 2701 fullscreen => 1,
2611 fast => 0, 2702 fast => 0,
2612 force_opengl11 => undef, 2703 force_opengl11 => undef,
2613 disable_alpha => 0, 2704 disable_alpha => 0,
… …
2631 effects_enable => 1, 2722 effects_enable => 1,
2632 effects_volume => 1, 2723 effects_volume => 1,
2633 bgm_enable => 1, 2724 bgm_enable => 1,
2634 bgm_volume => 0.5, 2725 bgm_volume => 0.5,
2635 output_rate => "", 2726 output_rate => "",
2636 pickup => 0, 2727 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2637 inv_sort => "mtime", 2728 inv_sort => "mtime",
2638 default => "profile", # default profile 2729 default => "profile", # default profile
2639 show_tips => 1, 2730 show_tips => 1,
2640 logview_max_par => 1000, 2731 logview_max_par => 1000,
2641 shift_fire_stop => 0, 2732 shift_fire_stop => 0,
2733 uitheme => "wood",
2734 map_shift_x => -24, # arbitrary
2735 map_shift_y => +24, # arbitrary
2642 ); 2736 );
2643 2737
2644 while (my ($k, $v) = each %DEF_CFG) { 2738 while (my ($k, $v) = each %DEF_CFG) {
2645 $CFG->{$k} = $v unless exists $CFG->{$k}; 2739 $CFG->{$k} = $v unless exists $CFG->{$k};
2646 } 2740 }
… …
2660 } 2754 }
2661 } 2755 }
2662 2756
2663 sdl_init; 2757 sdl_init;
2664 2758
2759 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2760 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2761
2665 { 2762 {
2666 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2763 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2667 DejaVuSans.ttf 2764 DejaVuSans.ttf
2668 DejaVuSansMono.ttf 2765 DejaVuSansMono.ttf
2669 DejaVuSans-Bold.ttf 2766 DejaVuSans-Bold.ttf
2670 DejaVuSansMono-Bold.ttf 2767 DejaVuSansMono-Bold.ttf
2671 DejaVuSans-Oblique.ttf 2768 DejaVuSans-Oblique.ttf
2672 DejaVuSansMono-Oblique.ttf 2769 DejaVuSansMono-Oblique.ttf
2673 DejaVuSans-BoldOblique.ttf 2770 DejaVuSans-BoldOblique.ttf
2674 DejaVuSansMono-BoldOblique.ttf 2771 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf
2675 ); 2773 );
2676 2774
2677 DC::add_font $_ for @fonts; 2775 DC::add_font $_ for @fonts;
2678 2776
2679 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2777 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2709 }; 2807 };
2710 2808
2711 delete $SIG{__DIE__}; 2809 delete $SIG{__DIE__};
2712 EV::loop; 2810 EV::loop;
2713 2811
2812 DC::write_cfg if $CFG->{config_autosave};
2813
2714#video_shutdown; 2814 #video_shutdown;
2715#audio_shutdown; 2815 #audio_shutdown;
2816
2716 DC::OpenGL::quit; 2817 DC::OpenGL::quit;
2717 DC::SDL_Quit; 2818 DC::SDL_Quit;
2718 DC::DB::Server::stop; 2819 DC::DB::Server::stop;
2719} 2820}
2720 2821

Diff Legend

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