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.59 by root, Tue Aug 19 17:38:30 2008 UTC vs.
Revision 1.98 by root, Mon Dec 21 03:30: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: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
… …
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
102use AnyEvent::DNS; 93use AnyEvent::Util ();
103use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
104 96
105use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
106 99
107use DC; 100use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
109use DC::OpenGL (); 114use DC::OpenGL ();
110use DC::Protocol; 115use DC::Protocol;
111use DC::DB; 116use DC::DB;
112use DC::UI; 117use DC::UI;
113use DC::UI::Canvas; 118use DC::UI::Canvas;
114use DC::UI::Inventory; 119use DC::UI::Inventory;
115use DC::UI::SpellList; 120use DC::UI::SpellList;
116use DC::UI::Dockable; 121use DC::UI::Dockable;
117use DC::UI::Dockbar; 122use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 123use DC::UI::ChatView;
120use DC::MessageDistributor; 124use DC::MessageDistributor;
121use DC::Pod; 125use DC::Pod;
122use DC::MapWidget; 126use DC::MapWidget;
123use DC::Macro; 127use DC::Macro;
124 128
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
127 131
128$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
130}; 135};
131 136
132my $MAX_FPS = 60; 137my $MAX_FPS = 60;
133 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
134our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
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;
… …
194our $FLOORBOX; 205our $FLOORBOX;
195our $GAUGES; 206our $GAUGES;
196our $STATWIDS; 207our $STATWIDS;
197 208
198our $SDL_ACTIVE; 209our $SDL_ACTIVE;
199our %SDL_CB; 210our @SDL_CB;
200 211
201our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
202our $STATUSBOX; 213our $STATUSBOX;
203our $MODBOX; 214our $MODBOX;
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};
… …
496 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
497 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
498 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
499 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
500 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
501 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
502 undef $SDL_MIXER; 558 undef $SDL_MIXER;
503} 559}
504 560
505############################################################################# 561#############################################################################
… …
736} 792}
737 793
738sub dc_connect { 794sub dc_connect {
739 my ($host, $port) = @_; 795 my ($host, $port) = @_;
740 796
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 797 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
798 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 799
743 $CONN = 800 $CONN =
744 new DC::Protocol 801 new DC::Protocol
745 host => $host, 802 host => $host,
746 port => $port, 803 port => $port,
747 user => $PROFILE->{user}, 804 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 805 pass => $PROFILE->{password},
749 mapw => $mapsize, 806 mapw => $mapw,
750 maph => $mapsize, 807 maph => $maph,
751 808
752 client => "$DC::VERSION $] $^O", 809 client => "$DC::VERSION $] $^O",
753 810
754 map_widget => $MAPWIDGET, 811 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 812 statusbox => $STATUSBOX,
… …
763 820
764 on_connect => sub { 821 on_connect => sub {
765 if ($_[0]) { 822 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
767 824
768 status "login successful"; 825 status "successfully connected to the server";
769 } else { 826 } else {
770 undef $CONN; 827 undef $CONN;
771 status "unable to connect: $!"; 828 status "unable to connect: $!";
772 stop_game(); 829 stop_game();
773 } 830 }
… …
775 ; 832 ;
776} 833}
777 834
778sub start_game { 835sub start_game {
779 status "logging in..."; 836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
780 841
781 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 844
786 $MAP = new DC::Map; 845 $MAP = new DC::Map;
787 846
788 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl 851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
793 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
795 } 858 }
796 859
797 dc_connect $host, $port; 860 dc_connect $host, $port;
798 }; 861 };
799 } else { 862 } else {
800 dc_connect $host, $port; 863 dc_connect $host, $port;
801 } 864 }
802} 865}
803 866
804sub stop_game { 867sub stop_game {
868 crash "stop_game";
869
805 $LOGIN_BUTTON->set_text ("Login / Register"); 870 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 871 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 872 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 873 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 874 $SPELL_LIST->clear_spells;
… …
823} 888}
824 889
825sub graphics_setup { 890sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 891 my $vbox = new DC::UI::VBox;
827 892
893 {
894 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
895
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 896 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 897
830 my $row = 0; 898 my $row = 0;
831 899
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 900 $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, 901 $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, 902 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 903 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 904
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 905 $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, 906 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 907 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 908 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 " 909 . "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 " 910 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 911 . "by installing the right driver for your graphics card.");
844 912
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
914 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
915 value => $CFG->{uitheme},
916 options => [
917 [wood => "Wood (the default)"],
918 [plain => "Plain (very)"],
919 [blue => "Blue (dark)"],
920 [metal => "Metal (light)"],
921 ],
922 tooltip => "Choose the User Interface theme that you like most :)",
923 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
924 );
925
845 my $vidmode_tooltip = 926 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 927 "<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>."; 928 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 929
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 930 $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); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 932
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 933 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
934 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 935 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 936 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 940 can_events => 1, tooltip => $vidmode_tooltip);
859 941
860 $MODE_SLIDER->connect (changed => sub { 942 $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) = @_; 943 my ($self, $value) = @_;
944
945 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
946 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
947 });
948 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
949
950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
951 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
952 state => $CFG->{fullscreen},
953 tooltip => "Bring the client into fullscreen mode.",
954 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
955 );
956
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
958 $table->add_at (1, $row++, new DC::UI::CheckBox
959 state => $CFG->{force_opengl11},
960 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
961 . "higher memory usage and slower performance. It will, however, help tremendously on "
962 . "cards that claim to support a feature but fall back to software rendering. "
963 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
964 . "but cards and drivers from other vendors (ATI) are often just as bad. "
965 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
967 );
968
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
970 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{disable_alpha},
972 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
973 . "by disabling a number of textures and transparency effects. Normally, these "
974 . "effects do not cost a lot of resources, but some graphics cards might fall "
975 . "back to extremely slow rendering if this is enabled. If disabling this option "
976 . "noticably improves the framerate of the client please report this! "
977 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
978 on_changed => sub {
979 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 980 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 981 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
982 0
900 0 983 }
901 } 984 );
902 );
903 985
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 988 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 989 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 " 990 . "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 " 991 . "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.", 992 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 993 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 994 );
913 995
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 997 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 998 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 999 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 1001 );
920 1002
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1005 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.", 1006 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 }, 1007 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1008 );
927 1009
928 $table->add_at (1, $row++, new DC::UI::Button 1010 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1011 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1012 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1013 on_activate => sub {
932 video_shutdown (); 1014 video_shutdown ();
933 video_init (); 1015 video_init ();
1016 0
934 0 1017 }
935 } 1018 );
936 ); 1019 }
937 1020
1021 {
1022 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1023
1024 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1025
1026 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1028 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1029 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1030 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, " 1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1034 );
946 1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1045
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1051 );
953 1052
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1054 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1055 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1056 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. " 1057 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1058 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1060 );
962 1061
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1062 $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 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 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 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1067 );
969 1068
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1070 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1071 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.", 1072 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 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1074 );
976 1075
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1077 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1078 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, " 1079 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.", 1080 . "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 }, 1081 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1082 );
984 1083
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1084 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1085 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1086 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.", 1087 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1088 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1089 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1090 &set_gauge_window_fontsize;
1091 0
992 0 1092 }
993 } 1093 );
994 );
995 1094
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1095 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1096 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1097 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1098 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1099 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1100 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1101 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1102 0
1003 0 1103 }
1004 } 1104 );
1005 ); 1105 }
1006 1106
1007 $vbox 1107 $vbox
1008} 1108}
1009 1109
1010our $AUDIO_HW_CHUNKSIZE; 1110our $AUDIO_HW_CHUNKSIZE;
… …
1173} 1273}
1174 1274
1175sub make_gauge_window { 1275sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1276 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1277
1178 my $win = new DC::UI::Frame ( 1278 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1279 force_x => 0,
1180 force_y => "max", 1280 force_y => "max",
1181 force_w => $WIDTH, 1281 force_w => $WIDTH,
1182 force_h => $gh, 1282 force_h => $gh,
1183 ); 1283 );
… …
1199 (new DC::UI::Empty expand => 1), 1299 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1300 (my $hb = new DC::UI::HBox),
1201 ], 1301 ],
1202 ); 1302 );
1203 1303
1204 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1304 $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"); 1305 $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"); 1306 $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"); 1307 $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 1308
1220 &set_gauge_window_fontsize; 1309 &set_gauge_window_fontsize;
1221 1310
1222 $win 1311 $win
1223} 1312}
… …
1565 ); 1654 );
1566 1655
1567 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1656 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1568 $table->add_at (1, 4, new DC::UI::Entry 1657 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1658 text => $CFG->{profile}{default}{user},
1570 tooltip => "The name of your character on the server.", 1659 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 } 1660 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1572 ); 1661 );
1573 1662
1574 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1663 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1575 $table->add_at (1, 5, new DC::UI::Entry 1664 $table->add_at (1, 5, new DC::UI::Entry
… …
1589 1 1678 1
1590 }, 1679 },
1591 ); 1680 );
1592 1681
1593 $vbox->add (new DC::UI::FancyFrame 1682 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1683 label => "How to Play",
1595 min_h => 200, 1684 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1685 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1686 markup =>
1687 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1688 . "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 " 1689 . "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.", 1690 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1691 ),
1601 ); 1692 );
1602 1693
1603 $vbox 1694 $vbox
… …
1675 1766
1676 my $row = 0; 1767 my $row = 0;
1677 1768
1678 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1769 $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 1770 $table->add_at (1, $row++, new DC::UI::CheckBox
1771 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1772 state => $CFG->{show_tips},
1681 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1773 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1682 on_changed => sub { 1774 on_changed => sub {
1683 my ($self, $value) = @_; 1775 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1776 $CFG->{show_tips} = $value;
… …
1686 } 1778 }
1687 ); 1779 );
1688 1780
1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1781 $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 1782 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1783 c_colspan => 2,
1691 text => $CFG->{logview_max_par}, 1784 text => $CFG->{logview_max_par},
1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1785 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 " 1786 . "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.", 1787 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1695 on_changed => sub { 1788 on_changed => sub {
… …
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1790 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1791 0
1699 }, 1792 },
1700 ); 1793 );
1701 1794
1795 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1796 $table->add_at (1, $row, new DC::UI::CheckBox
1797 state => $CFG->{config_autosave},
1798 tooltip => "Normally, configuration settings and the user interface layout "
1799 . "are saved on client exit. You can disable this behaviour by "
1800 . "unchecking this checkbox.",
1801 on_changed => sub {
1802 my ($self, $value) = @_;
1803 $CFG->{config_autosave} = $value;
1804 0
1805 }
1806 );
1807 $table->add_at (2, $row++, new DC::UI::Button
1808 text => "Save Now",
1809 tooltip => "Use this to manually save configuration and UI layout when "
1810 . "autosave is disabled.",
1811 on_activate => sub {
1812 DC::write_cfg;
1813 0
1814 }
1815 );
1816
1702 $table 1817 $table
1703} 1818}
1704 1819
1705sub autopickup_setup { 1820sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1821 my $r = new DC::UI::ScrolledWindow (
… …
1712 col_expand => [0, 1, 0, 1], 1827 col_expand => [0, 1, 0, 1],
1713 ); 1828 );
1714 1829
1715 for ( 1830 for (
1716 ["General", 0, 0, 1831 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1832# ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1833 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1834 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1835 ],
1722 ["Weapons", 0, 6, 1836 ["Weapons", 0, 6,
1723 ["All weapons" => PICKUP_ALLWEAPON], 1837 ["All weapons" => PICKUP_ALLWEAPON],
… …
1771 $::CFG->{pickup} |= $mask; 1885 $::CFG->{pickup} |= $mask;
1772 } else { 1886 } else {
1773 $::CFG->{pickup} &= ~$mask; 1887 $::CFG->{pickup} &= ~$mask;
1774 } 1888 }
1775 1889
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1890 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1891 if defined $::CONN;
1778 1892
1779 0 1893 0
1780 }); 1894 });
1781 1895
… …
1798 }); 1912 });
1799 1913
1800 $table->add_at (3, 18, new DC::UI::Button 1914 $table->add_at (3, 18, new DC::UI::Button
1801 text => "set", 1915 text => "set",
1802 on_activate => sub { 1916 on_activate => sub {
1803 $::CONN->send_command ("pickup $::CFG->{pickup}") 1917 $::CONN->send_pickup ($::CFG->{pickup})
1804 if defined $::CONN; 1918 if defined $::CONN;
1805 0 1919 0
1806 }); 1920 });
1807 1921
1808 $r 1922 $r
… …
1921 $PL_NOTEBOOK->set_current_page ($widget); 2035 $PL_NOTEBOOK->set_current_page ($widget);
1922 $PL_WINDOW->show; 2036 $PL_WINDOW->show;
1923 } 2037 }
1924} 2038}
1925 2039
1926sub player_window { 2040sub make_playerbook {
1927 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2041 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1928 x => "center", 2042 x => "center",
1929 y => "center", 2043 y => "center",
1930 force_w => $WIDTH * 9/10, 2044 force_w => $WIDTH * 9/10,
1931 force_h => $HEIGHT * 9/10, 2045 force_h => $HEIGHT * 9/10,
… …
1965 "License, Author and Source info for media sent by the server."); 2079 "License, Author and Source info for media sent by the server.");
1966 2080
1967 $ntb->set_current_page ($INVENTORY_PAGE); 2081 $ntb->set_current_page ($INVENTORY_PAGE);
1968 2082
1969 $plwin->add ($ntb); 2083 $plwin->add ($ntb);
1970 $plwin
1971} 2084}
1972 2085
1973sub keyboard_setup { 2086sub keyboard_setup {
1974 DC::Macro::keyboard_setup 2087 DC::Macro::keyboard_setup
1975} 2088}
1976 2089
1977sub help_window { 2090sub make_help_window {
1978 my $win = new DC::UI::Toplevel 2091 my $win = new DC::UI::Toplevel
1979 x => 'center', 2092 x => 'center',
1980 y => 'center', 2093 y => 'center',
1981 z => 4, 2094 z => 4,
1982 name => 'doc_browser', 2095 name => 'doc_browser',
… …
2071 2184
2072 $load_node->((DC::Pod::find @path)[0]); 2185 $load_node->((DC::Pod::find @path)[0]);
2073 $win->show; 2186 $win->show;
2074 }; 2187 };
2075 2188
2076 $win 2189 $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} 2190}
2099 2191
2100sub open_quit_dialog { 2192sub open_quit_dialog {
2101 unless ($QUIT_DIALOG) { 2193 unless ($QUIT_DIALOG) {
2102 $QUIT_DIALOG = new DC::UI::Toplevel 2194 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2216 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2217 );
2126 $hb->add (new DC::UI::Button 2218 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2219 text => "Quit anyway",
2128 expand => 1, 2220 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2221 on_activate => sub {
2222 crash "Quit anyway";
2223 EV::unloop EV::UNLOOP_ALL;
2224 },
2130 ); 2225 );
2131 } 2226 }
2132 2227
2133 $QUIT_DIALOG->show; 2228 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2229 $QUIT_DIALOG->grab_focus;
2230}
2231
2232sub make_menubar {
2233 $MENUFRAME = new DC::UI::Toplevel
2234 border => 0,
2235 force_x => 0,
2236 force_y => 0,
2237 force_w => $::WIDTH,
2238 child => ($MENUBAR = new DC::UI::HBox),
2239 ;
2240
2241 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2242
2243 # 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
2244 make_gauge_window->show;
2245
2246# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2247# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2248
2249 make_playerbook;
2250
2251 $MENUPOPUP = DC::UI::Menu->new (items => [
2252 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2253 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2254 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2255 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2256 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2257 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2258 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2259 ["Quit…" , sub {
2260 if ($CONN) {
2261 open_quit_dialog;
2262 } else {
2263 EV::unloop EV::UNLOOP_ALL;
2264 }
2265 }],
2266 ]);
2267
2268 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2269 tooltip => "Shows the main menu",
2270 on_button_down => sub {
2271 my ($self, $ev) = @_;
2272 local $ev->{x} = 0;
2273 local $ev->{y} = 0;
2274 $MENUPOPUP->popup ($ev);
2275 },
2276 );
2277
2278 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2279 padding_x => 6,
2280 padding_y => 3,
2281 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2282 template => " Exp: 888,888,888,888 (lvl 188) ",
2283 );
2284
2285 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2286 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2287 . "will automatically pick up items as defined by your item pickup settings "
2288 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2289 . "disable autopickup by disabling this checkbox.",
2290 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2291 on_changed => sub {
2292 my ($self, $value) = @_;
2293 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2294 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2295 $CONN->send_pickup ($CFG->{pickup})
2296 if $CONN;
2297 },
2298 );
2299
2300 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2301 c_rescale => 1,
2302 padding_x => 6,
2303 padding_y => 3,
2304 force_w => $::WIDTH * 0.2,
2305 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2306 template => "two handed weapons 99%",
2307 );
2308
2309 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2310 expand => 1,
2311 align => 1, can_hover => 1, can_events => 1,
2312 text => "Range and Combat Slots",
2313 tooltip => "#stat_ranged",
2314 );
2315
2316 $MENUFRAME->show;
2317}
2318
2319sub open_string_query {
2320 my ($title, $cb, $txt, $tooltip) = @_;
2321 my $dialog = new DC::UI::Toplevel
2322 x => "center",
2323 y => "center",
2324 z => 50,
2325 force_w => $WIDTH * 4/5,
2326 title => $title;
2327
2328 $dialog->add (
2329 my $e = new DC::UI::Entry
2330 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2331 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2332 tooltip => $tooltip
2333 );
2334
2335 $e->grab_focus;
2336 $e->set_text ($txt) if $txt;
2337 $dialog->show;
2135} 2338}
2136 2339
2137sub show_tip_of_the_day { 2340sub show_tip_of_the_day {
2138 # find all tips 2341 # find all tips
2139 my @tod = DC::Pod::find tip_of_the_day => "*"; 2342 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2395 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2396 and die "SDL::Init failed!\n";
2194} 2397}
2195 2398
2196sub video_init { 2399sub video_init {
2400 DC::set_theme $CFG->{uitheme};
2401
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2402 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2403 $SDL_REINIT = 0;
2199 2404
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2405 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2406 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2407 @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)"; 2408 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2409
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2410 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2411
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2412 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2413 $CFG->{sdl_mode} = 0; # lowest resolution by default
2414
2415 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2416 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2417 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2418 $CFG->{sdl_mode} = $_;
2419 }
2211 } 2420 }
2212 } 2421 }
2213 2422
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2423 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2424
… …
2274 2483
2275 (new DC::UI::Frame 2484 (new DC::UI::Frame
2276 bg => [0, 0, 0, 0.4], 2485 bg => [0, 0, 0, 0.4],
2277 force_x => 0, 2486 force_x => 0,
2278 force_y => "max", 2487 force_y => "max",
2279 child => (my $LR = new DC::UI::VBox), 2488 child => (my $LL = new DC::UI::VBox),
2280 )->show; 2489 )->show;
2281 2490
2282 $LR->add ($STATUSBOX); 2491 $LL->add ($STATUSBOX);
2283 $LR->add ($MODBOX); 2492 $LL->add ($MODBOX);
2284 $LR->add (new DC::UI::Label 2493 $LL->add (new DC::UI::Label
2285 align => 0, 2494 align => 0,
2286 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2495 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2287 fontsize => 0.5, 2496 fontsize => 0.5,
2288 fg => [1, 1, 0, 0.7], 2497 fg => [1, 1, 0, 0.7],
2289 ); 2498 );
2290 2499
2291 DC::UI::Toplevel->new ( 2500 DC::UI::Toplevel->new (
2292 title => "Minimap", 2501 title => "Minimap",
2293 name => "mapmap", 2502 name => "mapmap",
2294 x => 0, 2503 x => 0,
2295 y => $FONTSIZE + 8, 2504 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2296 border_bg => [1, 1, 1, 192/255], 2505 border_bg => [1, 1, 1, 192/255],
2297 bg => [1, 1, 1, 0], 2506 bg => [1, 1, 1, 0],
2298 child => ($MAPMAP = new DC::MapWidget::MapMap 2507 child => ($MAPMAP = new DC::MapWidget::MapMap
2299 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2508 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2300 ), 2509 ),
2301 )->show; 2510 )->show;
2302 2511
2303 $MAPWIDGET = new DC::MapWidget; 2512 $MAPWIDGET = new DC::MapWidget;
2304 $MAPWIDGET->connect (activate_console => sub { 2513 $MAPWIDGET->connect (activate_console => sub {
… …
2329 $METASERVER = metaserver_dialog; 2538 $METASERVER = metaserver_dialog;
2330 # the name is changed to not conflict with the older name as users could have hidden it 2539 # the name is changed to not conflict with the older name as users could have hidden it
2331 $MESSAGE_WINDOW = new DC::UI::Dockbar 2540 $MESSAGE_WINDOW = new DC::UI::Dockbar
2332 name => "message_window2", 2541 name => "message_window2",
2333 title => 'Messages', 2542 title => 'Messages',
2543 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2334 force_w => $::WIDTH * 0.6, 2544 force_w => $::WIDTH * 0.6,
2335 force_h => $::HEIGHT * 0.25, 2545 force_h => $::HEIGHT * 0.25,
2336 ; 2546 ;
2337 2547
2338 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2548 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2358 . "After pressing the combo the binding will be saved automatically and the " 2568 . "After pressing the combo the binding will be saved automatically and the "
2359 . "binding editor closes"); 2569 . "binding editor closes");
2360 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2570 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2361 "Some debuggin' options. Do not ask."); 2571 "Some debuggin' options. Do not ask.");
2362 2572
2363 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2573 make_help_window;
2574 make_menubar;
2364 2575
2365 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2366 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2367
2368# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2369# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2370
2371 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
2372
2373 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2374 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2375
2376 $BUTTONBAR->add (new DC::UI::Button
2377 text => "Save Config",
2378 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2379 on_activate => sub {
2380 $::CFG->{layout} = DC::UI::get_layout;
2381 DC::write_cfg;
2382 status "Configuration Saved";
2383 0
2384 },
2385 );
2386
2387 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2388 tooltip => "View Documentation");
2389
2390 $BUTTONBAR->add (new DC::UI::Button
2391 text => "Quit",
2392 tooltip => "Terminates the program",
2393 on_activate => sub {
2394 if ($CONN) {
2395 open_quit_dialog;
2396 } else {
2397 EV::unloop EV::UNLOOP_ALL;
2398 }
2399 0
2400 },
2401 );
2402
2403 $BUTTONBAR->show;
2404 $SETUP_DIALOG->show; 2576 $SETUP_DIALOG->show;
2405 $MESSAGE_WINDOW->show; 2577 $MESSAGE_WINDOW->show;
2406 } 2578 }
2407 2579
2408 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2580 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2409 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2581 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2410 2582
2411 $CAVEAT_LABEL->set_text ("None :)"); 2583 $CAVEAT_LABEL->set_text ("None :)");
2584 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2585 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2412 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2586 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2413 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2587 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2414 2588
2415 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2589 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2416} 2590}
… …
2444my $want_refresh = EV::prepare_ns \&force_refresh; 2618my $want_refresh = EV::prepare_ns \&force_refresh;
2445 2619
2446my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2620my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2447 $NOW = EV::now; 2621 $NOW = EV::now;
2448 2622
2449 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2623 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2450 for DC::poll_events; 2624 for DC::poll_events;
2451 2625
2452 if (%animate_object) { 2626 if (%animate_object) {
2453 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2627 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2454 $WANT_REFRESH = 1; 2628 $WANT_REFRESH = 1;
… …
2466sub animation_stop { 2640sub animation_stop {
2467 my ($widget) = @_; 2641 my ($widget) = @_;
2468 delete $animate_object{$widget}; 2642 delete $animate_object{$widget};
2469} 2643}
2470 2644
2471%SDL_CB = (
2472 DC::SDL_QUIT => sub { 2645$SDL_CB[DC::SDL_QUIT] = sub {
2646 crash "SDL_QUIT";
2473 EV::unloop EV::UNLOOP_ALL; 2647 EV::unloop EV::UNLOOP_ALL;
2474 }, 2648};
2475 DC::SDL_VIDEORESIZE => sub { 2649$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2476 },
2477 DC::SDL_VIDEOEXPOSE => sub { 2650$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2478 DC::UI::full_refresh; 2651 DC::UI::full_refresh;
2479 }, 2652};
2480 DC::SDL_ACTIVEEVENT => sub { 2653$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2481# not useful, as APPACTIVE includes only iconified state, not unmapped 2654# not useful, as APPACTIVE includes only iconified state, not unmapped
2482# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2655# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2483# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2656# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2484# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2657# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2485# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2658# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2486# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2659# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2487 }, 2660};
2488 DC::SDL_KEYDOWN => sub { 2661$SDL_CB[DC::SDL_KEYDOWN] = sub {
2489 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2662 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2490 # alt-enter 2663 # alt-enter
2491 video_shutdown; 2664 video_shutdown;
2492 $FULLSCREEN_ENABLE->toggle; 2665 $FULLSCREEN_ENABLE->toggle;
2493 video_init; 2666 video_init;
2494 } else { 2667 } else {
2495 &DC::UI::feed_sdl_key_down_event; 2668 &DC::UI::feed_sdl_key_down_event;
2496 } 2669 }
2497 update_modbox; 2670 update_modbox;
2498 }, 2671};
2499 DC::SDL_KEYUP => sub { 2672$SDL_CB[DC::SDL_KEYUP] = sub {
2500 &DC::UI::feed_sdl_key_up_event; 2673 &DC::UI::feed_sdl_key_up_event;
2501 update_modbox; 2674 update_modbox;
2502 }, 2675};
2503 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2676$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2504 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2677$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2505 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2678$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2506 DC::SDL_USEREVENT => sub { 2679$SDL_CB[DC::SDL_USEREVENT] = sub {
2507 if ($_[0]{code} == 1) { 2680 if ($_[0]{code} == 1) {
2508 audio_channel_finished $_[0]{data1}; 2681 audio_channel_finished $_[0]{data1};
2509 } elsif ($_[0]{code} == 0) { 2682 } elsif ($_[0]{code} == 0) {
2510 audio_music_finished; 2683 audio_music_finished;
2511 }
2512 }, 2684 }
2513); 2685};
2514 2686
2515############################################################################# 2687#############################################################################
2516 2688
2517$SIG{INT} = $SIG{TERM} = sub { 2689$SIG{INT} = $SIG{TERM} = sub {
2518 EV::unloop; 2690 EV::unloop;
2519 #d# TODO calling exit here hangs the process in some futex 2691 #d# TODO calling exit here hangs the process in some futex
2520}; 2692};
2521 2693
2522# due to mac os x + sdl combined briandamage, we need this contortion 2694# due to mac os x + sdl combined braindamage, we need this contortion
2523sub main { 2695sub main {
2524 { 2696 {
2525 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2697 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2526 2698
2527 if (-e "$Deliantra::VARDIR/client.cf") { 2699 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2544 DC::DB::open_db; 2716 DC::DB::open_db;
2545 2717
2546 DC::UI::set_layout ($::CFG->{layout}); 2718 DC::UI::set_layout ($::CFG->{layout});
2547 2719
2548 my %DEF_CFG = ( 2720 my %DEF_CFG = (
2721 config_autosave => 1,
2549 sdl_mode => 0, 2722 sdl_mode => undef,
2550 fullscreen => 1, 2723 fullscreen => 1,
2551 fast => 0, 2724 fast => 0,
2552 force_opengl11 => undef, 2725 force_opengl11 => undef,
2553 disable_alpha => 0, 2726 disable_alpha => 0,
2554 smooth_movement => 1, 2727 smooth_movement => 1,
2728 smooth_transitions => 1,
2555 texture_compression => 1, 2729 texture_compression => 1,
2556 map_scale => 1, 2730 map_scale => 1,
2557 fow_enable => 1, 2731 fow_enable => 1,
2558 fow_intensity => 0, 2732 fow_intensity => 0,
2559 map_smoothing => 1, 2733 map_smoothing => 1,
… …
2571 effects_enable => 1, 2745 effects_enable => 1,
2572 effects_volume => 1, 2746 effects_volume => 1,
2573 bgm_enable => 1, 2747 bgm_enable => 1,
2574 bgm_volume => 0.5, 2748 bgm_volume => 0.5,
2575 output_rate => "", 2749 output_rate => "",
2576 pickup => 0, 2750 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2577 inv_sort => "mtime", 2751 inv_sort => "mtime",
2578 default => "profile", # default profile 2752 default => "profile", # default profile
2579 show_tips => 1, 2753 show_tips => 1,
2580 logview_max_par => 1000, 2754 logview_max_par => 1000,
2581 shift_fire_stop => 0, 2755 shift_fire_stop => 0,
2756 uitheme => "wood",
2757 map_shift_x => -24, # arbitrary
2758 map_shift_y => +24, # arbitrary
2582 ); 2759 );
2583 2760
2584 while (my ($k, $v) = each %DEF_CFG) { 2761 while (my ($k, $v) = each %DEF_CFG) {
2585 $CFG->{$k} = $v unless exists $CFG->{$k}; 2762 $CFG->{$k} = $v unless exists $CFG->{$k};
2586 } 2763 }
… …
2600 } 2777 }
2601 } 2778 }
2602 2779
2603 sdl_init; 2780 sdl_init;
2604 2781
2782 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2783 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2784
2605 { 2785 {
2606 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2786 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2607 DejaVuSans.ttf 2787 DejaVuSans.ttf
2608 DejaVuSansMono.ttf 2788 DejaVuSansMono.ttf
2609 DejaVuSans-Bold.ttf 2789 DejaVuSans-Bold.ttf
2610 DejaVuSansMono-Bold.ttf 2790 DejaVuSansMono-Bold.ttf
2611 DejaVuSans-Oblique.ttf 2791 DejaVuSans-Oblique.ttf
2612 DejaVuSansMono-Oblique.ttf 2792 DejaVuSansMono-Oblique.ttf
2613 DejaVuSans-BoldOblique.ttf 2793 DejaVuSans-BoldOblique.ttf
2614 DejaVuSansMono-BoldOblique.ttf 2794 DejaVuSansMono-BoldOblique.ttf
2795 mona.ttf
2615 ); 2796 );
2616 2797
2617 DC::add_font $_ for @fonts; 2798 DC::add_font $_ for @fonts;
2618 2799
2619 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2800 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2649 }; 2830 };
2650 2831
2651 delete $SIG{__DIE__}; 2832 delete $SIG{__DIE__};
2652 EV::loop; 2833 EV::loop;
2653 2834
2835 DC::write_cfg if $CFG->{config_autosave};
2836
2654#video_shutdown; 2837 #video_shutdown;
2655#audio_shutdown; 2838 #audio_shutdown;
2839
2656 DC::OpenGL::quit; 2840 DC::OpenGL::quit;
2657 DC::SDL_Quit; 2841 DC::SDL_Quit;
2658 DC::DB::Server::stop; 2842 DC::DB::Server::stop;
2659} 2843}
2660 2844

Diff Legend

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