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.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.86 by root, Sun Jan 11 22:11:23 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 {
… …
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 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
56 or die "pangoversion: $!"; 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 64 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 65 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 66 }
75 67
76 unshift @INC, $root; 68 unshift @INC, $root;
77 } 69 }
78} 70}
… …
90 82
91# need to do it again because that pile of garbage called PAR nukes it before main 83# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 84unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 85 if %PAR::LibCache;
94 86
95use Time::HiRes 'time';
96use EV; 87use EV;
88BEGIN { *time = \&EV::time }
89
97use List::Util qw(max min); 90use List::Util qw(max min);
98 91
99use Deliantra; 92use Deliantra;
100use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
101 94
102use AnyEvent::DNS; 95use AnyEvent::Util ();
103use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
104 98
105use Compress::LZF; 99use Compress::LZF;
100use JSON::XS;
106 101
107use DC; 102use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 103
104sub crash($;$) {
105 # nop during compiletime
106}
107
108BEGIN {
109 $SIG{__DIE__} = sub {
110 return if $^S;
111 crash "CRASH/DIE: $_[0]" => 1;
112 DC::fatal Carp::longmess "$_[0]";
113 }
114}
115
109use DC::OpenGL (); 116use DC::OpenGL ();
110use DC::Protocol; 117use DC::Protocol;
111use DC::DB; 118use DC::DB;
112use DC::UI; 119use DC::UI;
113use DC::UI::Canvas; 120use DC::UI::Canvas;
114use DC::UI::Inventory; 121use DC::UI::Inventory;
115use DC::UI::SpellList; 122use DC::UI::SpellList;
116use DC::UI::Dockable; 123use DC::UI::Dockable;
117use DC::UI::Dockbar; 124use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 125use DC::UI::ChatView;
120use DC::MessageDistributor; 126use DC::MessageDistributor;
121use DC::Pod; 127use DC::Pod;
122use DC::MapWidget; 128use DC::MapWidget;
123use DC::Macro; 129use DC::Macro;
124 130
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
127 133
128$EV::DIED = sub { 134$EV::DIED = sub {
135 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
130}; 137};
131 138
132my $MAX_FPS = 60; 139my $MAX_FPS = 60;
133 140
… …
135 142
136our $LAST_REFRESH; 143our $LAST_REFRESH;
137our $NOW; 144our $NOW;
138 145
139our $CFG; 146our $CFG;
140our $CONN;
141our $PROFILE; # current profile 147our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 149
144our $WANT_REFRESH; 150our $WANT_REFRESH;
145 151
… …
154our $FONTSIZE; 160our $FONTSIZE;
155 161
156our $FONT_PROP; 162our $FONT_PROP;
157our $FONT_FIXED; 163our $FONT_FIXED;
158 164
165our $CONN;
166
159our $MAP; 167our $MAP;
160our $MAPMAP; 168our $MAPMAP;
161our $MAPWIDGET; 169our $MAPWIDGET;
162our $COMPLETER; 170our $COMPLETER;
163our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
164our $METASERVER; 175our $METASERVER;
165our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
166our $QUIT_DIALOG; 177our $QUIT_DIALOG;
167our $HOST_ENTRY; 178our $HOST_ENTRY;
168our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
204our $DEBUG_STATUS; 215our $DEBUG_STATUS;
205 216
206our $INV; 217our $INV;
207our $INVR; 218our $INVR;
208our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
209 260
210############################################################################# 261#############################################################################
211 262
212sub status { 263sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
295 or return; 346 or return;
296 347
297 $meta->{data} 348 $meta->{data}
298 or return; 349 or return;
299 350
300 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
301 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
302 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
303 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
304 &audio_music_push ($face); 355 &audio_music_push ($face);
305 } 356 }
306 } else { 357 } else {
307 # fetch from database 358 # fetch from database
308 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
309 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
310 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
311 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
312 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
313 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
314 365
315 audio_sound_push ($face); 366 audio_sound_push ($face);
316 }; 367 };
… …
363 414
364 audio_music_update_volume; 415 audio_music_update_volume;
365 416
366 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
367 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
368 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
369 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
370 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
371 425
372 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
373 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374 428
375 my $NOW = time; 429 my $NOW = time;
376 430
377 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
736} 790}
737 791
738sub dc_connect { 792sub dc_connect {
739 my ($host, $port) = @_; 793 my ($host, $port) = @_;
740 794
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 797
743 $CONN = 798 $CONN =
744 new DC::Protocol 799 new DC::Protocol
745 host => $host, 800 host => $host,
746 port => $port, 801 port => $port,
747 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
749 mapw => $mapsize, 804 mapw => $mapw,
750 maph => $mapsize, 805 maph => $maph,
751 806
752 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
753 808
754 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
800 dc_connect $host, $port; 855 dc_connect $host, $port;
801 } 856 }
802} 857}
803 858
804sub stop_game { 859sub stop_game {
860 crash "stop_game";
861
805 $LOGIN_BUTTON->set_text ("Login / Register"); 862 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 863 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 864 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 865 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 866 $SPELL_LIST->clear_spells;
… …
823} 880}
824 881
825sub graphics_setup { 882sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
827 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 888 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 889
830 my $row = 0; 890 my $row = 0;
831 891
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 893 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 894 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 896
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 898 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 899 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 900 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 901 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 902 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 903 . "by installing the right driver for your graphics card.");
844 904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
906 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
907 value => $CFG->{uitheme},
908 options => [
909 [wood => "Wood (the default)"],
910 [plain => "Plain (very)"],
911 [blue => "Blue (dark)"],
912 [metal => "Metal (light)"],
913 ],
914 tooltip => "Choose the User Interface theme that you like most :)",
915 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
916 );
917
845 my $vidmode_tooltip = 918 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 919 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 920 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 921
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 922 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 924
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
926 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 927 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 928 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
859 933
860 $MODE_SLIDER->connect (changed => sub { 934 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 935 my ($self, $value) = @_;
936
937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
938 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
939 });
940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
941
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
944 state => $CFG->{fullscreen},
945 tooltip => "Bring the client into fullscreen mode.",
946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
947 );
948
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
950 $table->add_at (1, $row++, new DC::UI::CheckBox
951 state => $CFG->{force_opengl11},
952 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
953 . "higher memory usage and slower performance. It will, however, help tremendously on "
954 . "cards that claim to support a feature but fall back to software rendering. "
955 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
956 . "but cards and drivers from other vendors (ATI) are often just as bad. "
957 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
959 );
960
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
962 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{disable_alpha},
964 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
965 . "by disabling a number of textures and transparency effects. Normally, these "
966 . "effects do not cost a lot of resources, but some graphics cards might fall "
967 . "back to extremely slow rendering if this is enabled. If disabling this option "
968 . "noticably improves the framerate of the client please report this! "
969 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
970 on_changed => sub {
971 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 972 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
900 0 975 }
901 } 976 );
902 );
903 977
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 978 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 981 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 982 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 983 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 986 );
913 987
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 990 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 993 );
920 994
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 995 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 998 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1000 );
927 1001
928 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1005 on_activate => sub {
932 video_shutdown (); 1006 video_shutdown ();
933 video_init (); 1007 video_init ();
1008 0
934 0 1009 }
935 } 1010 );
936 ); 1011 }
937 1012
1013 {
1014 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1015
1016 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1017
1018 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1021 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1022 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1024 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1026 );
946 1027
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1033 );
953 1034
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1038 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
958 . "This increases load on the graphics subsystem and works only with TRT servers. " 1039 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1042 );
962 1043
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1047 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1049 );
969 1050
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1054 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1056 );
976 1057
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1058 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1061 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1062 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1063 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1064 );
984 1065
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1069 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1070 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
992 0 1074 }
993 } 1075 );
994 );
995 1076
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1080 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1081 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
1003 0 1085 }
1004 } 1086 );
1005 ); 1087 }
1006 1088
1007 $vbox 1089 $vbox
1008} 1090}
1009 1091
1010our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1173} 1255}
1174 1256
1175sub make_gauge_window { 1257sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1259
1178 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1261 force_x => 0,
1180 force_y => "max", 1262 force_y => "max",
1181 force_w => $WIDTH, 1263 force_w => $WIDTH,
1182 force_h => $gh, 1264 force_h => $gh,
1183 ); 1265 );
… …
1199 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1201 ], 1283 ],
1202 ); 1284 );
1203 1285
1204 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1286 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1205 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1287 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1206 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1288 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1207 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1289 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1208
1209 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1210 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1211 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1212 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1213
1214 $GAUGES = {
1215 exp => $exp, prg => $prg, sklprg => $sklprg,
1216 win => $win, range => $rng,
1217 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1218 };
1219 1290
1220 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1221 1292
1222 $win 1293 $win
1223} 1294}
… …
1565 ); 1636 );
1566 1637
1567 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1568 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1570 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1571 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1572 ); 1643 );
1573 1644
1574 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1575 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
… …
1589 1 1660 1
1590 }, 1661 },
1591 ); 1662 );
1592 1663
1593 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1665 label => "How to Play",
1595 min_h => 200, 1666 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1668 markup =>
1669 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1670 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1671 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1672 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1673 ),
1601 ); 1674 );
1602 1675
1603 $vbox 1676 $vbox
… …
1675 1748
1676 my $row = 0; 1749 my $row = 0;
1677 1750
1678 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1679 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1681 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1755 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1682 on_changed => sub { 1756 on_changed => sub {
1683 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1686 } 1760 }
1687 ); 1761 );
1688 1762
1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1763 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1764 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1765 c_colspan => 2,
1691 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1767 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1693 . "sends more messages than this number, older messages get removed to save memory and " 1768 . "sends more messages than this number, older messages get removed to save memory and "
1694 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1769 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1695 on_changed => sub { 1770 on_changed => sub {
… …
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1773 0
1699 }, 1774 },
1700 ); 1775 );
1701 1776
1777 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1778 $table->add_at (1, $row, new DC::UI::CheckBox
1779 state => $CFG->{config_autosave},
1780 tooltip => "Normally, configuration settings and the user interface layout "
1781 . "are saved on client exit. You can disable this behaviour by "
1782 . "unchecking this checkbox.",
1783 on_changed => sub {
1784 my ($self, $value) = @_;
1785 $CFG->{config_autosave} = $value;
1786 0
1787 }
1788 );
1789 $table->add_at (2, $row++, new DC::UI::Button
1790 text => "Save Now",
1791 tooltip => "Use this to manually save configuration and UI layout when "
1792 . "autosave is disabled.",
1793 on_activate => sub {
1794 DC::write_cfg;
1795 0
1796 }
1797 );
1798
1702 $table 1799 $table
1703} 1800}
1704 1801
1705sub autopickup_setup { 1802sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1803 my $r = new DC::UI::ScrolledWindow (
… …
1712 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1713 ); 1810 );
1714 1811
1715 for ( 1812 for (
1716 ["General", 0, 0, 1813 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814 ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1817 ],
1722 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
… …
1771 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1772 } else { 1868 } else {
1773 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1774 } 1870 }
1775 1871
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1873 if defined $::CONN;
1778 1874
1779 0 1875 0
1780 }); 1876 });
1781 1877
… …
1798 }); 1894 });
1799 1895
1800 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1801 text => "set", 1897 text => "set",
1802 on_activate => sub { 1898 on_activate => sub {
1803 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1804 if defined $::CONN; 1900 if defined $::CONN;
1805 0 1901 0
1806 }); 1902 });
1807 1903
1808 $r 1904 $r
… …
1921 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
1922 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
1923 } 2019 }
1924} 2020}
1925 2021
1926sub player_window { 2022sub make_playerbook {
1927 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1928 x => "center", 2024 x => "center",
1929 y => "center", 2025 y => "center",
1930 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
1931 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
… …
1965 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
1966 2062
1967 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
1968 2064
1969 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
1970 $plwin
1971} 2066}
1972 2067
1973sub keyboard_setup { 2068sub keyboard_setup {
1974 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
1975} 2070}
1976 2071
1977sub help_window { 2072sub make_help_window {
1978 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
1979 x => 'center', 2074 x => 'center',
1980 y => 'center', 2075 y => 'center',
1981 z => 4, 2076 z => 4,
1982 name => 'doc_browser', 2077 name => 'doc_browser',
… …
2071 2166
2072 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
2073 $win->show; 2168 $win->show;
2074 }; 2169 };
2075 2170
2076 $win 2171 $HELP_WINDOW = $win;
2077}
2078
2079sub open_string_query {
2080 my ($title, $cb, $txt, $tooltip) = @_;
2081 my $dialog = new DC::UI::Toplevel
2082 x => "center",
2083 y => "center",
2084 z => 50,
2085 force_w => $WIDTH * 4/5,
2086 title => $title;
2087
2088 $dialog->add (
2089 my $e = new DC::UI::Entry
2090 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2091 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2092 tooltip => $tooltip
2093 );
2094
2095 $e->grab_focus;
2096 $e->set_text ($txt) if $txt;
2097 $dialog->show;
2098} 2172}
2099 2173
2100sub open_quit_dialog { 2174sub open_quit_dialog {
2101 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2102 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2199 );
2126 $hb->add (new DC::UI::Button 2200 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2201 text => "Quit anyway",
2128 expand => 1, 2202 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2203 on_activate => sub {
2204 crash "Quit anyway";
2205 EV::unloop EV::UNLOOP_ALL;
2206 },
2130 ); 2207 );
2131 } 2208 }
2132 2209
2133 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2211 $QUIT_DIALOG->grab_focus;
2212}
2213
2214sub make_menubar {
2215 $MENUFRAME = new DC::UI::Toplevel
2216 border => 0,
2217 force_x => 0,
2218 force_y => 0,
2219 force_w => $::WIDTH,
2220 child => ($MENUBAR = new DC::UI::HBox),
2221 ;
2222
2223 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2224
2225 # 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
2226 make_gauge_window->show;
2227
2228# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2229# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2230
2231 make_playerbook;
2232
2233 $MENUPOPUP = DC::UI::Menu->new (items => [
2234 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2235 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2236 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2237 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2238 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2239 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2240 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2241 ["Quit…" , sub {
2242 if ($CONN) {
2243 open_quit_dialog;
2244 } else {
2245 EV::unloop EV::UNLOOP_ALL;
2246 }
2247 }],
2248 ]);
2249
2250 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2251 tooltip => "Shows the main menu",
2252 on_button_down => sub {
2253 my ($self, $ev) = @_;
2254 local $ev->{x} = 0;
2255 local $ev->{y} = 0;
2256 $MENUPOPUP->popup ($ev);
2257 },
2258 );
2259
2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2261 padding_x => 6,
2262 padding_y => 3,
2263 tooltip => "This progress bar shows your progress towards the next character level.",
2264 template => " Exp: 8,888,888,888 (lvl 188) ",
2265 );
2266
2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2269 . "will automatically pick up items as defined by your item pickup settings "
2270 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2271 . "disable autopickup by disdabling this checkbox.",
2272 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2273 on_changed => sub {
2274 my ($self, $value) = @_;
2275 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2276 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2277 $CONN->send_pickup ($CFG->{pickup})
2278 if $CONN;
2279 },
2280 );
2281
2282 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2283 c_rescale => 1,
2284 padding_x => 6,
2285 padding_y => 3,
2286 force_w => $::WIDTH * 0.2,
2287 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2288 template => "two handed weapons 99%",
2289 );
2290
2291 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2292 expand => 1,
2293 align => 1, can_hover => 1, can_events => 1,
2294 text => "Range and Combat Slots",
2295 tooltip => "#stat_ranged",
2296 );
2297
2298 $MENUFRAME->show;
2299}
2300
2301sub open_string_query {
2302 my ($title, $cb, $txt, $tooltip) = @_;
2303 my $dialog = new DC::UI::Toplevel
2304 x => "center",
2305 y => "center",
2306 z => 50,
2307 force_w => $WIDTH * 4/5,
2308 title => $title;
2309
2310 $dialog->add (
2311 my $e = new DC::UI::Entry
2312 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2313 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2314 tooltip => $tooltip
2315 );
2316
2317 $e->grab_focus;
2318 $e->set_text ($txt) if $txt;
2319 $dialog->show;
2135} 2320}
2136 2321
2137sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2138 # find all tips 2323 # find all tips
2139 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2377 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2378 and die "SDL::Init failed!\n";
2194} 2379}
2195 2380
2196sub video_init { 2381sub video_init {
2382 DC::set_theme $CFG->{uitheme};
2383
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2384 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2385 $SDL_REINIT = 0;
2199 2386
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2387 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2388 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2389 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2203 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2390 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2391
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2392 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2393
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2394 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2395 $CFG->{sdl_mode} = 0; # lowest resolution by default
2396
2397 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2398 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2399 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2400 $CFG->{sdl_mode} = $_;
2401 }
2211 } 2402 }
2212 } 2403 }
2213 2404
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2405 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2406
2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2407 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217 $FULLSCREEN = $CFG->{fullscreen}; 2408 $FULLSCREEN = $CFG->{fullscreen};
2218 $FAST = $CFG->{fast}; 2409 $FAST = $CFG->{fast};
2219 2410
2411 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2220 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2412 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2413 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2414 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222 2415
2223 $SDL_ACTIVE = 1; 2416 $SDL_ACTIVE = 1;
2224 $LAST_REFRESH = time - 0.01; 2417 $LAST_REFRESH = time - 0.01;
2225 2418
… …
2272 2465
2273 (new DC::UI::Frame 2466 (new DC::UI::Frame
2274 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2275 force_x => 0, 2468 force_x => 0,
2276 force_y => "max", 2469 force_y => "max",
2277 child => (my $LR = new DC::UI::VBox), 2470 child => (my $LL = new DC::UI::VBox),
2278 )->show; 2471 )->show;
2279 2472
2280 $LR->add ($STATUSBOX); 2473 $LL->add ($STATUSBOX);
2281 $LR->add ($MODBOX); 2474 $LL->add ($MODBOX);
2282 $LR->add (new DC::UI::Label 2475 $LL->add (new DC::UI::Label
2283 align => 0, 2476 align => 0,
2284 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2477 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2285 fontsize => 0.5, 2478 fontsize => 0.5,
2286 fg => [1, 1, 0, 0.7], 2479 fg => [1, 1, 0, 0.7],
2287 ); 2480 );
… …
2292 x => 0, 2485 x => 0,
2293 y => $FONTSIZE + 8, 2486 y => $FONTSIZE + 8,
2294 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2295 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2296 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 child => ($MAPMAP = new DC::MapWidget::MapMap
2297 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2298 ), 2491 ),
2299 )->show; 2492 )->show;
2300 2493
2301 $MAPWIDGET = new DC::MapWidget; 2494 $MAPWIDGET = new DC::MapWidget;
2302 $MAPWIDGET->connect (activate_console => sub { 2495 $MAPWIDGET->connect (activate_console => sub {
… …
2356 . "After pressing the combo the binding will be saved automatically and the " 2549 . "After pressing the combo the binding will be saved automatically and the "
2357 . "binding editor closes"); 2550 . "binding editor closes");
2358 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2551 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2359 "Some debuggin' options. Do not ask."); 2552 "Some debuggin' options. Do not ask.");
2360 2553
2361 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2554 make_help_window;
2555 make_menubar;
2362 2556
2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2364 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2365
2366# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2367# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2368
2369 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
2370
2371 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2372 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2373
2374 $BUTTONBAR->add (new DC::UI::Button
2375 text => "Save Config",
2376 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2377 on_activate => sub {
2378 $::CFG->{layout} = DC::UI::get_layout;
2379 DC::write_cfg;
2380 status "Configuration Saved";
2381 0
2382 },
2383 );
2384
2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2386 tooltip => "View Documentation");
2387
2388 $BUTTONBAR->add (new DC::UI::Button
2389 text => "Quit",
2390 tooltip => "Terminates the program",
2391 on_activate => sub {
2392 if ($CONN) {
2393 open_quit_dialog;
2394 } else {
2395 EV::unloop EV::UNLOOP_ALL;
2396 }
2397 0
2398 },
2399 );
2400
2401 $BUTTONBAR->show;
2402 $SETUP_DIALOG->show; 2557 $SETUP_DIALOG->show;
2403 $MESSAGE_WINDOW->show; 2558 $MESSAGE_WINDOW->show;
2404 } 2559 }
2405 2560
2406 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2561 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2407 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2562 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2408 2563
2409 $CAVEAT_LABEL->set_text ("None :)"); 2564 $CAVEAT_LABEL->set_text ("None :)");
2410 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2565 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2411 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2566 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2466 delete $animate_object{$widget}; 2621 delete $animate_object{$widget};
2467} 2622}
2468 2623
2469%SDL_CB = ( 2624%SDL_CB = (
2470 DC::SDL_QUIT => sub { 2625 DC::SDL_QUIT => sub {
2626 crash "SDL_QUIT";
2471 EV::unloop EV::UNLOOP_ALL; 2627 EV::unloop EV::UNLOOP_ALL;
2472 }, 2628 },
2473 DC::SDL_VIDEORESIZE => sub { 2629 DC::SDL_VIDEORESIZE => sub {
2474 }, 2630 },
2475 DC::SDL_VIDEOEXPOSE => sub { 2631 DC::SDL_VIDEOEXPOSE => sub {
… …
2515$SIG{INT} = $SIG{TERM} = sub { 2671$SIG{INT} = $SIG{TERM} = sub {
2516 EV::unloop; 2672 EV::unloop;
2517 #d# TODO calling exit here hangs the process in some futex 2673 #d# TODO calling exit here hangs the process in some futex
2518}; 2674};
2519 2675
2520{ 2676# due to mac os x + sdl combined braindamage, we need this contortion
2677sub main {
2678 {
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2679 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522 2680
2523 if (-e "$Deliantra::VARDIR/client.cf") { 2681 if (-e "$Deliantra::VARDIR/client.cf") {
2524 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2682 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525 } else { 2683 } else {
2526 #TODO: compatibility cruft 2684 #TODO: compatibility cruft
2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2685 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528 print STDERR "INFO: used old configuration file\n"; 2686 print STDERR "INFO: used old configuration file\n";
2529 } 2687 }
2530 2688
2531 DC::DB::Server::run; 2689 DC::DB::Server::run;
2532 2690
2533 if ($CFG->{db_schema} < 1) { 2691 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2692 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db; 2693 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1; 2694 $CFG->{db_schema} = 1;
2537 DC::write_cfg; 2695 DC::write_cfg;
2538 } 2696 }
2539 2697
2540 DC::DB::open_db; 2698 DC::DB::open_db;
2541 2699
2542 DC::UI::set_layout ($::CFG->{layout}); 2700 DC::UI::set_layout ($::CFG->{layout});
2543 2701
2544 my %DEF_CFG = ( 2702 my %DEF_CFG = (
2703 config_autosave => 1,
2545 sdl_mode => 0, 2704 sdl_mode => undef,
2546 fullscreen => 1, 2705 fullscreen => 1,
2547 fast => 0, 2706 fast => 0,
2548 force_opengl11 => undef, 2707 force_opengl11 => undef,
2549 disable_alpha => 0, 2708 disable_alpha => 0,
2550 smooth_movement => 1, 2709 smooth_movement => 1,
2551 texture_compression => 1, 2710 texture_compression => 1,
2552 map_scale => 1, 2711 map_scale => 1,
2553 fow_enable => 1, 2712 fow_enable => 1,
2554 fow_intensity => 0, 2713 fow_intensity => 0,
2555 map_smoothing => 1, 2714 map_smoothing => 1,
2556 gui_fontsize => 1, 2715 gui_fontsize => 1,
2557 log_fontsize => 0.7, 2716 log_fontsize => 0.7,
2558 gauge_fontsize => 1, 2717 gauge_fontsize => 1,
2559 gauge_size => 0.35, 2718 gauge_size => 0.35,
2560 stat_fontsize => 0.7, 2719 stat_fontsize => 0.7,
2561 mapsize => 100, 2720 mapsize => 100,
2562 audio_enable => 1, 2721 audio_enable => 1,
2563 audio_hw_channels => 0, 2722 audio_hw_channels => 0,
2564 audio_hw_frequency => 0, 2723 audio_hw_frequency => 0,
2565 audio_hw_chunksize => 0, 2724 audio_hw_chunksize => 0,
2566 audio_mix_channels => 8, 2725 audio_mix_channels => 8,
2567 effects_enable => 1, 2726 effects_enable => 1,
2568 effects_volume => 1, 2727 effects_volume => 1,
2569 bgm_enable => 1, 2728 bgm_enable => 1,
2570 bgm_volume => 0.5, 2729 bgm_volume => 0.5,
2571 output_rate => "", 2730 output_rate => "",
2572 pickup => 0, 2731 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2573 inv_sort => "mtime", 2732 inv_sort => "mtime",
2574 default => "profile", # default profile 2733 default => "profile", # default profile
2575 show_tips => 1, 2734 show_tips => 1,
2576 logview_max_par => 1000, 2735 logview_max_par => 1000,
2577 shift_fire_stop => 0, 2736 shift_fire_stop => 0,
2737 uitheme => "wood",
2578 ); 2738 );
2579 2739
2580 while (my ($k, $v) = each %DEF_CFG) { 2740 while (my ($k, $v) = each %DEF_CFG) {
2581 $CFG->{$k} = $v unless exists $CFG->{$k}; 2741 $CFG->{$k} = $v unless exists $CFG->{$k};
2582 } 2742 }
2583 2743
2584 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2744 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2585 $PROFILE = $CFG->{profile}{default}; 2745 $PROFILE = $CFG->{profile}{default};
2586 2746
2587 # convert old bindings (only default profile matters) 2747 # convert old bindings (only default profile matters)
2588 if (my $bindings = delete $PROFILE->{bindings}) { 2748 if (my $bindings = delete $PROFILE->{bindings}) {
2589 while (my ($mod, $syms) = each %$bindings) { 2749 while (my ($mod, $syms) = each %$bindings) {
2590 while (my ($sym, $cmds) = each %$syms) { 2750 while (my ($sym, $cmds) = each %$syms) {
2591 push @{ $PROFILE->{macro} }, { 2751 push @{ $PROFILE->{macro} }, {
2592 accelkey => [$mod*1, $sym*1], 2752 accelkey => [$mod*1, $sym*1],
2593 action => $cmds, 2753 action => $cmds,
2754 };
2594 }; 2755 }
2595 } 2756 }
2596 } 2757 }
2597 }
2598 2758
2599 sdl_init; 2759 sdl_init;
2600 2760
2601 { 2761 {
2602 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2762 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603 DejaVuSans.ttf 2763 DejaVuSans.ttf
2604 DejaVuSansMono.ttf 2764 DejaVuSansMono.ttf
2605 DejaVuSans-Bold.ttf 2765 DejaVuSans-Bold.ttf
2606 DejaVuSansMono-Bold.ttf 2766 DejaVuSansMono-Bold.ttf
2607 DejaVuSans-Oblique.ttf 2767 DejaVuSans-Oblique.ttf
2608 DejaVuSansMono-Oblique.ttf 2768 DejaVuSansMono-Oblique.ttf
2609 DejaVuSans-BoldOblique.ttf 2769 DejaVuSans-BoldOblique.ttf
2610 DejaVuSansMono-BoldOblique.ttf 2770 DejaVuSansMono-BoldOblique.ttf
2611 ); 2771 );
2612 2772
2613 DC::add_font $_ for @fonts; 2773 DC::add_font $_ for @fonts;
2614 2774
2615 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2775 $FONT_PROP = new_from_file DC::Font $fonts[0];
2616 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2776 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2617 2777
2618 $FONT_PROP->make_default; 2778 $FONT_PROP->make_default;
2619 2779
2620 DC::pango_init; 2780 DC::pango_init;
2621 } 2781 }
2622 2782
2623# compare mono (ft) vs. rgba (cairo) 2783# compare mono (ft) vs. rgba (cairo)
2624# ft - 1.8s, cairo 3s, even in alpha-only mode 2784# ft - 1.8s, cairo 3s, even in alpha-only mode
2625# for my $rgba (0..1) { 2785# for my $rgba (0..1) {
2626# my $t1 = Time::HiRes::time; 2786# my $t1 = Time::HiRes::time;
… …
2631# } 2791# }
2632# my $t2 = Time::HiRes::time; 2792# my $t2 = Time::HiRes::time;
2633# warn $t2-$t1; 2793# warn $t2-$t1;
2634# } 2794# }
2635 2795
2636 video_init; 2796 video_init;
2637 audio_init; 2797 audio_init;
2638} 2798 }
2639 2799
2640show_tip_of_the_day if $CFG->{show_tips}; 2800 show_tip_of_the_day if $CFG->{show_tips};
2641 2801
2642our $STARTUP_CANCEL = EV::idle sub { 2802 our $STARTUP_CANCEL = EV::idle sub {
2643 undef $::STARTUP_CANCEL; 2803 undef $::STARTUP_CANCEL;
2644 $startup_done->(); 2804 $startup_done->();
2645}; 2805 };
2646 2806
2647delete $SIG{__DIE__}; 2807 delete $SIG{__DIE__};
2648EV::loop; 2808 EV::loop;
2649 2809
2810 DC::write_cfg if $CFG->{config_autosave};
2811
2650#video_shutdown; 2812 #video_shutdown;
2651#audio_shutdown; 2813 #audio_shutdown;
2814
2652DC::OpenGL::quit; 2815 DC::OpenGL::quit;
2653DC::SDL_Quit; 2816 DC::SDL_Quit;
2654DC::DB::Server::stop; 2817 DC::DB::Server::stop;
2818}
2819
2820DC::SDL_braino; # see sub above
2655 2821
2656=head1 NAME 2822=head1 NAME
2657 2823
2658deliantra - A Deliantra MORPG game client 2824deliantra - A Deliantra MORPG game client
2659 2825

Diff Legend

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