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.46 by root, Tue Jun 24 21:44:50 2008 UTC vs.
Revision 1.115 by root, Sat Apr 24 09:53:09 2010 UTC

21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 require AnyEvent::DNS;
29 AnyEvent::DNS::resolver ();
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # 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"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
90 79
91# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 82 if %PAR::LibCache;
94 83
95use Time::HiRes 'time';
96use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
97use List::Util qw(max min); 87use List::Util qw(max min);
98 88
99use Deliantra; 89use Deliantra;
100use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
101 91
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
102use AnyEvent::DNS; 94use AnyEvent::DNS ();
103 95
104use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
105 98
106use DC; 99use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
108use DC::OpenGL (); 113use DC::OpenGL ();
109use DC::Protocol; 114use DC::Protocol;
110use DC::DB; 115use DC::DB;
111use DC::UI; 116use DC::UI;
112use DC::UI::Canvas; 117use DC::UI::Canvas;
113use DC::UI::Inventory; 118use DC::UI::Inventory;
114use DC::UI::SpellList; 119use DC::UI::SpellList;
115use DC::UI::Dockable; 120use DC::UI::Dockable;
116use DC::UI::Dockbar; 121use DC::UI::Dockbar;
117use DC::UI::MessageWindow;
118use DC::UI::ChatView; 122use DC::UI::ChatView;
119use DC::MessageDistributor; 123use DC::MessageDistributor;
120use DC::Pod; 124use DC::Pod;
121use DC::MapWidget; 125use DC::MapWidget;
122use DC::Macro; 126use DC::Macro;
123 127
124$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
125$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
126 130
127$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
128 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
129}; 134};
130 135
131my $MAX_FPS = 60; 136my $MAX_FPS = 60;
132 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
133our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
134 141
135our $LAST_REFRESH; 142our $LAST_REFRESH;
136our $NOW; 143our $NOW;
137 144
138our $CFG; 145our $CFG;
139our $CONN;
140our $PROFILE; # current profile 146our $PROFILE; # current profile
141our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
142 149
143our $WANT_REFRESH; 150our $WANT_REFRESH;
144 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
145our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
146our $WIDTH; 157our $WIDTH;
147our $HEIGHT; 158our $HEIGHT;
148our $FULLSCREEN; 159our $FULLSCREEN;
149our $FONTSIZE; 160our $FONTSIZE;
150 161
151our $FONT_PROP; 162our $FONT_PROP;
152our $FONT_FIXED; 163our $FONT_FIXED;
153 164
165our $CONN;
166
154our $MAP; 167our $MAP;
155our $MAPMAP; 168our $MAPMAP;
156our $MAPWIDGET; 169our $MAPWIDGET;
157our $COMPLETER; 170our $COMPLETER;
158our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
159our $METASERVER; 175our $METASERVER;
160our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
161our $QUIT_DIALOG; 177our $QUIT_DIALOG;
162our $HOST_ENTRY; 178our $HOST_ENTRY;
163our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
189our $FLOORBOX; 205our $FLOORBOX;
190our $GAUGES; 206our $GAUGES;
191our $STATWIDS; 207our $STATWIDS;
192 208
193our $SDL_ACTIVE; 209our $SDL_ACTIVE;
194our %SDL_CB; 210our @SDL_CB;
195 211
196our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
197our $STATUSBOX; 213our $STATUSBOX;
198our $MODBOX; 214our $MODBOX;
199our $DEBUG_STATUS; 215our $DEBUG_STATUS;
200 216
201our $INV; 217our $INV;
202our $INVR; 218our $INVR;
203our $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}
204 260
205############################################################################# 261#############################################################################
206 262
207sub status { 263sub status {
208 $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]);
290 or return; 346 or return;
291 347
292 $meta->{data} 348 $meta->{data}
293 or return; 349 or return;
294 350
295 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
296 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
297 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
298 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
299 &audio_music_push ($face); 355 &audio_music_push ($face);
300 } 356 }
301 } else { 357 } else {
302 # fetch from database 358 # fetch from database
303 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
304 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
305 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
306 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;
307 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
308 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
309 365
310 audio_sound_push ($face); 366 audio_sound_push ($face);
311 }; 367 };
358 414
359 audio_music_update_volume; 415 audio_music_update_volume;
360 416
361 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
362 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
363 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
364 ? 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
365 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
366 425
367 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
368 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
369 428
370 my $NOW = time; 429 my $NOW = time;
371 430
372 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
373 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
459 audio_music_push; 518 audio_music_push;
460} 519}
461 520
462sub audio_init { 521sub audio_init {
463 if ($CFG->{audio_enable}) { 522 if ($CFG->{audio_enable}) {
523 if (length $CFG->{audio_driver}) {
524 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
525 DC::SDL_Init DC::SDL_INIT_AUDIO
526 and die "SDL::Init failed!\n";
527 } else {
528 DC::SDL_Init DC::SDL_INIT_AUDIO
529 and die "SDL::Init failed!\n";
530 }
531
464 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
465 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
466 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
467 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
468 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
482 sub audio_tab_update; 550 sub audio_tab_update;
483 audio_tab_update; 551 audio_tab_update;
484} 552}
485 553
486sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
487 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
488 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
489 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
490 563
491 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
493 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
494 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
495 568
496 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
497 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
498} 573}
499 574
500############################################################################# 575#############################################################################
501 576
502sub destroy_query_dialog { 577sub destroy_query_dialog {
731} 806}
732 807
733sub dc_connect { 808sub dc_connect {
734 my ($host, $port) = @_; 809 my ($host, $port) = @_;
735 810
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 811 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
812 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
737 813
738 $CONN = 814 $CONN =
739 new DC::Protocol 815 new DC::Protocol
740 host => $host, 816 host => $host,
741 port => $port || 13327, 817 port => $port,
742 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
743 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
744 mapw => $mapsize, 820 mapw => $mapw,
745 maph => $mapsize, 821 maph => $maph,
746 822
823 c_version => {
824 client => "deliantra",
747 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
748 829
749 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
750 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
751 map => $MAP, 832 map => $MAP,
752 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
758 839
759 on_connect => sub { 840 on_connect => sub {
760 if ($_[0]) { 841 if ($_[0]) {
761 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
762 843
763 status "login successful"; 844 status "successfully connected to the server";
764 } else { 845 } else {
765 undef $CONN; 846 undef $CONN;
766 status "unable to connect: $!"; 847 status "unable to connect: $!";
767 stop_game(); 848 stop_game();
768 } 849 }
770 ; 851 ;
771} 852}
772 853
773sub start_game { 854sub start_game {
774 status "logging in..."; 855 status "logging in...";
856
857 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
858 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
859 or return status "$server: unable to parse server address, try an empty field.";
775 860
776 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
778
779 my ($host, $port) = split /:/, $PROFILE->{host};
780 863
781 $MAP = new DC::Map; 864 $MAP = new DC::Map;
782 865
783 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
785 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
786 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
787 if ($_[0] ne "80.101.114.108") { # Perl 870 if ($_[0] ne "80.101.114.108") { # P-e-r-l
871 status "dns failure, trying differently";
872 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
873 unless (defined $host) {
788 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
789 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
790 } 877 }
791 878
792 dc_connect $host, $port; 879 dc_connect $host, $port;
793 }; 880 };
794 } else { 881 } else {
795 dc_connect $host, $port; 882 dc_connect $host, $port;
796 } 883 }
797} 884}
798 885
799sub stop_game { 886sub stop_game {
887 crash "stop_game";
888
800 $LOGIN_BUTTON->set_text ("Login / Register"); 889 $LOGIN_BUTTON->set_text ("Login / Register");
801 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 890 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
802 $SETUP_DIALOG->show; 891 $SETUP_DIALOG->show;
803 $PL_WINDOW->hide; 892 $PL_WINDOW->hide;
804 $SPELL_LIST->clear_spells; 893 $SPELL_LIST->clear_spells;
818} 907}
819 908
820sub graphics_setup { 909sub graphics_setup {
821 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
822 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
823 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 915 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
824 916
825 my $row = 0; 917 my $row = 0;
826 918
827 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 919 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
828 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 920 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
829 can_events => 1, 921 can_events => 1,
830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
831 923
924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
925 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
926 can_events => 1,
927 tooltip => "This field shows any known issues with your config or driver, such as "
928 . "a non-accelerated display format. You can try to work around these issues "
929 . "by selecting a different video mode, changing the settings below or "
930 . "by installing the right driver for your graphics card.");
931
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
933 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
934 value => $CFG->{uitheme},
935 options => [
936 [wood => "Wood (the default)"],
937 [plain => "Plain (very)"],
938 [blue => "Blue (dark)"],
939 [metal => "Metal (light)"],
940 ],
941 tooltip => "Choose the User Interface theme that you like most :)",
942 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
943 );
944
832 my $vidmode_tooltip = 945 my $vidmode_tooltip =
833 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 946 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
834 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 947 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
835 948
836 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838 951
839 $hbox->add (my $mode_slider = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
840 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 953 c_rescale => 1,
954 force_w => $WIDTH * 0.1, expand => 1,
955 range => [ ($CFG->{sdl_mode}) x 3 ],
841 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
842 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
843 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
844 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
845 960
846 $mode_slider->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
847 my ($self, $value) = @_; 962 my ($self, $value) = @_;
848 963
849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 964 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 965 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
851 }); 966 });
852 $mode_slider->emit (changed => $mode_slider->{range}[0]); 967 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853 968
854 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 970 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856 state => $CFG->{fullscreen}, 971 state => $CFG->{fullscreen},
857 tooltip => "Bring the client into fullscreen mode.", 972 tooltip => "Bring the client into fullscreen mode.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
859 ); 974 );
860 975
861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{force_opengl11}, 978 state => $CFG->{force_opengl11},
864 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 979 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
865 . "higher memory usage and slower performance. It will, however, help tremendously on " 980 . "higher memory usage and slower performance. It will, however, help tremendously on "
866 . "cards that claim to support a feature but fall back to software rendering. " 981 . "cards that claim to support a feature but fall back to software rendering. "
867 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 982 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
868 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 983 . "but cards and drivers from other vendors (ATI) are often just as bad. "
869 . "experience extremely low framerates and your card should do better, try this option.</b>", 984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
871 ); 986 );
872 987
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
989 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{disable_alpha},
991 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
992 . "by disabling a number of textures and transparency effects. Normally, these "
993 . "effects do not cost a lot of resources, but some graphics cards might fall "
994 . "back to extremely slow rendering if this is enabled. If disabling this option "
995 . "noticably improves the framerate of the client please report this! "
996 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
997 on_changed => sub {
998 my ($self, $value) = @_;
999 $CFG->{disable_alpha} = $value;
1000 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1001 0
1002 }
1003 );
1004
873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
874 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
875 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
876 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 1008 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
877 . "will save a lot of memory and increase performance. The compression algorithm " 1009 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
878 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 1010 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
879 . "forced OpenGL 1.1 mode.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
880 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
881 ); 1013 );
882 1014
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
884 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
885 state => $CFG->{fast}, 1017 state => $CFG->{fast},
886 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
888 ); 1020 );
889 1021
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
891 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
892 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
893 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1025 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
894 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
895 ); 1027 );
896 1028
897 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
898 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
899 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
900 on_activate => sub { 1032 on_activate => sub {
901 video_shutdown (); 1033 video_shutdown ();
902 video_init (); 1034 video_init ();
1035 0
903 0 1036 }
904 } 1037 );
1038 }
1039
1040 {
1041 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1042
1043 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1044
1045 my $row = 0;
1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1047 $table->add_at (1, $row++, new DC::UI::CheckBox
1048 state => $CFG->{smooth_movement},
1049 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1050 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1051 . "then disable this option. Changes take effect immdiately.",
1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
905 ); 1053 );
906 1054
1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1056 $table->add_at (1, $row++, new DC::UI::CheckBox
1057 state => $CFG->{smooth_transitions},
1058 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1059 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1060 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1061 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1062 );
1063
1064
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
908 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
910 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
912 ); 1070 );
913 1071
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
917 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1075 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
918 . "This increases load on the graphics subsystem and works only with TRT servers. " 1076 . "This increases load on the graphics subsystem and works only with TRT servers. "
919 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
920 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
921 ); 1079 );
922 1080
923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
924 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
925 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
926 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1084 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
927 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
928 ); 1086 );
929 1087
1088 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1089 $table->add_at (1, $row++, new DC::UI::ImageButton
1090 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1091 bg => [0.3, 0.3, 0.2],
1092 force_w => 64,
1093 force_h => 64,
1094 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1095 on_activate => sub {
1096 my ($self) = @_;
1097 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1098 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1099 $MAPWIDGET->update;
1100 }
1101 );
1102
930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
931 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
932 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
933 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1106 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
935 ); 1108 );
936 1109
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1110 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
938 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
940 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1113 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
941 . "but you still need to press apply to correctly re-layout the widget.", 1114 . "but you still need to press apply to correctly re-layout the widget.",
942 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1115 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
943 ); 1116 );
944 1117
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
946 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
947 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
948 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1121 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
949 on_changed => sub { 1122 on_changed => sub {
950 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
951 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
952 0 1126 }
953 } 1127 );
954 );
955 1128
956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1129 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
957 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
958 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
959 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1132 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
960 on_changed => sub { 1133 on_changed => sub {
961 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
962 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
963 0 1137 }
964 } 1138 );
965 ); 1139 }
966 1140
967 $vbox 1141 $vbox
968} 1142}
969 1143
970our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
982 ]); 1156 ]);
983 1157
984 my $text = !$freq 1158 my $text = !$freq
985 ? "audio is off" 1159 ? "audio is off"
986 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
987 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
988 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
989 1166
990 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
991} 1168}
992 1169
993sub audio_setup { 1170sub audio_setup {
996 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1173 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
997 1174
998 my $row = 0; 1175 my $row = 0;
999 1176
1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1177 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1001 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1002 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1003 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1180 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1004 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1181 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1182 );
1183 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1184
1185 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1186 $driver->add (new DC::UI::Entry
1187 text => $CFG->{audio_driver},
1188 template => "dsound1234",
1189 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1190 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1191 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1192 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1193 . "in no sound.",
1194 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1005 ); 1195 );
1006 1196
1007 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1197 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1008 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1009 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
1022 ); 1212 );
1023 1213
1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1025 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1026 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1027 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1217 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1028 on_changed => sub { 1218 on_changed => sub {
1029 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1030 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1031 audio_music_push; 1221 audio_music_push;
1032 1 1222 1
1043 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1044 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1045 options => [ 1235 options => [
1046 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1047 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1048 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1049 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1050 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1051 ], 1241 ],
1052 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1242 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1053 on_changed => sub { 1243 on_changed => sub {
1054 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1055 audio_tab_update; 1245 audio_tab_update;
1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1269 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1080 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1270 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1081 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1082 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1083 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1273 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1084 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1085 on_changed => sub { 1275 on_changed => sub {
1086 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1087 audio_tab_update; 1277 audio_tab_update;
1088 1 1278 1
1089 } 1279 }
1133} 1323}
1134 1324
1135sub make_gauge_window { 1325sub make_gauge_window {
1136 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1137 1327
1138 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1139 force_x => 0, 1329 force_x => 0,
1140 force_y => "max", 1330 force_y => "max",
1141 force_w => $WIDTH, 1331 force_w => $WIDTH,
1142 force_h => $gh, 1332 force_h => $gh,
1143 ); 1333 );
1159 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1160 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1161 ], 1351 ],
1162 ); 1352 );
1163 1353
1164 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1354 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1165 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1355 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1166 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1356 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1167 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1357 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1168
1169 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1170 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1171 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1172 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1173
1174 $GAUGES = {
1175 exp => $exp, prg => $prg, sklprg => $sklprg,
1176 win => $win, range => $rng,
1177 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1178 };
1179 1358
1180 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1181 1360
1182 $win 1361 $win
1362}
1363
1364our $BW_WATCHER;
1365
1366sub debug_toggle($) {
1367 $DELIANTRA_DEBUG ^= $_[0];
1368
1369 if ($DELIANTRA_DEBUG & 16) {
1370 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1371 return unless $CONN;
1372 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1373 $CONN->{octets_in} = 0;
1374 };
1375 } else {
1376 undef $BW_WATCHER;
1377 }
1378
1183} 1379}
1184 1380
1185sub debug_setup { 1381sub debug_setup {
1186 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1187 1383
1188 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1384 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1189 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1385 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1190 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1386 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1191 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1387 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1192 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1388 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1193 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1389 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1194 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1390 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1195 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1391 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1392 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1393 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1394
1196 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1395 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1197
1198 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1396 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1199 1397
1200 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1398 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1201 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1399 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1202 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1400 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1203 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1401 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1524 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1722 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1525 ); 1723 );
1526 1724
1527 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1725 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1528 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1529 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1530 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1531 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1532 ); 1730 );
1533 1731
1534 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1732 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1535 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1536 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1537 hidden => 1, 1735 hidden => 1,
1538 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1539 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1540 ); 1738 );
1541 1739
1542 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1543 expand => 1, 1741 expand => 1,
1544 text => "Login / Register", 1742 text => "Login / Register",
1549 1 1747 1
1550 }, 1748 },
1551 ); 1749 );
1552 1750
1553 $vbox->add (new DC::UI::FancyFrame 1751 $vbox->add (new DC::UI::FancyFrame
1554 label => "Registering", 1752 label => "How to Play",
1555 min_h => 200, 1753 min_h => 240,
1556 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1754 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1557 markup => 1755 markup =>
1756 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1757 . "Then register a new account (or use an existing one if you have one). "
1558 "To register a new account, choose a username that hasn't been taken yet and " 1758 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1559 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1759 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1560 ), 1760 ),
1561 ); 1761 );
1562 1762
1563 $vbox 1763 $vbox
1578 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1579 1779
1580 $vbox->add ( 1780 $vbox->add (
1581 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1582 expand => 1, 1782 expand => 1,
1583 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1584 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1784 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1585 on_changed => sub { 1785 on_changed => sub {
1586 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1587 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1588 1 1788 1
1589 } 1789 }
1590 ); 1790 );
1591 1791
1592 if (0) { #d# disabled 1792 if (0) { #d# disabled
1635 1835
1636 my $row = 0; 1836 my $row = 0;
1637 1837
1638 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1639 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1640 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1641 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1842 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1642 on_changed => sub { 1843 on_changed => sub {
1643 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1644 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1646 } 1847 }
1647 ); 1848 );
1648 1849
1649 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1650 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1851 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1852 c_colspan => 2,
1651 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1652 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1854 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1653 . "sends more messages than this number, older messages get removed to save memory and " 1855 . "sends more messages than this number, older messages get removed to save memory and "
1654 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1856 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1655 on_changed => sub { 1857 on_changed => sub {
1657 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1658 0 1860 0
1659 }, 1861 },
1660 ); 1862 );
1661 1863
1864 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1865 $table->add_at (1, $row, new DC::UI::CheckBox
1866 state => $CFG->{config_autosave},
1867 tooltip => "Normally, configuration settings and the user interface layout "
1868 . "are saved on client exit. You can disable this behaviour by "
1869 . "unchecking this checkbox.",
1870 on_changed => sub {
1871 my ($self, $value) = @_;
1872 $CFG->{config_autosave} = $value;
1873 0
1874 }
1875 );
1876 $table->add_at (2, $row++, new DC::UI::Button
1877 text => "Save Now",
1878 tooltip => "Use this to manually save configuration and UI layout when "
1879 . "autosave is disabled.",
1880 on_activate => sub {
1881 DC::write_cfg;
1882 0
1883 }
1884 );
1885
1662 $table 1886 $table
1663} 1887}
1664 1888
1665sub autopickup_setup { 1889sub autopickup_setup {
1666 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
1672 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1673 ); 1897 );
1674 1898
1675 for ( 1899 for (
1676 ["General", 0, 0, 1900 ["General", 0, 0,
1677 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1678 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1679 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1680 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1681 ], 1904 ],
1682 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1683 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1709 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1932 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710 ["Ignore cursed" => PICKUP_NOT_CURSED], 1933 ["Ignore cursed" => PICKUP_NOT_CURSED],
1711 ["Jewelery" => PICKUP_JEWELS], 1934 ["Jewelery" => PICKUP_JEWELS],
1712 ["Flesh" => PICKUP_FLESH], 1935 ["Flesh" => PICKUP_FLESH],
1713 ], 1936 ],
1714 ["Weight/Value ratio", 2, 17] 1937 ["Value/Weight ratio", 2, 17]
1715 ) 1938 )
1716 { 1939 {
1717 my ($title, $x, $y, @bits) = @$_; 1940 my ($title, $x, $y, @bits) = @$_;
1718 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1941 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1719 1942
1731 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1732 } else { 1955 } else {
1733 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1734 } 1957 }
1735 1958
1736 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1737 if defined $::CONN; 1960 if defined $::CONN;
1738 1961
1739 0 1962 0
1740 }); 1963 });
1741 1964
1744 } 1967 }
1745 1968
1746 $table->add_at (2, 18, new DC::UI::ValSlider 1969 $table->add_at (2, 18, new DC::UI::ValSlider
1747 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1970 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748 template => ">= 99", 1971 template => ">= 99",
1972 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1749 to_value => sub { ">= " . 5 * $_[0] }, 1973 to_value => sub { ">= " . 5 * $_[0] },
1750 on_changed => sub { 1974 on_changed => sub {
1751 my ($slider, $value) = @_; 1975 my ($slider, $value) = @_;
1752 1976
1753 $::CFG->{pickup} &= ~0xF; 1977 $::CFG->{pickup} &= ~0xF;
1757 }); 1981 });
1758 1982
1759 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1760 text => "set", 1984 text => "set",
1761 on_activate => sub { 1985 on_activate => sub {
1762 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1763 if defined $::CONN; 1987 if defined $::CONN;
1764 0 1988 0
1765 }); 1989 });
1766 1990
1767 $r 1991 $r
1768} 1992}
1769 1993
1770my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1771 type => sub { 1995 type => sub {
1996 use sort 'stable';
1772 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1773 }, 1998 },
1774 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1775 my $NOW = time; 2001 my $NOW = time;
1776 sort { 2002 sort {
1777 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2003 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1778 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 2004 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1779 2005
1780 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1781 or $btime <=> $atime 2007 or $btime <=> $atime
1782 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1783 } @_ 2009 } @_
1784 }, 2010 },
1785 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1786 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1787 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1788 } @_ }, 2016 } @_
2017 },
1789); 2018);
1790 2019
1791sub inventory_widget { 2020sub inventory_widget {
1792 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1793 2022
1809 $::CFG->{inv_sort} = $_[1]; 2038 $::CFG->{inv_sort} = $_[1];
1810 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2039 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1811 }, 2040 },
1812 ); 2041 );
1813 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 2042 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1814 #TODO# update to weigh/maxweight 2043 #TODO# update to weight/maxweight
1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2044 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816 2045
1817 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2046 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1818 $sw1->add ($INV = new DC::UI::Inventory); 2047 $sw1->add ($INV = new DC::UI::Inventory);
1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2048 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1880 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1881 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1882 } 2111 }
1883} 2112}
1884 2113
1885sub player_window { 2114sub make_playerbook {
1886 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1887 x => "center", 2116 x => "center",
1888 y => "center", 2117 y => "center",
1889 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1890 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
1924 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
1925 2154
1926 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
1927 2156
1928 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
1929 $plwin
1930} 2158}
1931 2159
1932sub keyboard_setup { 2160sub keyboard_setup {
1933 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
1934} 2162}
1935 2163
1936sub help_window { 2164sub make_help_window {
1937 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
1938 x => 'center', 2166 x => 'center',
1939 y => 'center', 2167 y => 'center',
1940 z => 4, 2168 z => 4,
1941 name => 'doc_browser', 2169 name => 'doc_browser',
2030 2258
2031 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2032 $win->show; 2260 $win->show;
2033 }; 2261 };
2034 2262
2035 $win 2263 $HELP_WINDOW = $win;
2036}
2037
2038sub open_string_query {
2039 my ($title, $cb, $txt, $tooltip) = @_;
2040 my $dialog = new DC::UI::Toplevel
2041 x => "center",
2042 y => "center",
2043 z => 50,
2044 force_w => $WIDTH * 4/5,
2045 title => $title;
2046
2047 $dialog->add (
2048 my $e = new DC::UI::Entry
2049 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2050 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2051 tooltip => $tooltip
2052 );
2053
2054 $e->grab_focus;
2055 $e->set_text ($txt) if $txt;
2056 $dialog->show;
2057} 2264}
2058 2265
2059sub open_quit_dialog { 2266sub open_quit_dialog {
2060 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2061 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2083 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2290 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2084 ); 2291 );
2085 $hb->add (new DC::UI::Button 2292 $hb->add (new DC::UI::Button
2086 text => "Quit anyway", 2293 text => "Quit anyway",
2087 expand => 1, 2294 expand => 1,
2088 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2295 on_activate => sub {
2296 crash "Quit anyway";
2297 EV::unloop EV::UNLOOP_ALL;
2298 },
2089 ); 2299 );
2090 } 2300 }
2091 2301
2092 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2093 $QUIT_DIALOG->grab_focus; 2303 $QUIT_DIALOG->grab_focus;
2304}
2305
2306sub make_menubar {
2307 $MENUFRAME = new DC::UI::Toplevel
2308 border => 0,
2309 force_x => 0,
2310 force_y => 0,
2311 force_w => $::WIDTH,
2312 child => ($MENUBAR = new DC::UI::HBox),
2313 ;
2314
2315 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2316
2317 # 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
2318 make_gauge_window->show;
2319
2320# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2321# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2322
2323 make_playerbook;
2324
2325 $MENUPOPUP = DC::UI::Menu->new (items => [
2326 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2327 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2328 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2329 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2330 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2331 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2332 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2333 ["Quit…" , sub {
2334 if ($CONN) {
2335 open_quit_dialog;
2336 } else {
2337 EV::unloop EV::UNLOOP_ALL;
2338 }
2339 }],
2340 ]);
2341
2342 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2343 tooltip => "Shows the main menu",
2344 on_button_down => sub {
2345 my ($self, $ev) = @_;
2346 local $ev->{x} = 0;
2347 local $ev->{y} = 0;
2348 $MENUPOPUP->popup ($ev);
2349 },
2350 );
2351
2352 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2353 padding_x => 6,
2354 padding_y => 3,
2355 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2356 template => " Exp: 888,888,888,888 (lvl 188) ",
2357 );
2358
2359 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2360 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2361 . "will automatically pick up items as defined by your item pickup settings "
2362 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2363 . "disable autopickup by disabling this checkbox.",
2364 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2365 on_changed => sub {
2366 my ($self, $value) = @_;
2367 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2368 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2369 $CONN->send_pickup ($CFG->{pickup})
2370 if $CONN;
2371 },
2372 );
2373
2374 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2375 c_rescale => 1,
2376 padding_x => 6,
2377 padding_y => 3,
2378 force_w => $::WIDTH * 0.2,
2379 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2380 template => "two handed weapons 99%",
2381 );
2382
2383 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2384 expand => 1,
2385 align => 1, can_hover => 1, can_events => 1,
2386 text => "Range and Combat Slots",
2387 tooltip => "#stat_ranged",
2388 );
2389
2390 $MENUFRAME->show;
2391}
2392
2393sub open_string_query {
2394 my ($title, $cb, $txt, $tooltip) = @_;
2395 my $dialog = new DC::UI::Toplevel
2396 x => "center",
2397 y => "center",
2398 z => 50,
2399 force_w => $WIDTH * 4/5,
2400 title => $title;
2401
2402 $dialog->add (
2403 my $e = new DC::UI::Entry
2404 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2405 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2406 tooltip => $tooltip
2407 );
2408
2409 $e->grab_focus;
2410 $e->set_text ($txt) if $txt;
2411 $dialog->show;
2094} 2412}
2095 2413
2096sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2097 # find all tips 2415 # find all tips
2098 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2145 2463
2146 $dialog->show; 2464 $dialog->show;
2147 }; 2465 };
2148} 2466}
2149 2467
2150sub sdl_init {
2151 DC::SDL_Init
2152 and die "SDL::Init failed!\n";
2153}
2154
2155sub video_init { 2468sub video_init {
2469 DC::set_theme $CFG->{uitheme};
2470
2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2472 $SDL_REINIT = 0;
2473
2474 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2475 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2476 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2477 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2478
2479 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2480
2156 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2481 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2482 $CFG->{sdl_mode} = 0; # lowest resolution by default
2483
2484 # now choose biggest mode <= 1024x768
2485 for (0 .. $#SDL_MODES) {
2486 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2487 $CFG->{sdl_mode} = $_;
2488 }
2489 }
2490 }
2157 2491
2158 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2492 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159 2493
2160 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2494 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161 $FULLSCREEN = $CFG->{fullscreen}; 2495 $FULLSCREEN = $CFG->{fullscreen};
2162 $FAST = $CFG->{fast}; 2496 $FAST = $CFG->{fast};
2163 2497
2498 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2164 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2499 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2500 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2165 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2501 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166 2502
2167 $SDL_ACTIVE = 1; 2503 $SDL_ACTIVE = 1;
2168 $LAST_REFRESH = time - 0.01; 2504 $LAST_REFRESH = time - 0.01;
2169 2505
2195 2531
2196 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2197 padding => 0, 2533 padding => 0,
2198 z => 100, 2534 z => 100,
2199 force_x => "max", 2535 force_x => "max",
2200 force_y => 0; 2536 force_y => 20;
2201 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2202 2538
2203 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2204 2540
2205 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
2216 2552
2217 (new DC::UI::Frame 2553 (new DC::UI::Frame
2218 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2219 force_x => 0, 2555 force_x => 0,
2220 force_y => "max", 2556 force_y => "max",
2221 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2222 )->show; 2558 )->show;
2223 2559
2224 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2225 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2226 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2227 align => 0, 2563 align => 0,
2228 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2229 fontsize => 0.5, 2565 fontsize => 0.5,
2230 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2231 ); 2567 );
2232 2568
2233 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2234 title => "Minimap", 2570 title => "Minimap",
2235 name => "mapmap", 2571 name => "mapmap",
2236 x => 0, 2572 x => 0,
2237 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2238 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2239 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2240 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2241 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2577 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2242 ), 2578 ),
2243 )->show; 2579 )->show;
2244 2580
2245 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2246 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2271 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2272 # the name is changed to not conflict with the older name as users could have hidden it 2608 # the name is changed to not conflict with the older name as users could have hidden it
2273 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2274 name => "message_window2", 2610 name => "message_window2",
2275 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2276 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2277 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2278 ; 2615 ;
2279 2616
2280 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2300 . "After pressing the combo the binding will be saved automatically and the " 2637 . "After pressing the combo the binding will be saved automatically and the "
2301 . "binding editor closes"); 2638 . "binding editor closes");
2302 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2303 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2304 2641
2305 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2306 2644
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2308 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2309
2310# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2311# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2312
2313 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
2314
2315 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2316 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2317
2318 $BUTTONBAR->add (new DC::UI::Button
2319 text => "Save Config",
2320 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2321 on_activate => sub {
2322 $::CFG->{layout} = DC::UI::get_layout;
2323 DC::write_cfg;
2324 status "Configuration Saved";
2325 0
2326 },
2327 );
2328
2329 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2330 tooltip => "View Documentation");
2331
2332 $BUTTONBAR->add (new DC::UI::Button
2333 text => "Quit",
2334 tooltip => "Terminates the program",
2335 on_activate => sub {
2336 if ($CONN) {
2337 open_quit_dialog;
2338 } else {
2339 EV::unloop EV::UNLOOP_ALL;
2340 }
2341 0
2342 },
2343 );
2344
2345 $BUTTONBAR->show;
2346 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2347 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2348 } 2647 }
2349 2648
2649 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2651
2652 $CAVEAT_LABEL->set_text ("None :)");
2653 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2654 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2657
2350 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2658 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2351} 2659}
2352 2660
2353sub video_shutdown { 2661sub video_shutdown {
2354 DC::OpenGL::shutdown; 2662 DC::OpenGL::shutdown;
2663 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355 2664
2356 undef $SDL_ACTIVE; 2665 undef $SDL_ACTIVE;
2357} 2666}
2358 2667
2359my %animate_object; 2668my %animate_object;
2360my $animate_timer; 2669my $animate_timer;
2361 2670
2362my $fps = 9; 2671my $fps = 9;
2363 2672
2364sub force_refresh { 2673sub force_refresh {
2365 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2366 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2675 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2367 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2368 } 2677 }
2369 2678
2370 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2378my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2379 2688
2380my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2381 $NOW = EV::now; 2690 $NOW = EV::now;
2382 2691
2383 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2384 for DC::poll_events; 2693 for DC::poll_events;
2385 2694
2386 if (%animate_object) { 2695 if (%animate_object) {
2387 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2388 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2400sub animation_stop { 2709sub animation_stop {
2401 my ($widget) = @_; 2710 my ($widget) = @_;
2402 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2403} 2712}
2404 2713
2405%SDL_CB = (
2406 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2715 crash "SDL_QUIT";
2407 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2408 }, 2717};
2409 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2410 },
2411 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2412 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2413 }, 2721};
2414 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2415# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2416# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2724# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2417# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2418# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2419# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2420# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421 }, 2729};
2422 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2423 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424 # alt-enter 2732 # alt-enter
2733 video_shutdown;
2425 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2426 video_shutdown;
2427 video_init; 2735 video_init;
2428 } else { 2736 } else {
2429 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2430 } 2738 }
2431 update_modbox; 2739 update_modbox;
2432 }, 2740};
2433 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2434 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2435 update_modbox; 2743 update_modbox;
2436 }, 2744};
2437 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2438 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2439 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2440 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2441 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2442 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2443 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2444 audio_music_finished; 2752 audio_music_finished;
2445 }
2446 }, 2753 }
2447); 2754};
2448 2755
2449############################################################################# 2756#############################################################################
2450 2757
2451$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2452 EV::unloop; 2759 EV::unloop;
2453 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2454}; 2761};
2455 2762
2456{ 2763# due to mac os x + sdl combined braindamage, we need this contortion
2764sub main {
2765 {
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458 2767
2459 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2460 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2769 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461 } else { 2770 } else {
2462 #TODO: compatibility cruft 2771 #TODO: compatibility cruft
2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2772 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464 print STDERR "INFO: used old configuration file\n"; 2773 print STDERR "INFO: used old configuration file\n";
2465 } 2774 }
2466 2775
2467 DC::DB::Server::run; 2776 DC::DB::Server::run;
2468 2777
2469 if ($CFG->{db_schema} < 1) { 2778 if ($CFG->{db_schema} < 1) {
2470 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2779 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471 DC::DB::nuke_db; 2780 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1; 2781 $CFG->{db_schema} = 1;
2473 DC::write_cfg; 2782 DC::write_cfg;
2474 } 2783 }
2475 2784
2476 DC::DB::open_db; 2785 DC::DB::open_db;
2477 2786
2478 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2479 2788
2480 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2481 sdl_mode => 0, 2791 sdl_mode => undef,
2482 fullscreen => 1, 2792 fullscreen => 1,
2483 fast => 0, 2793 fast => 0,
2484 force_opengl11 => undef, 2794 force_opengl11 => undef,
2795 disable_alpha => 0,
2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2485 texture_compression => 1, 2798 texture_compression => 1,
2486 map_scale => 1, 2799 map_scale => 1,
2487 fow_enable => 1, 2800 fow_enable => 1,
2488 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2489 map_smoothing => 1, 2803 map_smoothing => 1,
2490 gui_fontsize => 1, 2804 gui_fontsize => 1,
2491 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2492 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2493 gauge_size => 0.35, 2807 gauge_size => 0.35,
2494 stat_fontsize => 0.7, 2808 stat_fontsize => 0.7,
2495 mapsize => 100, 2809 mapsize => 100,
2496 audio_enable => 1, 2810 audio_enable => 1,
2497 audio_hw_channels => 0, 2811 audio_hw_channels => 0,
2498 audio_hw_frequency => 0, 2812 audio_hw_frequency => 0,
2499 audio_hw_chunksize => 0, 2813 audio_hw_chunksize => 0,
2500 audio_mix_channels => 8, 2814 audio_mix_channels => 8,
2501 effects_enable => 1, 2815 effects_enable => 1,
2502 effects_volume => 1, 2816 effects_volume => 1,
2503 bgm_enable => 1, 2817 bgm_enable => 1,
2504 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2505 output_rate => "", 2819 output_rate => "",
2506 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2507 inv_sort => "mtime", 2821 inv_sort => "mtime",
2508 default => "profile", # default profile 2822 default => "profile", # default profile
2509 show_tips => 1, 2823 show_tips => 1,
2510 logview_max_par => 1000, 2824 logview_max_par => 1000,
2511 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2512 ); 2829 );
2513 2830
2514 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2515 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2516 } 2833 }
2517 2834
2518 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2519 $PROFILE = $CFG->{profile}{default};
2520 2836
2521 # convert old bindings (only default profile matters) 2837 # OS X passes some process serial number of other shit. they
2522 if (my $bindings = delete $PROFILE->{bindings}) { 2838 # could have used an env var or any other sane mechanism. but
2523 while (my ($mod, $syms) = each %$bindings) { 2839 # would it be os x then? no...
2524 while (my ($sym, $cmds) = each %$syms) { 2840 shift @args if $args[0] =~ /^-psn_/;
2525 push @{ $PROFILE->{macro} }, { 2841
2526 accelkey => [$mod*1, $sym*1], 2842 my $profile = 'default';
2527 action => $cmds, 2843
2844 for (my $i = 0; $i < @args; $i++) {
2845 if ($args[$i] =~ /^--?profile$/) {
2846 $profile = $args[$i + 1];
2847 splice @args, $i, 2, ();
2528 }; 2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2529 } 2852 }
2530 } 2853 }
2531 }
2532 2854
2533 sdl_init; 2855 $CFG->{profile}{$profile} ||= {};
2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2534 2858
2535 @SDL_MODES = DC::SDL_ListModes 8, 8; 2859 $PROFILE->{host} = $args[0] if @args > 0;
2536 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2860 $PROFILE->{user} = $args[1] if @args > 1;
2537 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2861 $PROFILE->{password} = $args[2] if @args > 2;
2538 2862
2539 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2863 # convert old bindings (only default profile matters)
2864 if (my $bindings = delete $PROFILE->{bindings}) {
2865 while (my ($mod, $syms) = each %$bindings) {
2866 while (my ($sym, $cmds) = each %$syms) {
2867 push @{ $PROFILE->{macro} }, {
2868 accelkey => [$mod*1, $sym*1],
2869 action => $cmds,
2870 };
2871 }
2872 }
2873 }
2540 2874
2541 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2542 2877
2543 { 2878 {
2544 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545 DejaVuSans.ttf 2880 DejaVuSans.ttf
2546 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
2547 DejaVuSans-Bold.ttf 2882 DejaVuSans-Bold.ttf
2548 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2549 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2550 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2551 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2552 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2553 ); 2889 );
2554 2890
2555 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2556 2892
2557 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2558 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2559 2895
2560 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2561 2897
2562 DC::pango_init; 2898 DC::pango_init;
2563 } 2899 }
2564 2900
2565# compare mono (ft) vs. rgba (cairo) 2901# compare mono (ft) vs. rgba (cairo)
2566# ft - 1.8s, cairo 3s, even in alpha-only mode 2902# ft - 1.8s, cairo 3s, even in alpha-only mode
2567# for my $rgba (0..1) { 2903# for my $rgba (0..1) {
2568# my $t1 = Time::HiRes::time; 2904# my $t1 = Time::HiRes::time;
2573# } 2909# }
2574# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2575# warn $t2-$t1; 2911# warn $t2-$t1;
2576# } 2912# }
2577 2913
2578 video_init; 2914 video_init;
2579 audio_init; 2915 audio_init;
2580} 2916 }
2581 2917
2582show_tip_of_the_day if $CFG->{show_tips}; 2918 show_tip_of_the_day if $CFG->{show_tips};
2583 2919
2584our $STARTUP_CANCEL = EV::idle sub { 2920 our $STARTUP_CANCEL = EV::idle sub {
2585 undef $::STARTUP_CANCEL; 2921 undef $::STARTUP_CANCEL;
2586 $startup_done->(); 2922 $startup_done->();
2587}; 2923 };
2588 2924
2925 debug_toggle 0;
2926
2589delete $SIG{__DIE__}; 2927 delete $SIG{__DIE__};
2590EV::loop; 2928 EV::loop;
2591 2929
2930 DC::write_cfg if $CFG->{config_autosave};
2931
2592#video_shutdown; 2932 #video_shutdown;
2593#audio_shutdown; 2933 #audio_shutdown;
2934
2594DC::OpenGL::quit; 2935 DC::OpenGL::quit;
2595DC::SDL_Quit; 2936 DC::SDL_Quit;
2596DC::DB::Server::stop; 2937 DC::DB::Server::stop;
2938}
2939
2940DC::SDL_braino; # see sub above
2597 2941
2598=head1 NAME 2942=head1 NAME
2599 2943
2600deliantra - A Deliantra MORPG game client 2944deliantra - A Deliantra MORPG game client
2601 2945
2602=head1 SYNOPSIS 2946=head1 SYNOPSIS
2603 2947
2604Just run it - no commandline arguments are supported. 2948 deliantra [--profile name] [host [user [password]]]
2949 deliantra --help
2605 2950
2606=head1 USAGE 2951=head1 USAGE
2607 2952
2608deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2953The deliantra client utilises OpenGL for all UI elements and the game. It
2609be used in fullscreen mode and interactively. 2954is supposed to be used in fullscreen mode and interactively.
2610 2955
2611=head1 DEBUGGING 2956=head1 DEBUGGING
2612 2957
2613
2614CFPLUS_DEBUG - environment variable 2958DELIANTRA_DEBUG - environment variable
2615 2959
2616 1 draw borders around widgets 2960 1 draw borders around widgets
2617 2 add low-level widget info to tooltips 2961 2 add low-level widget info to tooltips
2618 4 show fps 2962 4 show fps
2619 8 suppress tooltips 2963 8 suppress tooltips
2964 16 show bandwidth downstream
2620 2965
2621=head1 AUTHOR 2966=head1 AUTHOR
2622 2967
2623Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2968Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624 2969
2625 2970
2626 2971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines