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.43 by root, Wed May 21 23:35:55 2008 UTC vs.
Revision 1.114 by root, Fri Apr 23 16:30:39 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 ();
94use AnyEvent::DNS ();
95
102use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
103 98
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 99use DC;
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
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
110use DC::UI::Inventory; 118use DC::UI::Inventory;
111use DC::UI::SpellList; 119use DC::UI::SpellList;
112use DC::UI::Dockable; 120use DC::UI::Dockable;
113use DC::UI::Dockbar; 121use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 122use DC::UI::ChatView;
116use DC::MessageDistributor; 123use DC::MessageDistributor;
117use DC::Pod; 124use DC::Pod;
118use DC::MapWidget; 125use DC::MapWidget;
119use DC::Macro; 126use DC::Macro;
120 127
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
123 130
124$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
126}; 134};
127 135
128my $MAX_FPS = 60; 136my $MAX_FPS = 60;
129 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 141
132our $LAST_REFRESH; 142our $LAST_REFRESH;
133our $NOW; 143our $NOW;
134 144
135our $CFG; 145our $CFG;
136our $CONN;
137our $PROFILE; # current profile 146our $PROFILE; # current profile
138our $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;
139 149
140our $WANT_REFRESH; 150our $WANT_REFRESH;
141 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
142our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
143our $WIDTH; 157our $WIDTH;
144our $HEIGHT; 158our $HEIGHT;
145our $FULLSCREEN; 159our $FULLSCREEN;
146our $FONTSIZE; 160our $FONTSIZE;
147 161
148our $FONT_PROP; 162our $FONT_PROP;
149our $FONT_FIXED; 163our $FONT_FIXED;
150 164
165our $CONN;
166
151our $MAP; 167our $MAP;
152our $MAPMAP; 168our $MAPMAP;
153our $MAPWIDGET; 169our $MAPWIDGET;
154our $COMPLETER; 170our $COMPLETER;
155our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
156our $METASERVER; 175our $METASERVER;
157our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 177our $QUIT_DIALOG;
159our $HOST_ENTRY; 178our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
186our $FLOORBOX; 205our $FLOORBOX;
187our $GAUGES; 206our $GAUGES;
188our $STATWIDS; 207our $STATWIDS;
189 208
190our $SDL_ACTIVE; 209our $SDL_ACTIVE;
191our %SDL_CB; 210our @SDL_CB;
192 211
193our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 213our $STATUSBOX;
195our $MODBOX; 214our $MODBOX;
196our $DEBUG_STATUS; 215our $DEBUG_STATUS;
197 216
198our $INV; 217our $INV;
199our $INVR; 218our $INVR;
200our $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}
201 260
202############################################################################# 261#############################################################################
203 262
204sub status { 263sub status {
205 $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]);
287 or return; 346 or return;
288 347
289 $meta->{data} 348 $meta->{data}
290 or return; 349 or return;
291 350
292 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
294 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
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 355 &audio_music_push ($face);
297 } 356 }
298 } else { 357 } else {
299 # fetch from database 358 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
303 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;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
306 365
307 audio_sound_push ($face); 366 audio_sound_push ($face);
308 }; 367 };
355 414
356 audio_music_update_volume; 415 audio_music_update_volume;
357 416
358 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
359 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
360 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
361 ? 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
362 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
363 425
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 428
367 my $NOW = time; 429 my $NOW = time;
368 430
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
456 audio_music_push; 518 audio_music_push;
457} 519}
458 520
459sub audio_init { 521sub audio_init {
460 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
461 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
462 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
463 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
464 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
465 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
479 sub audio_tab_update; 550 sub audio_tab_update;
480 audio_tab_update; 551 audio_tab_update;
481} 552}
482 553
483sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
484 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
485 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
486 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
487 563
488 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
490 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
491 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
492 568
493 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
494 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
495} 573}
496 574
497############################################################################# 575#############################################################################
498 576
499sub destroy_query_dialog { 577sub destroy_query_dialog {
725 803
726 $vbox->add (@dialog); 804 $vbox->add (@dialog);
727 $dialog->show; 805 $dialog->show;
728} 806}
729 807
730sub start_game { 808sub dc_connect {
731 status "logging in..."; 809 my ($host, $port) = @_;
732 810
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
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 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 814 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 815 new DC::Protocol
746 host => $host, 816 host => $host,
747 port => $port || 13327, 817 port => $port,
748 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
750 mapw => $mapsize, 820 mapw => $mapw,
751 maph => $mapsize, 821 maph => $maph,
752 822
823 c_version => {
824 client => "deliantra",
753 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
754 829
755 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
756 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
757 map => $MAP, 832 map => $MAP,
758 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
759 query => \&server_query, 834 query => \&server_query,
760 835
761 setup_req => { 836 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 837 smoothing => $CFG->{map_smoothing}*1,
763 }, 838 },
764 };
765 839
766 if ($CONN) { 840 on_connect => sub {
841 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
768 843
769 status "login successful"; 844 status "successfully connected to the server";
845 } else {
846 undef $CONN;
847 status "unable to connect: $!";
848 stop_game();
849 }
850 },
851 ;
852}
853
854sub start_game {
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.";
860
861 $LOGIN_BUTTON->set_text ("Logout");
862 $SETUP_DIALOG->hide;
863
864 $MAP = new DC::Map;
865
866 # hack to make SURE we find the IP address all right
867 # can be removed once AnyEvent::DNS is proven stable.
868 if ($host eq "gameserver.deliantra.net") {
869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
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) {
874 status "dns failure, using hardcoded address";
875 $host = "194.126.175.154";
876 }
877 }
878
879 dc_connect $host, $port;
880 };
770 } else { 881 } else {
771 warn $@; 882 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 883 }
775} 884}
776 885
777sub stop_game { 886sub stop_game {
887 crash "stop_game";
888
778 $LOGIN_BUTTON->set_text ("Login / Register"); 889 $LOGIN_BUTTON->set_text ("Login / Register");
779 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 890 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
780 $SETUP_DIALOG->show; 891 $SETUP_DIALOG->show;
781 $PL_WINDOW->hide; 892 $PL_WINDOW->hide;
782 $SPELL_LIST->clear_spells; 893 $SPELL_LIST->clear_spells;
796} 907}
797 908
798sub graphics_setup { 909sub graphics_setup {
799 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
800 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
801 $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]);
802 916
803 my $row = 0; 917 my $row = 0;
804 918
805 $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");
806 $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,
807 can_events => 1, 921 can_events => 1,
808 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
809 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
810 my $vidmode_tooltip = 945 my $vidmode_tooltip =
811 "<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). "
812 . "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>.";
813 948
814 $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");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 951
817 $hbox->add (my $mode_slider = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 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 ],
819 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
823 960
824 $mode_slider->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 962 my ($self, $value) = @_;
826 963
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 964 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $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]});
829 }); 966 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 967 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 968
832 $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");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 970 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 971 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 972 tooltip => "Bring the client into fullscreen mode.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
837 ); 974 );
838 975
839 $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");
840 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
841 state => $CFG->{force_opengl11}, 978 state => $CFG->{force_opengl11},
842 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 "
843 . "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 "
844 . "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. "
845 . "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, "
846 . "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. "
847 . "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>",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
849 ); 986 );
850 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
851 $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");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
854 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 "
855 . "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). "
856 . "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 "
857 . "forced OpenGL 1.1 mode.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
859 ); 1013 );
860 1014
861 $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");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{fast}, 1017 state => $CFG->{fast},
864 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
865 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
866 ); 1020 );
867 1021
868 $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");
869 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
870 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
871 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.",
872 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
873 ); 1027 );
874 1028
875 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
876 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
877 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
878 on_activate => sub { 1032 on_activate => sub {
879 video_shutdown (); 1033 video_shutdown ();
880 video_init (); 1034 video_init ();
1035 0
881 0 1036 }
882 } 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 }
883 ); 1053 );
884 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
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
888 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
889 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 }
890 ); 1070 );
891 1071
892 $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");
893 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
894 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
895 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. "
896 . "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. "
897 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
898 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
899 ); 1079 );
900 1080
901 $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");
902 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
903 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
904 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.",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
906 ); 1086 );
907 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
908 $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");
909 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
911 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.",
912 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
913 ); 1108 );
914 1109
915 $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");
916 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
917 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
918 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, "
919 . "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.",
920 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 },
921 ); 1116 );
922 1117
923 $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");
924 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
925 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
926 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.",
927 on_changed => sub { 1122 on_changed => sub {
928 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
929 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
930 0 1126 }
931 } 1127 );
932 );
933 1128
934 $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");
935 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
937 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.",
938 on_changed => sub { 1133 on_changed => sub {
939 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
940 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
941 0 1137 }
942 } 1138 );
943 ); 1139 }
944 1140
945 $vbox 1141 $vbox
946} 1142}
947 1143
948our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
960 ]); 1156 ]);
961 1157
962 my $text = !$freq 1158 my $text = !$freq
963 ? "audio is off" 1159 ? "audio is off"
964 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
965 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
966 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
967 1166
968 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
969} 1168}
970 1169
971sub audio_setup { 1170sub audio_setup {
974 $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]);
975 1174
976 my $row = 0; 1175 my $row = 0;
977 1176
978 $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");
979 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
980 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
981 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.",
982 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 }
983 ); 1195 );
984 1196
985 $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");
986 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
987 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
1000 ); 1212 );
1001 1213
1002 $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");
1003 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1004 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1005 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.",
1006 on_changed => sub { 1218 on_changed => sub {
1007 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1008 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1009 audio_music_push; 1221 audio_music_push;
1010 1 1222 1
1021 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1022 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1023 options => [ 1235 options => [
1024 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1025 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1026 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1027 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1028 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1029 ], 1241 ],
1030 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.",
1031 on_changed => sub { 1243 on_changed => sub {
1032 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1033 audio_tab_update; 1245 audio_tab_update;
1057 $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");
1058 $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
1059 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1060 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1061 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 "
1062 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1063 on_changed => sub { 1275 on_changed => sub {
1064 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1065 audio_tab_update; 1277 audio_tab_update;
1066 1 1278 1
1067 } 1279 }
1111} 1323}
1112 1324
1113sub make_gauge_window { 1325sub make_gauge_window {
1114 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1115 1327
1116 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1117 force_x => 0, 1329 force_x => 0,
1118 force_y => "max", 1330 force_y => "max",
1119 force_w => $WIDTH, 1331 force_w => $WIDTH,
1120 force_h => $gh, 1332 force_h => $gh,
1121 ); 1333 );
1137 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1138 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1139 ], 1351 ],
1140 ); 1352 );
1141 1353
1142 $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");
1143 $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");
1144 $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");
1145 $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");
1146
1147 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1148 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1149 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1150 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1151
1152 $GAUGES = {
1153 exp => $exp, prg => $prg, sklprg => $sklprg,
1154 win => $win, range => $rng,
1155 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1156 };
1157 1358
1158 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1159 1360
1160 $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
1161} 1379}
1162 1380
1163sub debug_setup { 1381sub debug_setup {
1164 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1165 1383
1166 $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");
1167 $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 });
1168 $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");
1169 $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 });
1170 $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");
1171 $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 });
1172 $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");
1173 $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
1174 $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() } );
1175
1176 $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#
1177 1397
1178 $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);
1179 $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);
1180 $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 );
1181 $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);
1502 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]),
1503 ); 1723 );
1504 1724
1505 $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");
1506 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1507 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1508 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1509 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1510 ); 1730 );
1511 1731
1512 $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");
1513 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1514 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1515 hidden => 1, 1735 hidden => 1,
1516 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1517 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1518 ); 1738 );
1519 1739
1520 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1521 expand => 1, 1741 expand => 1,
1522 text => "Login / Register", 1742 text => "Login / Register",
1527 1 1747 1
1528 }, 1748 },
1529 ); 1749 );
1530 1750
1531 $vbox->add (new DC::UI::FancyFrame 1751 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1752 label => "How to Play",
1533 min_h => 200, 1753 min_h => 240,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1754 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 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). "
1536 "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 "
1537 . "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.",
1538 ), 1760 ),
1539 ); 1761 );
1540 1762
1541 $vbox 1763 $vbox
1556 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1557 1779
1558 $vbox->add ( 1780 $vbox->add (
1559 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1560 expand => 1, 1782 expand => 1,
1561 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1562 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>)",
1563 on_changed => sub { 1785 on_changed => sub {
1564 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1565 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1566 1 1788 1
1567 } 1789 }
1568 ); 1790 );
1569 1791
1570 if (0) { #d# disabled 1792 if (0) { #d# disabled
1613 1835
1614 my $row = 0; 1836 my $row = 0;
1615 1837
1616 $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");
1617 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1618 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1619 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?",
1620 on_changed => sub { 1843 on_changed => sub {
1621 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1622 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1624 } 1847 }
1625 ); 1848 );
1626 1849
1627 $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");
1628 $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,
1629 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1630 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 "
1631 . "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 "
1632 . "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.",
1633 on_changed => sub { 1857 on_changed => sub {
1635 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1636 0 1860 0
1637 }, 1861 },
1638 ); 1862 );
1639 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
1640 $table 1886 $table
1641} 1887}
1642 1888
1643sub autopickup_setup { 1889sub autopickup_setup {
1644 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
1650 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1651 ); 1897 );
1652 1898
1653 for ( 1899 for (
1654 ["General", 0, 0, 1900 ["General", 0, 0,
1655 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1656 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1657 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1658 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1659 ], 1904 ],
1660 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1661 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1932 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1933 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1934 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1935 ["Flesh" => PICKUP_FLESH],
1691 ], 1936 ],
1692 ["Weight/Value ratio", 2, 17] 1937 ["Value/Weight ratio", 2, 17]
1693 ) 1938 )
1694 { 1939 {
1695 my ($title, $x, $y, @bits) = @$_; 1940 my ($title, $x, $y, @bits) = @$_;
1696 $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]);
1697 1942
1709 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1710 } else { 1955 } else {
1711 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1712 } 1957 }
1713 1958
1714 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1715 if defined $::CONN; 1960 if defined $::CONN;
1716 1961
1717 0 1962 0
1718 }); 1963 });
1719 1964
1722 } 1967 }
1723 1968
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1969 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1970 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 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).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1973 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1974 on_changed => sub {
1729 my ($slider, $value) = @_; 1975 my ($slider, $value) = @_;
1730 1976
1731 $::CFG->{pickup} &= ~0xF; 1977 $::CFG->{pickup} &= ~0xF;
1735 }); 1981 });
1736 1982
1737 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1738 text => "set", 1984 text => "set",
1739 on_activate => sub { 1985 on_activate => sub {
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1987 if defined $::CONN;
1742 0 1988 0
1743 }); 1989 });
1744 1990
1745 $r 1991 $r
1746} 1992}
1747 1993
1748my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1749 type => sub { 1995 type => sub {
1996 use sort 'stable';
1750 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1751 }, 1998 },
1752 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1753 my $NOW = time; 2001 my $NOW = time;
1754 sort { 2002 sort {
1755 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;
1756 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;
1757 2005
1758 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1759 or $btime <=> $atime 2007 or $btime <=> $atime
1760 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1761 } @_ 2009 } @_
1762 }, 2010 },
1763 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1764 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1765 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1766 } @_ }, 2016 } @_
2017 },
1767); 2018);
1768 2019
1769sub inventory_widget { 2020sub inventory_widget {
1770 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1771 2022
1787 $::CFG->{inv_sort} = $_[1]; 2038 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2039 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 2040 },
1790 ); 2041 );
1791 $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);
1792 #TODO# update to weigh/maxweight 2043 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2044 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 2045
1795 $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);
1796 $sw1->add ($INV = new DC::UI::Inventory); 2047 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2048 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1858 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1859 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1860 } 2111 }
1861} 2112}
1862 2113
1863sub player_window { 2114sub make_playerbook {
1864 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1865 x => "center", 2116 x => "center",
1866 y => "center", 2117 y => "center",
1867 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1868 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
1902 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
1903 2154
1904 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
1905 2156
1906 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
1907 $plwin
1908} 2158}
1909 2159
1910sub keyboard_setup { 2160sub keyboard_setup {
1911 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
1912} 2162}
1913 2163
1914sub help_window { 2164sub make_help_window {
1915 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
1916 x => 'center', 2166 x => 'center',
1917 y => 'center', 2167 y => 'center',
1918 z => 4, 2168 z => 4,
1919 name => 'doc_browser', 2169 name => 'doc_browser',
2008 2258
2009 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2010 $win->show; 2260 $win->show;
2011 }; 2261 };
2012 2262
2013 $win 2263 $HELP_WINDOW = $win;
2014}
2015
2016sub open_string_query {
2017 my ($title, $cb, $txt, $tooltip) = @_;
2018 my $dialog = new DC::UI::Toplevel
2019 x => "center",
2020 y => "center",
2021 z => 50,
2022 force_w => $WIDTH * 4/5,
2023 title => $title;
2024
2025 $dialog->add (
2026 my $e = new DC::UI::Entry
2027 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2028 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2029 tooltip => $tooltip
2030 );
2031
2032 $e->grab_focus;
2033 $e->set_text ($txt) if $txt;
2034 $dialog->show;
2035} 2264}
2036 2265
2037sub open_quit_dialog { 2266sub open_quit_dialog {
2038 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2039 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2061 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2290 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2062 ); 2291 );
2063 $hb->add (new DC::UI::Button 2292 $hb->add (new DC::UI::Button
2064 text => "Quit anyway", 2293 text => "Quit anyway",
2065 expand => 1, 2294 expand => 1,
2066 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2295 on_activate => sub {
2296 crash "Quit anyway";
2297 EV::unloop EV::UNLOOP_ALL;
2298 },
2067 ); 2299 );
2068 } 2300 }
2069 2301
2070 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2071 $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;
2072} 2412}
2073 2413
2074sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2075 # find all tips 2415 # find all tips
2076 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2123 2463
2124 $dialog->show; 2464 $dialog->show;
2125 }; 2465 };
2126} 2466}
2127 2467
2128sub sdl_init {
2129 DC::SDL_Init
2130 and die "SDL::Init failed!\n";
2131}
2132
2133sub 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
2134 $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 }
2135 2491
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2492 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2493
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2494 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2495 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2496 $FAST = $CFG->{fast};
2141 2497
2498 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 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
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2501 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2502
2145 $SDL_ACTIVE = 1; 2503 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2504 $LAST_REFRESH = time - 0.01;
2147 2505
2173 2531
2174 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2175 padding => 0, 2533 padding => 0,
2176 z => 100, 2534 z => 100,
2177 force_x => "max", 2535 force_x => "max",
2178 force_y => 0; 2536 force_y => 20;
2179 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2180 2538
2181 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2182 2540
2183 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
2194 2552
2195 (new DC::UI::Frame 2553 (new DC::UI::Frame
2196 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2197 force_x => 0, 2555 force_x => 0,
2198 force_y => "max", 2556 force_y => "max",
2199 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2200 )->show; 2558 )->show;
2201 2559
2202 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2203 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2204 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2205 align => 0, 2563 align => 0,
2206 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2207 fontsize => 0.5, 2565 fontsize => 0.5,
2208 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2209 ); 2567 );
2210 2568
2211 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2212 title => "Minimap", 2570 title => "Minimap",
2213 name => "mapmap", 2571 name => "mapmap",
2214 x => 0, 2572 x => 0,
2215 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2216 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2217 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2218 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2219 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.",
2220 ), 2578 ),
2221 )->show; 2579 )->show;
2222 2580
2223 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2224 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2249 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2250 # 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
2251 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2252 name => "message_window2", 2610 name => "message_window2",
2253 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2254 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2255 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2256 ; 2615 ;
2257 2616
2258 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2278 . "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 "
2279 . "binding editor closes"); 2638 . "binding editor closes");
2280 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2281 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2282 2641
2283 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2284 2644
2285 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2286 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2287
2288# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2289# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2290
2291 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
2292
2293 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2294 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2295
2296 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Save Config",
2298 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2299 on_activate => sub {
2300 $::CFG->{layout} = DC::UI::get_layout;
2301 DC::write_cfg;
2302 status "Configuration Saved";
2303 0
2304 },
2305 );
2306
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2308 tooltip => "View Documentation");
2309
2310 $BUTTONBAR->add (new DC::UI::Button
2311 text => "Quit",
2312 tooltip => "Terminates the program",
2313 on_activate => sub {
2314 if ($CONN) {
2315 open_quit_dialog;
2316 } else {
2317 EV::unloop EV::UNLOOP_ALL;
2318 }
2319 0
2320 },
2321 );
2322
2323 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2326 } 2647 }
2327 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
2328 $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]);
2329} 2659}
2330 2660
2331sub video_shutdown { 2661sub video_shutdown {
2332 DC::OpenGL::shutdown; 2662 DC::OpenGL::shutdown;
2663 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2664
2334 undef $SDL_ACTIVE; 2665 undef $SDL_ACTIVE;
2335} 2666}
2336 2667
2337my %animate_object; 2668my %animate_object;
2338my $animate_timer; 2669my $animate_timer;
2339 2670
2340my $fps = 9; 2671my $fps = 9;
2341 2672
2342sub force_refresh { 2673sub force_refresh {
2343 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2344 $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;
2345 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2346 } 2677 }
2347 2678
2348 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2356my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2357 2688
2358my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2359 $NOW = EV::now; 2690 $NOW = EV::now;
2360 2691
2361 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2362 for DC::poll_events; 2693 for DC::poll_events;
2363 2694
2364 if (%animate_object) { 2695 if (%animate_object) {
2365 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2366 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2378sub animation_stop { 2709sub animation_stop {
2379 my ($widget) = @_; 2710 my ($widget) = @_;
2380 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2381} 2712}
2382 2713
2383%SDL_CB = (
2384 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2715 crash "SDL_QUIT";
2385 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2386 }, 2717};
2387 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2388 },
2389 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2390 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2391 }, 2721};
2392 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2393# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2394# 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#
2395# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2396# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2397# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2729};
2400 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2732 # alt-enter
2733 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2735 video_init;
2406 } else { 2736 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2408 } 2738 }
2409 update_modbox; 2739 update_modbox;
2410 }, 2740};
2411 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2412 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2413 update_modbox; 2743 update_modbox;
2414 }, 2744};
2415 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2416 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2417 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2418 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2419 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2420 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2421 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2422 audio_music_finished; 2752 audio_music_finished;
2423 }
2424 }, 2753 }
2425); 2754};
2426 2755
2427############################################################################# 2756#############################################################################
2428 2757
2429$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2759 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2432}; 2761};
2433 2762
2434{ 2763# due to mac os x + sdl combined braindamage, we need this contortion
2764sub main {
2765 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2767
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2769 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2770 } else {
2440 #TODO: compatibility cruft 2771 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2772 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2773 print STDERR "INFO: used old configuration file\n";
2443 } 2774 }
2444 2775
2445 DC::DB::Server::run; 2776 DC::DB::Server::run;
2446 2777
2447 if ($CFG->{db_schema} < 1) { 2778 if ($CFG->{db_schema} < 1) {
2448 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";
2449 DC::DB::nuke_db; 2780 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2781 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2782 DC::write_cfg;
2452 } 2783 }
2453 2784
2454 DC::DB::open_db; 2785 DC::DB::open_db;
2455 2786
2456 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2457 2788
2458 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2459 sdl_mode => 0, 2791 sdl_mode => undef,
2460 fullscreen => 1, 2792 fullscreen => 1,
2461 fast => 0, 2793 fast => 0,
2462 force_opengl11 => undef, 2794 force_opengl11 => undef,
2795 disable_alpha => 0,
2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2463 texture_compression => 1, 2798 texture_compression => 1,
2464 map_scale => 1, 2799 map_scale => 1,
2465 fow_enable => 1, 2800 fow_enable => 1,
2466 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2467 map_smoothing => 1, 2803 map_smoothing => 1,
2468 gui_fontsize => 1, 2804 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2807 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2808 stat_fontsize => 0.7,
2473 mapsize => 100, 2809 mapsize => 100,
2474 audio_enable => 1, 2810 audio_enable => 1,
2475 audio_hw_channels => 0, 2811 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2812 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2813 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2814 audio_mix_channels => 8,
2479 effects_enable => 1, 2815 effects_enable => 1,
2480 effects_volume => 1, 2816 effects_volume => 1,
2481 bgm_enable => 1, 2817 bgm_enable => 1,
2482 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2483 output_rate => "", 2819 output_rate => "",
2484 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2485 inv_sort => "mtime", 2821 inv_sort => "mtime",
2486 default => "profile", # default profile 2822 default => "profile", # default profile
2487 show_tips => 1, 2823 show_tips => 1,
2488 logview_max_par => 1000, 2824 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2490 ); 2829 );
2491 2830
2492 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2833 }
2495 2834
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2497 $PROFILE = $CFG->{profile}{default};
2498 2836
2499 # convert old bindings (only default profile matters) 2837 my $profile = 'default';
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2838
2501 while (my ($mod, $syms) = each %$bindings) { 2839 for (my $i = 0; $i < @args; $i++) {
2502 while (my ($sym, $cmds) = each %$syms) { 2840 if ($args[$i] =~ /^--?profile$/) {
2503 push @{ $PROFILE->{macro} }, { 2841 $profile = $args[$i + 1];
2504 accelkey => [$mod*1, $sym*1], 2842 splice @args, $i, 2, ();
2505 action => $cmds,
2506 }; 2843 $i = 0;
2844 } elsif ($args[$i] =~ /^--?h/) {
2845 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2846 exit 0;
2507 } 2847 }
2508 } 2848 }
2509 }
2510 2849
2511 sdl_init; 2850 $CFG->{profile}{$profile} ||= {};
2851 $PROFILE = $CFG->{profile}{$profile};
2852 $PROFILE->{host} ||= "gameserver.deliantra.net";
2512 2853
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2854 $PROFILE->{host} = $args[0] if @args > 0;
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2855 $PROFILE->{user} = $args[1] if @args > 1;
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2856 $PROFILE->{password} = $args[2] if @args > 2;
2516 2857
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2858 # convert old bindings (only default profile matters)
2859 if (my $bindings = delete $PROFILE->{bindings}) {
2860 while (my ($mod, $syms) = each %$bindings) {
2861 while (my ($sym, $cmds) = each %$syms) {
2862 push @{ $PROFILE->{macro} }, {
2863 accelkey => [$mod*1, $sym*1],
2864 action => $cmds,
2865 };
2866 }
2867 }
2868 }
2518 2869
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2870 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2871 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2520 2872
2521 { 2873 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2874 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2875 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2876 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2877 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2878 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2879 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2880 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2881 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2882 DejaVuSansMono-BoldOblique.ttf
2883 mona.ttf
2531 ); 2884 );
2532 2885
2533 DC::add_font $_ for @fonts; 2886 DC::add_font $_ for @fonts;
2534 2887
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2888 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2889 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2890
2538 $FONT_PROP->make_default; 2891 $FONT_PROP->make_default;
2539 2892
2540 DC::pango_init; 2893 DC::pango_init;
2541 } 2894 }
2542 2895
2543# compare mono (ft) vs. rgba (cairo) 2896# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2897# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2898# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2899# my $t1 = Time::HiRes::time;
2551# } 2904# }
2552# my $t2 = Time::HiRes::time; 2905# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2906# warn $t2-$t1;
2554# } 2907# }
2555 2908
2556 video_init; 2909 video_init;
2557 audio_init; 2910 audio_init;
2558} 2911 }
2559 2912
2560show_tip_of_the_day if $CFG->{show_tips}; 2913 show_tip_of_the_day if $CFG->{show_tips};
2561 2914
2562our $STARTUP_CANCEL = EV::idle sub { 2915 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2916 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2917 $startup_done->();
2565}; 2918 };
2566 2919
2920 debug_toggle 0;
2921
2567delete $SIG{__DIE__}; 2922 delete $SIG{__DIE__};
2568EV::loop; 2923 EV::loop;
2569 2924
2925 DC::write_cfg if $CFG->{config_autosave};
2926
2570#video_shutdown; 2927 #video_shutdown;
2571#audio_shutdown; 2928 #audio_shutdown;
2929
2572DC::OpenGL::quit; 2930 DC::OpenGL::quit;
2573DC::SDL_Quit; 2931 DC::SDL_Quit;
2574DC::DB::Server::stop; 2932 DC::DB::Server::stop;
2933}
2934
2935DC::SDL_braino; # see sub above
2575 2936
2576=head1 NAME 2937=head1 NAME
2577 2938
2578deliantra - A Deliantra MORPG game client 2939deliantra - A Deliantra MORPG game client
2579 2940
2580=head1 SYNOPSIS 2941=head1 SYNOPSIS
2581 2942
2582Just run it - no commandline arguments are supported. 2943 deliantra [--profile name] [host [user [password]]]
2944 deliantra --help
2583 2945
2584=head1 USAGE 2946=head1 USAGE
2585 2947
2586deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2948The deliantra client utilises OpenGL for all UI elements and the game. It
2587be used in fullscreen mode and interactively. 2949is supposed to be used in fullscreen mode and interactively.
2588 2950
2589=head1 DEBUGGING 2951=head1 DEBUGGING
2590 2952
2591
2592CFPLUS_DEBUG - environment variable 2953DELIANTRA_DEBUG - environment variable
2593 2954
2594 1 draw borders around widgets 2955 1 draw borders around widgets
2595 2 add low-level widget info to tooltips 2956 2 add low-level widget info to tooltips
2596 4 show fps 2957 4 show fps
2597 8 suppress tooltips 2958 8 suppress tooltips
2959 16 show bandwidth downstream
2598 2960
2599=head1 AUTHOR 2961=head1 AUTHOR
2600 2962
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2963Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2964
2603 2965
2604 2966

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines