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.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.88 by root, Sun Jan 11 23:50:27 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 "$@" 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
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
146our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
147our $WIDTH; 157our $WIDTH;
148our $HEIGHT; 158our $HEIGHT;
149our $FULLSCREEN; 159our $FULLSCREEN;
150our $FONTSIZE; 160our $FONTSIZE;
151 161
152our $FONT_PROP; 162our $FONT_PROP;
153our $FONT_FIXED; 163our $FONT_FIXED;
154 164
165our $CONN;
166
155our $MAP; 167our $MAP;
156our $MAPMAP; 168our $MAPMAP;
157our $MAPWIDGET; 169our $MAPWIDGET;
158our $COMPLETER; 170our $COMPLETER;
159our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
160our $METASERVER; 175our $METASERVER;
161our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
162our $QUIT_DIALOG; 177our $QUIT_DIALOG;
163our $HOST_ENTRY; 178our $HOST_ENTRY;
164our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
200our $DEBUG_STATUS; 215our $DEBUG_STATUS;
201 216
202our $INV; 217our $INV;
203our $INVR; 218our $INVR;
204our $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}
205 260
206############################################################################# 261#############################################################################
207 262
208sub status { 263sub status {
209 $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]);
… …
291 or return; 346 or return;
292 347
293 $meta->{data} 348 $meta->{data}
294 or return; 349 or return;
295 350
296 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
297 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
298 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
299 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
300 &audio_music_push ($face); 355 &audio_music_push ($face);
301 } 356 }
302 } else { 357 } else {
303 # fetch from database 358 # fetch from database
304 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
305 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
306 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
307 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;
308 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
309 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
310 365
311 audio_sound_push ($face); 366 audio_sound_push ($face);
312 }; 367 };
… …
359 414
360 audio_music_update_volume; 415 audio_music_update_volume;
361 416
362 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
363 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
364 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
365 ? 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
366 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
367 425
368 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
369 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
370 428
371 my $NOW = time; 429 my $NOW = time;
372 430
373 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
374 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
732} 790}
733 791
734sub dc_connect { 792sub dc_connect {
735 my ($host, $port) = @_; 793 my ($host, $port) = @_;
736 794
737 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;
738 797
739 $CONN = 798 $CONN =
740 new DC::Protocol 799 new DC::Protocol
741 host => $host, 800 host => $host,
742 port => $port, 801 port => $port,
743 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
744 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
745 mapw => $mapsize, 804 mapw => $mapw,
746 maph => $mapsize, 805 maph => $maph,
747 806
748 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
749 808
750 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
751 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
796 dc_connect $host, $port; 855 dc_connect $host, $port;
797 } 856 }
798} 857}
799 858
800sub stop_game { 859sub stop_game {
860 crash "stop_game";
861
801 $LOGIN_BUTTON->set_text ("Login / Register"); 862 $LOGIN_BUTTON->set_text ("Login / Register");
802 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 863 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
803 $SETUP_DIALOG->show; 864 $SETUP_DIALOG->show;
804 $PL_WINDOW->hide; 865 $PL_WINDOW->hide;
805 $SPELL_LIST->clear_spells; 866 $SPELL_LIST->clear_spells;
… …
819} 880}
820 881
821sub graphics_setup { 882sub graphics_setup {
822 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
823 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
824 $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]);
825 889
826 my $row = 0; 890 my $row = 0;
827 891
828 $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");
829 $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,
830 can_events => 1, 894 can_events => 1,
831 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
832 896
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
898 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
899 can_events => 1,
900 tooltip => "This field shows any known issues with your config or driver, such as "
901 . "a non-accelerated display format. You can try to work around these issues "
902 . "by selecting a different video mode, changing the settings below or "
903 . "by installing the right driver for your graphics card.");
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
833 my $vidmode_tooltip = 918 my $vidmode_tooltip =
834 "<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). "
835 . "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>.";
836 921
837 $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");
838 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
839 924
840 $hbox->add (my $mode_slider = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
841 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 926 c_rescale => 1,
927 force_w => $WIDTH * 0.1, expand => 1,
928 range => [ ($CFG->{sdl_mode}) x 3 ],
842 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
843 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
844 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
845 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
846 933
847 $mode_slider->connect (changed => sub { 934 $MODE_SLIDER->connect (changed => sub {
848 my ($self, $value) = @_; 935 my ($self, $value) = @_;
849 936
850 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
851 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 938 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
852 }); 939 });
853 $mode_slider->emit (changed => $mode_slider->{range}[0]); 940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
854 941
855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
856 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
857 state => $CFG->{fullscreen}, 944 state => $CFG->{fullscreen},
858 tooltip => "Bring the client into fullscreen mode.", 945 tooltip => "Bring the client into fullscreen mode.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
860 ); 947 );
861 948
862 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 950 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{force_opengl11}, 951 state => $CFG->{force_opengl11},
865 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 952 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
866 . "higher memory usage and slower performance. It will, however, help tremendously on " 953 . "higher memory usage and slower performance. It will, however, help tremendously on "
867 . "cards that claim to support a feature but fall back to software rendering. " 954 . "cards that claim to support a feature but fall back to software rendering. "
868 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 955 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
869 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 956 . "but cards and drivers from other vendors (ATI) are often just as bad. "
870 . "experience extremely low framerates and your card should do better, try this option.</b>", 957 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
871 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
872 ); 959 );
873 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) = @_;
972 $CFG->{disable_alpha} = $value;
973 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
974 0
975 }
976 );
977
874 $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");
875 $table->add_at (1, $row++, new DC::UI::CheckBox 979 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
877 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 "
878 . "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). "
879 . "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 "
880 . "forced OpenGL 1.1 mode.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
882 ); 986 );
883 987
884 $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");
885 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
886 state => $CFG->{fast}, 990 state => $CFG->{fast},
887 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
888 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
889 ); 993 );
890 994
891 $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");
892 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
894 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.",
895 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
896 ); 1000 );
897 1001
898 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
899 expand => 1, text => "Apply", 1003 expand => 1, text => "Apply",
900 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
901 on_activate => sub { 1005 on_activate => sub {
902 video_shutdown (); 1006 video_shutdown ();
903 video_init (); 1007 video_init ();
1008 0
904 0 1009 }
905 } 1010 );
1011 }
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;
1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{smooth_movement},
1022 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1024 . "then disable this option. Changes take effect immdiately.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
906 ); 1026 );
907 1027
908 $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");
909 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
911 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
912 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 }
913 ); 1033 );
914 1034
915 $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");
916 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
917 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
918 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. "
919 . "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. "
920 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
921 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
922 ); 1042 );
923 1043
924 $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");
925 $table->add_at (1, $row++, new DC::UI::CheckBox 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
926 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
927 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.",
928 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
929 ); 1049 );
930 1050
931 $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");
932 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
933 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
934 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.",
935 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
936 ); 1056 );
937 1057
938 $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");
939 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
940 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
941 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, "
942 . "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.",
943 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 },
944 ); 1064 );
945 1065
946 $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");
947 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
948 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
949 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.",
950 on_changed => sub { 1070 on_changed => sub {
951 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
952 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
953 0 1074 }
954 } 1075 );
955 );
956 1076
957 $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");
958 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
959 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
960 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.",
961 on_changed => sub { 1081 on_changed => sub {
962 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
963 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
964 0 1085 }
965 } 1086 );
966 ); 1087 }
967 1088
968 $vbox 1089 $vbox
969} 1090}
970 1091
971our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
… …
1134} 1255}
1135 1256
1136sub make_gauge_window { 1257sub make_gauge_window {
1137 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1138 1259
1139 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1140 force_x => 0, 1261 force_x => 0,
1141 force_y => "max", 1262 force_y => "max",
1142 force_w => $WIDTH, 1263 force_w => $WIDTH,
1143 force_h => $gh, 1264 force_h => $gh,
1144 ); 1265 );
… …
1160 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1161 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1162 ], 1283 ],
1163 ); 1284 );
1164 1285
1165 $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");
1166 $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");
1167 $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");
1168 $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");
1169
1170 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1171 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1172 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1173 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1174
1175 $GAUGES = {
1176 exp => $exp, prg => $prg, sklprg => $sklprg,
1177 win => $win, range => $rng,
1178 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1179 };
1180 1290
1181 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1182 1292
1183 $win 1293 $win
1184} 1294}
… …
1526 ); 1636 );
1527 1637
1528 $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");
1529 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1530 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1531 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1532 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 }
1533 ); 1643 );
1534 1644
1535 $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");
1536 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
… …
1550 1 1660 1
1551 }, 1661 },
1552 ); 1662 );
1553 1663
1554 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1555 label => "Registering", 1665 label => "How to Play",
1556 min_h => 200, 1666 min_h => 240,
1557 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1558 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). "
1559 "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 "
1560 . "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.",
1561 ), 1673 ),
1562 ); 1674 );
1563 1675
1564 $vbox 1676 $vbox
… …
1636 1748
1637 my $row = 0; 1749 my $row = 0;
1638 1750
1639 $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");
1640 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1641 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1642 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?",
1643 on_changed => sub { 1756 on_changed => sub {
1644 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1645 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1647 } 1760 }
1648 ); 1761 );
1649 1762
1650 $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");
1651 $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,
1652 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1653 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 "
1654 . "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 "
1655 . "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.",
1656 on_changed => sub { 1770 on_changed => sub {
… …
1658 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1659 0 1773 0
1660 }, 1774 },
1661 ); 1775 );
1662 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
1663 $table 1799 $table
1664} 1800}
1665 1801
1666sub autopickup_setup { 1802sub autopickup_setup {
1667 my $r = new DC::UI::ScrolledWindow ( 1803 my $r = new DC::UI::ScrolledWindow (
… …
1673 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1674 ); 1810 );
1675 1811
1676 for ( 1812 for (
1677 ["General", 0, 0, 1813 ["General", 0, 0,
1678 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1679 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814# ["Inhibit autopickup" => PICKUP_INHIBIT],
1680 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1681 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1682 ], 1817 ],
1683 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
1684 ["All weapons" => PICKUP_ALLWEAPON], 1819 ["All weapons" => PICKUP_ALLWEAPON],
… …
1710 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1845 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1711 ["Ignore cursed" => PICKUP_NOT_CURSED], 1846 ["Ignore cursed" => PICKUP_NOT_CURSED],
1712 ["Jewelery" => PICKUP_JEWELS], 1847 ["Jewelery" => PICKUP_JEWELS],
1713 ["Flesh" => PICKUP_FLESH], 1848 ["Flesh" => PICKUP_FLESH],
1714 ], 1849 ],
1715 ["Weight/Value ratio", 2, 17] 1850 ["Value/Weight ratio", 2, 17]
1716 ) 1851 )
1717 { 1852 {
1718 my ($title, $x, $y, @bits) = @$_; 1853 my ($title, $x, $y, @bits) = @$_;
1719 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1854 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1720 1855
… …
1732 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1733 } else { 1868 } else {
1734 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1735 } 1870 }
1736 1871
1737 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1738 if defined $::CONN; 1873 if defined $::CONN;
1739 1874
1740 0 1875 0
1741 }); 1876 });
1742 1877
… …
1745 } 1880 }
1746 1881
1747 $table->add_at (2, 18, new DC::UI::ValSlider 1882 $table->add_at (2, 18, new DC::UI::ValSlider
1748 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1883 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1749 template => ">= 99", 1884 template => ">= 99",
1885 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1750 to_value => sub { ">= " . 5 * $_[0] }, 1886 to_value => sub { ">= " . 5 * $_[0] },
1751 on_changed => sub { 1887 on_changed => sub {
1752 my ($slider, $value) = @_; 1888 my ($slider, $value) = @_;
1753 1889
1754 $::CFG->{pickup} &= ~0xF; 1890 $::CFG->{pickup} &= ~0xF;
… …
1758 }); 1894 });
1759 1895
1760 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1761 text => "set", 1897 text => "set",
1762 on_activate => sub { 1898 on_activate => sub {
1763 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1764 if defined $::CONN; 1900 if defined $::CONN;
1765 0 1901 0
1766 }); 1902 });
1767 1903
1768 $r 1904 $r
… …
1810 $::CFG->{inv_sort} = $_[1]; 1946 $::CFG->{inv_sort} = $_[1];
1811 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1947 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1812 }, 1948 },
1813 ); 1949 );
1814 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1950 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1815 #TODO# update to weigh/maxweight 1951 #TODO# update to weight/maxweight
1816 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1952 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1817 1953
1818 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1954 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1819 $sw1->add ($INV = new DC::UI::Inventory); 1955 $sw1->add ($INV = new DC::UI::Inventory);
1820 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1956 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1881 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
1882 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
1883 } 2019 }
1884} 2020}
1885 2021
1886sub player_window { 2022sub make_playerbook {
1887 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1888 x => "center", 2024 x => "center",
1889 y => "center", 2025 y => "center",
1890 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
1891 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
… …
1925 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
1926 2062
1927 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
1928 2064
1929 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
1930 $plwin
1931} 2066}
1932 2067
1933sub keyboard_setup { 2068sub keyboard_setup {
1934 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
1935} 2070}
1936 2071
1937sub help_window { 2072sub make_help_window {
1938 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
1939 x => 'center', 2074 x => 'center',
1940 y => 'center', 2075 y => 'center',
1941 z => 4, 2076 z => 4,
1942 name => 'doc_browser', 2077 name => 'doc_browser',
… …
2031 2166
2032 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
2033 $win->show; 2168 $win->show;
2034 }; 2169 };
2035 2170
2036 $win 2171 $HELP_WINDOW = $win;
2037}
2038
2039sub open_string_query {
2040 my ($title, $cb, $txt, $tooltip) = @_;
2041 my $dialog = new DC::UI::Toplevel
2042 x => "center",
2043 y => "center",
2044 z => 50,
2045 force_w => $WIDTH * 4/5,
2046 title => $title;
2047
2048 $dialog->add (
2049 my $e = new DC::UI::Entry
2050 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2051 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2052 tooltip => $tooltip
2053 );
2054
2055 $e->grab_focus;
2056 $e->set_text ($txt) if $txt;
2057 $dialog->show;
2058} 2172}
2059 2173
2060sub open_quit_dialog { 2174sub open_quit_dialog {
2061 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2062 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2084 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2085 ); 2199 );
2086 $hb->add (new DC::UI::Button 2200 $hb->add (new DC::UI::Button
2087 text => "Quit anyway", 2201 text => "Quit anyway",
2088 expand => 1, 2202 expand => 1,
2089 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2203 on_activate => sub {
2204 crash "Quit anyway";
2205 EV::unloop EV::UNLOOP_ALL;
2206 },
2090 ); 2207 );
2091 } 2208 }
2092 2209
2093 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2094 $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: 888,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;
2095} 2320}
2096 2321
2097sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2098 # find all tips 2323 # find all tips
2099 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2147 $dialog->show; 2372 $dialog->show;
2148 }; 2373 };
2149} 2374}
2150 2375
2151sub sdl_init { 2376sub sdl_init {
2152 DC::SDL_Init 2377 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2153 and die "SDL::Init failed!\n"; 2378 and die "SDL::Init failed!\n";
2154} 2379}
2155 2380
2156sub video_init { 2381sub video_init {
2382 DC::set_theme $CFG->{uitheme};
2383
2384 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2385 $SDL_REINIT = 0;
2386
2387 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2388 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2389 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2390 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2391
2392 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2393
2157 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2394 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2395 $CFG->{sdl_mode} = 0; # lowest resolution by default
2396
2397 # now choose biggest mode <= 1024x768
2398 for (0 .. $#SDL_MODES) {
2399 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2400 $CFG->{sdl_mode} = $_;
2401 }
2402 }
2403 }
2158 2404
2159 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2405 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2160 2406
2161 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2407 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2162 $FULLSCREEN = $CFG->{fullscreen}; 2408 $FULLSCREEN = $CFG->{fullscreen};
2163 $FAST = $CFG->{fast}; 2409 $FAST = $CFG->{fast};
2164 2410
2411 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2165 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
2166 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2414 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2167 2415
2168 $SDL_ACTIVE = 1; 2416 $SDL_ACTIVE = 1;
2169 $LAST_REFRESH = time - 0.01; 2417 $LAST_REFRESH = time - 0.01;
2170 2418
… …
2217 2465
2218 (new DC::UI::Frame 2466 (new DC::UI::Frame
2219 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2220 force_x => 0, 2468 force_x => 0,
2221 force_y => "max", 2469 force_y => "max",
2222 child => (my $LR = new DC::UI::VBox), 2470 child => (my $LL = new DC::UI::VBox),
2223 )->show; 2471 )->show;
2224 2472
2225 $LR->add ($STATUSBOX); 2473 $LL->add ($STATUSBOX);
2226 $LR->add ($MODBOX); 2474 $LL->add ($MODBOX);
2227 $LR->add (new DC::UI::Label 2475 $LL->add (new DC::UI::Label
2228 align => 0, 2476 align => 0,
2229 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2477 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2230 fontsize => 0.5, 2478 fontsize => 0.5,
2231 fg => [1, 1, 0, 0.7], 2479 fg => [1, 1, 0, 0.7],
2232 ); 2480 );
… …
2237 x => 0, 2485 x => 0,
2238 y => $FONTSIZE + 8, 2486 y => $FONTSIZE + 8,
2239 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2240 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2241 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 child => ($MAPMAP = new DC::MapWidget::MapMap
2242 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.",
2243 ), 2491 ),
2244 )->show; 2492 )->show;
2245 2493
2246 $MAPWIDGET = new DC::MapWidget; 2494 $MAPWIDGET = new DC::MapWidget;
2247 $MAPWIDGET->connect (activate_console => sub { 2495 $MAPWIDGET->connect (activate_console => sub {
… …
2301 . "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 "
2302 . "binding editor closes"); 2550 . "binding editor closes");
2303 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2551 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2304 "Some debuggin' options. Do not ask."); 2552 "Some debuggin' options. Do not ask.");
2305 2553
2306 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2554 make_help_window;
2555 make_menubar;
2307 2556
2308 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2309 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2310
2311# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2312# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2313
2314 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
2315
2316 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2317 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2318
2319 $BUTTONBAR->add (new DC::UI::Button
2320 text => "Save Config",
2321 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2322 on_activate => sub {
2323 $::CFG->{layout} = DC::UI::get_layout;
2324 DC::write_cfg;
2325 status "Configuration Saved";
2326 0
2327 },
2328 );
2329
2330 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2331 tooltip => "View Documentation");
2332
2333 $BUTTONBAR->add (new DC::UI::Button
2334 text => "Quit",
2335 tooltip => "Terminates the program",
2336 on_activate => sub {
2337 if ($CONN) {
2338 open_quit_dialog;
2339 } else {
2340 EV::unloop EV::UNLOOP_ALL;
2341 }
2342 0
2343 },
2344 );
2345
2346 $BUTTONBAR->show;
2347 $SETUP_DIALOG->show; 2557 $SETUP_DIALOG->show;
2348 $MESSAGE_WINDOW->show; 2558 $MESSAGE_WINDOW->show;
2349 } 2559 }
2350 2560
2561 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2562 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2563
2564 $CAVEAT_LABEL->set_text ("None :)");
2565 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2566 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2567
2351 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2568 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2352} 2569}
2353 2570
2354sub video_shutdown { 2571sub video_shutdown {
2355 DC::OpenGL::shutdown; 2572 DC::OpenGL::shutdown;
2573 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2356 2574
2357 undef $SDL_ACTIVE; 2575 undef $SDL_ACTIVE;
2358} 2576}
2359 2577
2360my %animate_object; 2578my %animate_object;
… …
2403 delete $animate_object{$widget}; 2621 delete $animate_object{$widget};
2404} 2622}
2405 2623
2406%SDL_CB = ( 2624%SDL_CB = (
2407 DC::SDL_QUIT => sub { 2625 DC::SDL_QUIT => sub {
2626 crash "SDL_QUIT";
2408 EV::unloop EV::UNLOOP_ALL; 2627 EV::unloop EV::UNLOOP_ALL;
2409 }, 2628 },
2410 DC::SDL_VIDEORESIZE => sub { 2629 DC::SDL_VIDEORESIZE => sub {
2411 }, 2630 },
2412 DC::SDL_VIDEOEXPOSE => sub { 2631 DC::SDL_VIDEOEXPOSE => sub {
… …
2421# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2640# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2422 }, 2641 },
2423 DC::SDL_KEYDOWN => sub { 2642 DC::SDL_KEYDOWN => sub {
2424 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2643 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2425 # alt-enter 2644 # alt-enter
2645 video_shutdown;
2426 $FULLSCREEN_ENABLE->toggle; 2646 $FULLSCREEN_ENABLE->toggle;
2427 video_shutdown;
2428 video_init; 2647 video_init;
2429 } else { 2648 } else {
2430 &DC::UI::feed_sdl_key_down_event; 2649 &DC::UI::feed_sdl_key_down_event;
2431 } 2650 }
2432 update_modbox; 2651 update_modbox;
… …
2452$SIG{INT} = $SIG{TERM} = sub { 2671$SIG{INT} = $SIG{TERM} = sub {
2453 EV::unloop; 2672 EV::unloop;
2454 #d# TODO calling exit here hangs the process in some futex 2673 #d# TODO calling exit here hangs the process in some futex
2455}; 2674};
2456 2675
2457{ 2676# due to mac os x + sdl combined braindamage, we need this contortion
2677sub main {
2678 {
2458 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2679 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2459 2680
2460 if (-e "$Deliantra::VARDIR/client.cf") { 2681 if (-e "$Deliantra::VARDIR/client.cf") {
2461 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2682 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2462 } else { 2683 } else {
2463 #TODO: compatibility cruft 2684 #TODO: compatibility cruft
2464 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2685 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2465 print STDERR "INFO: used old configuration file\n"; 2686 print STDERR "INFO: used old configuration file\n";
2466 } 2687 }
2467 2688
2468 DC::DB::Server::run; 2689 DC::DB::Server::run;
2469 2690
2470 if ($CFG->{db_schema} < 1) { 2691 if ($CFG->{db_schema} < 1) {
2471 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";
2472 DC::DB::nuke_db; 2693 DC::DB::nuke_db;
2473 $CFG->{db_schema} = 1; 2694 $CFG->{db_schema} = 1;
2474 DC::write_cfg; 2695 DC::write_cfg;
2475 } 2696 }
2476 2697
2477 DC::DB::open_db; 2698 DC::DB::open_db;
2478 2699
2479 DC::UI::set_layout ($::CFG->{layout}); 2700 DC::UI::set_layout ($::CFG->{layout});
2480 2701
2481 my %DEF_CFG = ( 2702 my %DEF_CFG = (
2703 config_autosave => 1,
2482 sdl_mode => 0, 2704 sdl_mode => undef,
2483 fullscreen => 1, 2705 fullscreen => 1,
2484 fast => 0, 2706 fast => 0,
2485 force_opengl11 => undef, 2707 force_opengl11 => undef,
2708 disable_alpha => 0,
2709 smooth_movement => 1,
2486 texture_compression => 1, 2710 texture_compression => 1,
2487 map_scale => 1, 2711 map_scale => 1,
2488 fow_enable => 1, 2712 fow_enable => 1,
2489 fow_intensity => 0, 2713 fow_intensity => 0,
2490 map_smoothing => 1, 2714 map_smoothing => 1,
2491 gui_fontsize => 1, 2715 gui_fontsize => 1,
2492 log_fontsize => 0.7, 2716 log_fontsize => 0.7,
2493 gauge_fontsize => 1, 2717 gauge_fontsize => 1,
2494 gauge_size => 0.35, 2718 gauge_size => 0.35,
2495 stat_fontsize => 0.7, 2719 stat_fontsize => 0.7,
2496 mapsize => 100, 2720 mapsize => 100,
2497 audio_enable => 1, 2721 audio_enable => 1,
2498 audio_hw_channels => 0, 2722 audio_hw_channels => 0,
2499 audio_hw_frequency => 0, 2723 audio_hw_frequency => 0,
2500 audio_hw_chunksize => 0, 2724 audio_hw_chunksize => 0,
2501 audio_mix_channels => 8, 2725 audio_mix_channels => 8,
2502 effects_enable => 1, 2726 effects_enable => 1,
2503 effects_volume => 1, 2727 effects_volume => 1,
2504 bgm_enable => 1, 2728 bgm_enable => 1,
2505 bgm_volume => 0.5, 2729 bgm_volume => 0.5,
2506 output_rate => "", 2730 output_rate => "",
2507 pickup => 0, 2731 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2508 inv_sort => "mtime", 2732 inv_sort => "mtime",
2509 default => "profile", # default profile 2733 default => "profile", # default profile
2510 show_tips => 1, 2734 show_tips => 1,
2511 logview_max_par => 1000, 2735 logview_max_par => 1000,
2512 shift_fire_stop => 0, 2736 shift_fire_stop => 0,
2737 uitheme => "wood",
2513 ); 2738 );
2514 2739
2515 while (my ($k, $v) = each %DEF_CFG) { 2740 while (my ($k, $v) = each %DEF_CFG) {
2516 $CFG->{$k} = $v unless exists $CFG->{$k}; 2741 $CFG->{$k} = $v unless exists $CFG->{$k};
2517 } 2742 }
2518 2743
2519 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2744 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2520 $PROFILE = $CFG->{profile}{default}; 2745 $PROFILE = $CFG->{profile}{default};
2521 2746
2522 # convert old bindings (only default profile matters) 2747 # convert old bindings (only default profile matters)
2523 if (my $bindings = delete $PROFILE->{bindings}) { 2748 if (my $bindings = delete $PROFILE->{bindings}) {
2524 while (my ($mod, $syms) = each %$bindings) { 2749 while (my ($mod, $syms) = each %$bindings) {
2525 while (my ($sym, $cmds) = each %$syms) { 2750 while (my ($sym, $cmds) = each %$syms) {
2526 push @{ $PROFILE->{macro} }, { 2751 push @{ $PROFILE->{macro} }, {
2527 accelkey => [$mod*1, $sym*1], 2752 accelkey => [$mod*1, $sym*1],
2528 action => $cmds, 2753 action => $cmds,
2754 };
2529 }; 2755 }
2530 } 2756 }
2531 } 2757 }
2532 }
2533 2758
2534 sdl_init; 2759 sdl_init;
2535 2760
2536 @SDL_MODES = DC::SDL_ListModes 8, 8; 2761 {
2537 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2538 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2539
2540 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2541
2542 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2543
2544 {
2545 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2762 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2546 DejaVuSans.ttf 2763 DejaVuSans.ttf
2547 DejaVuSansMono.ttf 2764 DejaVuSansMono.ttf
2548 DejaVuSans-Bold.ttf 2765 DejaVuSans-Bold.ttf
2549 DejaVuSansMono-Bold.ttf 2766 DejaVuSansMono-Bold.ttf
2550 DejaVuSans-Oblique.ttf 2767 DejaVuSans-Oblique.ttf
2551 DejaVuSansMono-Oblique.ttf 2768 DejaVuSansMono-Oblique.ttf
2552 DejaVuSans-BoldOblique.ttf 2769 DejaVuSans-BoldOblique.ttf
2553 DejaVuSansMono-BoldOblique.ttf 2770 DejaVuSansMono-BoldOblique.ttf
2554 ); 2771 );
2555 2772
2556 DC::add_font $_ for @fonts; 2773 DC::add_font $_ for @fonts;
2557 2774
2558 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2775 $FONT_PROP = new_from_file DC::Font $fonts[0];
2559 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2776 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2560 2777
2561 $FONT_PROP->make_default; 2778 $FONT_PROP->make_default;
2562 2779
2563 DC::pango_init; 2780 DC::pango_init;
2564 } 2781 }
2565 2782
2566# compare mono (ft) vs. rgba (cairo) 2783# compare mono (ft) vs. rgba (cairo)
2567# ft - 1.8s, cairo 3s, even in alpha-only mode 2784# ft - 1.8s, cairo 3s, even in alpha-only mode
2568# for my $rgba (0..1) { 2785# for my $rgba (0..1) {
2569# my $t1 = Time::HiRes::time; 2786# my $t1 = Time::HiRes::time;
… …
2574# } 2791# }
2575# my $t2 = Time::HiRes::time; 2792# my $t2 = Time::HiRes::time;
2576# warn $t2-$t1; 2793# warn $t2-$t1;
2577# } 2794# }
2578 2795
2579 video_init; 2796 video_init;
2580 audio_init; 2797 audio_init;
2581} 2798 }
2582 2799
2583show_tip_of_the_day if $CFG->{show_tips}; 2800 show_tip_of_the_day if $CFG->{show_tips};
2584 2801
2585our $STARTUP_CANCEL = EV::idle sub { 2802 our $STARTUP_CANCEL = EV::idle sub {
2586 undef $::STARTUP_CANCEL; 2803 undef $::STARTUP_CANCEL;
2587 $startup_done->(); 2804 $startup_done->();
2588}; 2805 };
2589 2806
2590delete $SIG{__DIE__}; 2807 delete $SIG{__DIE__};
2591EV::loop; 2808 EV::loop;
2592 2809
2810 DC::write_cfg if $CFG->{config_autosave};
2811
2593#video_shutdown; 2812 #video_shutdown;
2594#audio_shutdown; 2813 #audio_shutdown;
2814
2595DC::OpenGL::quit; 2815 DC::OpenGL::quit;
2596DC::SDL_Quit; 2816 DC::SDL_Quit;
2597DC::DB::Server::stop; 2817 DC::DB::Server::stop;
2818}
2819
2820DC::SDL_braino; # see sub above
2598 2821
2599=head1 NAME 2822=head1 NAME
2600 2823
2601deliantra - A Deliantra MORPG game client 2824deliantra - A Deliantra MORPG game client
2602 2825
… …
2619 4 show fps 2842 4 show fps
2620 8 suppress tooltips 2843 8 suppress tooltips
2621 2844
2622=head1 AUTHOR 2845=head1 AUTHOR
2623 2846
2624Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2847Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2625 2848
2626 2849
2627 2850

Diff Legend

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