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.61 by root, Fri Aug 22 18:20:17 2008 UTC vs.
Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC

5 use Coro; 5 use Coro;
6 use Coro::EV; 6 use Coro::EV;
7 use Coro::Debug; 7 use Coro::Debug;
8 our $debug = new_unix_server Coro::Debug "/tmp/dc"; 8 our $debug = new_unix_server Coro::Debug "/tmp/dc";
9 '; 9 ';
10 die if $@;
10} 11}
11 12
12# do splash-screen thingy on win32 13# do splash-screen thingy on win32
13my $startup_done = sub { }; 14my $startup_done = sub { };
14BEGIN { 15BEGIN {
21 22
22 Win32::GUI::SplashScreen::Show ( 23 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 24 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 25 );
25 26
27 # initialise the resolver now, as vista forces us back to the desktop
28 # when doing this later.
29 require AnyEvent::DNS;
30 AnyEvent::DNS::resolver ();
31
26 $startup_done = sub { 32 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 33 Win32::GUI::SplashScreen::Done (1);
28 }; 34 };
29 } 35 }
30} 36}
31 37
32use strict; 38use common::sense;
33use utf8;
34 39
35use Carp 'verbose'; 40use Carp 'verbose';
36 41
37# do things only needed for single-binary version (par) 42# do things only needed for single-binary version (par)
38BEGIN { 43BEGIN {
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
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";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
81 } 64 }
82 65
83 unshift @INC, $root; 66 unshift @INC, $root;
84 } 67 }
85} 68}
86 69
87# prepend private library directory 70# prepend private library directory and prepare env
88BEGIN { 71BEGIN {
89 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 74 if (-d $path) {
92 unshift @INC, $path; 75 unshift @INC, $path;
97 80
98# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 83 if %PAR::LibCache;
101 84
102use Time::HiRes 'time';
103use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
104use List::Util qw(max min); 88use List::Util qw(max min);
105 89
106use Deliantra; 90use Deliantra;
107use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
108 92
109use AnyEvent::DNS; 93use AnyEvent::Util ();
110use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
111 96
112use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
113 99
114use DC; 100use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
116use DC::OpenGL (); 114use DC::OpenGL ();
117use DC::Protocol; 115use DC::Protocol;
118use DC::DB; 116use DC::DB;
119use DC::UI; 117use DC::UI;
120use DC::UI::Canvas; 118use DC::UI::Canvas;
121use DC::UI::Inventory; 119use DC::UI::Inventory;
122use DC::UI::SpellList; 120use DC::UI::SpellList;
123use DC::UI::Dockable; 121use DC::UI::Dockable;
124use DC::UI::Dockbar; 122use DC::UI::Dockbar;
125use DC::UI::MessageWindow;
126use DC::UI::ChatView; 123use DC::UI::ChatView;
127use DC::MessageDistributor; 124use DC::MessageDistributor;
128use DC::Pod; 125use DC::Pod;
129use DC::MapWidget; 126use DC::MapWidget;
130use DC::Macro; 127use DC::Macro;
131 128
132$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
133$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
134 131
135$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
137}; 135};
138 136
139my $MAX_FPS = 60; 137my $MAX_FPS = 60;
140 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
141our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
142 142
143our $LAST_REFRESH; 143our $LAST_REFRESH;
144our $NOW; 144our $NOW;
145 145
146our $CFG; 146our $CFG;
147our $CONN;
148our $PROFILE; # current profile 147our $PROFILE; # current profile
149our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
150 150
151our $WANT_REFRESH; 151our $WANT_REFRESH;
152 152
153our $MODE_SLIDER; 153our $MODE_SLIDER;
154our $CAVEAT_LABEL; 154our $CAVEAT_LABEL;
161our $FONTSIZE; 161our $FONTSIZE;
162 162
163our $FONT_PROP; 163our $FONT_PROP;
164our $FONT_FIXED; 164our $FONT_FIXED;
165 165
166our $CONN;
167
166our $MAP; 168our $MAP;
167our $MAPMAP; 169our $MAPMAP;
168our $MAPWIDGET; 170our $MAPWIDGET;
169our $COMPLETER; 171our $COMPLETER;
170our $BUTTONBAR; 172our $MENUFRAME; # the rectangle at the top
173our $MENUBAR; # the hbox at the top
174our $MENUPOPUP;
175our $BUTTONBAR; # the menu buttons
171our $METASERVER; 176our $METASERVER;
172our $LOGIN_BUTTON; 177our $LOGIN_BUTTON;
173our $QUIT_DIALOG; 178our $QUIT_DIALOG;
174our $HOST_ENTRY; 179our $HOST_ENTRY;
175our $FULLSCREEN_ENABLE; 180our $FULLSCREEN_ENABLE;
201our $FLOORBOX; 206our $FLOORBOX;
202our $GAUGES; 207our $GAUGES;
203our $STATWIDS; 208our $STATWIDS;
204 209
205our $SDL_ACTIVE; 210our $SDL_ACTIVE;
206our %SDL_CB; 211our @SDL_CB;
207 212
208our $ALT_ENTER_MESSAGE; 213our $ALT_ENTER_MESSAGE;
209our $STATUSBOX; 214our $STATUSBOX;
210our $MODBOX; 215our $MODBOX;
211our $DEBUG_STATUS; 216our $DEBUG_STATUS;
212 217
213our $INV; 218our $INV;
214our $INVR; 219our $INVR;
215our $INVR_HB; 220our $INVR_HB;
221
222#############################################################################
223
224# write a crash message blockingly to the socket, if possible
225# this is a bit too complicated for my tastes, but it was easy.
226*crash = sub($;$) {
227 my ($msg, $backtrace) = @_;
228
229 warn $msg;
230
231 return unless $CONN;
232
233 my $fh = $CONN->{fh}
234 or return;
235
236 my $buf = delete $CONN->{wbuf};
237
238 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
239
240 AnyEvent::Util::fh_nonblocking $fh, 0;
241 syswrite $fh, $buf;
242 AnyEvent::Util::fh_nonblocking $fh, 1;
243
244 $msg =~ s/\s+$//;
245
246 # backtrace as second step, in case it crashes, too
247 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
248 if $backtrace;
249};
250
251sub clienterror($;$) {
252 my ($msg, $backtrace) = @_;
253
254 warn $msg;
255
256 return unless $CONN;
257
258 $CONN->send_exti_msg (clientlog => $msg);
259 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
260}
216 261
217############################################################################# 262#############################################################################
218 263
219sub status { 264sub status {
220 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 265 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
302 or return; 347 or return;
303 348
304 $meta->{data} 349 $meta->{data}
305 or return; 350 or return;
306 351
307 # if its a jingle, play it as ambient music 352 # if it's a jingle, play it as ambient music
308 if ($meta->{data}{jingle}) { 353 if ($meta->{data}{jingle}) {
309 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 354 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
310 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 355 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
311 &audio_music_push ($face); 356 &audio_music_push ($face);
312 } 357 }
313 } else { 358 } else {
314 # fetch from database 359 # fetch from database
315 DC::DB::get res_data => $meta->{name}, sub { 360 DC::DB::get res_data => $meta->{name}, sub {
316 my $rwops = new DC::RW $_[0]; 361 my $rwops = new DC::RW $_[0];
317 my $chunk = new DC::MixChunk $rwops 362 my $chunk = new DC::MixChunk $rwops
318 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 363 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
319 $chunk->volume (($meta->{data}{volume} || 1) * 128); 364 $chunk->volume (($meta->{data}{volume} || 1) * 128);
320 $AUDIO_CHUNK{$face} = $chunk; 365 $AUDIO_CHUNK{$face} = $chunk;
321 366
322 audio_sound_push ($face); 367 audio_sound_push ($face);
323 }; 368 };
370 415
371 audio_music_update_volume; 416 audio_music_update_volume;
372 417
373 $MUSIC_PLAYING_DATA = \$_[0]; 418 $MUSIC_PLAYING_DATA = \$_[0];
374 419
420 $meta->{path} or length $_[0]
421 or return clienterror "empty music face from res_data ($meta->{face})";#d#
422
375 my $rwops = $meta->{path} 423 my $rwops = $meta->{path}
376 ? new_from_file DC::RW $meta->{path} 424 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
377 : new DC::RW $$MUSIC_PLAYING_DATA; 425 : new DC::RW $$MUSIC_PLAYING_DATA;
378 426
379 $MUSIC_PLAYER = new DC::MixMusic $rwops 427 $MUSIC_PLAYER = new DC::MixMusic $rwops
380 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 428 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
381 429
382 my $NOW = time; 430 my $NOW = time;
383 431
384 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 432 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
385 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 433 my $pos = $MUSIC_PLAYING_META->{stop_pos};
471 audio_music_push; 519 audio_music_push;
472} 520}
473 521
474sub audio_init { 522sub audio_init {
475 if ($CFG->{audio_enable}) { 523 if ($CFG->{audio_enable}) {
524 if (length $CFG->{audio_driver}) {
525 local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
526 DC::SDL_Init DC::SDL_INIT_AUDIO
527 and die "SDL::Init failed!\n";
528 } else {
529 DC::SDL_Init DC::SDL_INIT_AUDIO
530 and die "SDL::Init failed!\n";
531 }
532
476 $ENV{MIX_EFFECTSMAXSPEED} = 1; 533 $ENV{MIX_EFFECTSMAXSPEED} = 1;
477 $SDL_MIXER = !DC::Mix_OpenAudio 534 $SDL_MIXER = !DC::Mix_OpenAudio
478 $CFG->{audio_hw_frequency}, 535 $CFG->{audio_hw_frequency},
479 DC::MIX_DEFAULT_FORMAT, 536 DC::MIX_DEFAULT_FORMAT,
480 $CFG->{audio_hw_channels}, 537 $CFG->{audio_hw_channels},
494 sub audio_tab_update; 551 sub audio_tab_update;
495 audio_tab_update; 552 audio_tab_update;
496} 553}
497 554
498sub audio_shutdown { 555sub audio_shutdown {
556 if ($SDL_MIXER) {
557 DC::MixMusic::halt;
558 DC::Mix_AllocateChannels 0;
559 }
560
499 undef $MUSIC_PLAYER; 561 undef $MUSIC_PLAYER;
500 undef $MUSIC_PLAYING_META; 562 undef $MUSIC_PLAYING_META;
501 undef $MUSIC_PLAYING_DATA; 563 undef $MUSIC_PLAYING_DATA;
502 564
503 $MUSIC_WANT = []; 565 $MUSIC_WANT = [];
505 %AUDIO_PLAY = (); 567 %AUDIO_PLAY = ();
506 %AUDIO_CHUNK = (); 568 %AUDIO_CHUNK = ();
507 569
508 DC::Mix_CloseAudio if $SDL_MIXER; 570 DC::Mix_CloseAudio if $SDL_MIXER;
509 undef $SDL_MIXER; 571 undef $SDL_MIXER;
572
573 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
510} 574}
511 575
512############################################################################# 576#############################################################################
513 577
514sub destroy_query_dialog { 578sub destroy_query_dialog {
743} 807}
744 808
745sub dc_connect { 809sub dc_connect {
746 my ($host, $port) = @_; 810 my ($host, $port) = @_;
747 811
748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 812 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
813 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
749 814
750 $CONN = 815 $CONN =
751 new DC::Protocol 816 new DC::Protocol
752 host => $host, 817 host => $host,
753 port => $port, 818 port => $port,
754 user => $PROFILE->{user}, 819 user => $PROFILE->{user},
755 pass => $PROFILE->{password}, 820 pass => $PROFILE->{password},
756 mapw => $mapsize, 821 mapw => $mapw,
757 maph => $mapsize, 822 maph => $maph,
758 823
824 c_version => {
825 client => "deliantra",
759 client => "$DC::VERSION $] $^O", 826 clientver => $DC::VERSION,
827 gl_vendor => DC::OpenGL::gl_vendor,
828 gl_version => DC::OpenGL::gl_version,
829 },
760 830
761 map_widget => $MAPWIDGET, 831 map_widget => $MAPWIDGET,
762 statusbox => $STATUSBOX, 832 statusbox => $STATUSBOX,
763 map => $MAP, 833 map => $MAP,
764 mapmap => $MAPMAP, 834 mapmap => $MAPMAP,
770 840
771 on_connect => sub { 841 on_connect => sub {
772 if ($_[0]) { 842 if ($_[0]) {
773 DC::lowdelay fileno $CONN->{fh}; 843 DC::lowdelay fileno $CONN->{fh};
774 844
775 status "login successful"; 845 status "successfully connected to the server";
776 } else { 846 } else {
777 undef $CONN; 847 undef $CONN;
778 status "unable to connect: $!"; 848 status "unable to connect: $!";
779 stop_game(); 849 stop_game();
780 } 850 }
782 ; 852 ;
783} 853}
784 854
785sub start_game { 855sub start_game {
786 status "logging in..."; 856 status "logging in...";
857
858 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
859 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
860 or return status "$server: unable to parse server address, try an empty field.";
787 861
788 $LOGIN_BUTTON->set_text ("Logout"); 862 $LOGIN_BUTTON->set_text ("Logout");
789 $SETUP_DIALOG->hide; 863 $SETUP_DIALOG->hide;
790
791 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
792 864
793 $MAP = new DC::Map; 865 $MAP = new DC::Map;
794 866
795 # hack to make SURE we find the IP address all right 867 # hack to make SURE we find the IP address all right
796 # can be removed once AnyEvent::DNS is proven stable. 868 # can be removed once AnyEvent::DNS is proven stable.
797 if ($host eq "gameserver.deliantra.net") { 869 if ($host eq "gameserver.deliantra.net") {
798 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 870 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
799 if ($_[0] ne "80.101.114.108") { # Perl 871 if ($_[0] ne "80.101.114.108") { # P-e-r-l
872 status "dns failure, trying differently";
873 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
874 unless (defined $host) {
800 status "dns failure, using hardcoded address"; 875 status "dns failure, using hardcoded address";
801 $host = "129.13.162.95"; 876 $host = "194.126.175.154";
877 }
802 } 878 }
803 879
804 dc_connect $host, $port; 880 dc_connect $host, $port;
805 }; 881 };
806 } else { 882 } else {
807 dc_connect $host, $port; 883 dc_connect $host, $port;
808 } 884 }
809} 885}
810 886
811sub stop_game { 887sub stop_game {
888 crash "stop_game";
889
812 $LOGIN_BUTTON->set_text ("Login / Register"); 890 $LOGIN_BUTTON->set_text ("Login / Register");
813 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 891 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
814 $SETUP_DIALOG->show; 892 $SETUP_DIALOG->show;
815 $PL_WINDOW->hide; 893 $PL_WINDOW->hide;
816 $SPELL_LIST->clear_spells; 894 $SPELL_LIST->clear_spells;
830} 908}
831 909
832sub graphics_setup { 910sub graphics_setup {
833 my $vbox = new DC::UI::VBox; 911 my $vbox = new DC::UI::VBox;
834 912
913 {
914 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
915
835 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 916 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
836 917
837 my $row = 0; 918 my $row = 0;
838 919
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
840 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 921 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
841 can_events => 1, 922 can_events => 1,
842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 923 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
843 924
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 925 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 926 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1, 927 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as " 928 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues " 929 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or " 930 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card."); 931 . "by installing the right driver for your graphics card.");
851 932
933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
934 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
935 value => $CFG->{uitheme},
936 options => [
937 [wood => "Wood (the default)"],
938 [plain => "Plain (very)"],
939 [blue => "Blue (dark)"],
940 [metal => "Metal (light)"],
941 ],
942 tooltip => "Choose the User Interface theme that you like most :)",
943 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
944 );
945
852 my $vidmode_tooltip = 946 my $vidmode_tooltip =
853 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 947 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 948 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
855 949
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 950 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 951 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
858 952
859 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 953 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
954 c_rescale => 1,
860 force_w => $WIDTH * 0.1, expand => 1, 955 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ], 956 range => [ ($CFG->{sdl_mode}) x 3 ],
862 tooltip => $vidmode_tooltip); 957 tooltip => $vidmode_tooltip);
863 $hbox->add (my $mode_label = new DC::UI::Label 958 $hbox->add (my $mode_label = new DC::UI::Label
864 height => 0.8, template => "9999x9999@9+9", 959 height => 0.8, template => "9999x9999@9+9",
865 can_events => 1, tooltip => $vidmode_tooltip); 960 can_events => 1, tooltip => $vidmode_tooltip);
866 961
867 $MODE_SLIDER->connect (changed => sub { 962 $MODE_SLIDER->connect (changed => sub {
868 my ($self, $value) = @_;
869
870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
872 });
873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
877 state => $CFG->{fullscreen},
878 tooltip => "Bring the client into fullscreen mode.",
879 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
880 );
881
882 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
883 $table->add_at (1, $row++, new DC::UI::CheckBox
884 state => $CFG->{force_opengl11},
885 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
886 . "higher memory usage and slower performance. It will, however, help tremendously on "
887 . "cards that claim to support a feature but fall back to software rendering. "
888 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
889 . "but cards and drivers from other vendors (ATI) are often just as bad. "
890 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_; 963 my ($self, $value) = @_;
964
965 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
966 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
967 });
968 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
969
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
971 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
972 state => $CFG->{fullscreen},
973 tooltip => "Bring the client into fullscreen mode.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
975 );
976
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
978 $table->add_at (1, $row++, new DC::UI::CheckBox
979 state => $CFG->{force_opengl11},
980 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
981 . "higher memory usage and slower performance. It will, however, help tremendously on "
982 . "cards that claim to support a feature but fall back to software rendering. "
983 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
984 . "but cards and drivers from other vendors (ATI) are often just as bad. "
985 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
986 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
987 );
988
989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
990 $table->add_at (1, $row++, new DC::UI::CheckBox
991 state => $CFG->{disable_alpha},
992 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
993 . "by disabling a number of textures and transparency effects. Normally, these "
994 . "effects do not cost a lot of resources, but some graphics cards might fall "
995 . "back to extremely slow rendering if this is enabled. If disabling this option "
996 . "noticably improves the framerate of the client please report this! "
997 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
998 on_changed => sub {
999 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value; 1000 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 1001 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1002 0
907 0 1003 }
908 } 1004 );
909 );
910 1005
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
912 $table->add_at (1, $row++, new DC::UI::CheckBox 1007 $table->add_at (1, $row++, new DC::UI::CheckBox
913 state => $CFG->{texture_compression}, 1008 state => $CFG->{texture_compression},
914 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 1009 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
915 . "will save a lot of memory and increase performance. The compression algorithm " 1010 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
916 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 1011 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
917 . "forced OpenGL 1.1 mode.", 1012 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
919 ); 1014 );
920 1015
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
922 $table->add_at (1, $row++, new DC::UI::CheckBox 1017 $table->add_at (1, $row++, new DC::UI::CheckBox
923 state => $CFG->{fast}, 1018 state => $CFG->{fast},
924 tooltip => "Lower the visual quality considerably to speed up rendering.", 1019 tooltip => "Lower the visual quality considerably to speed up rendering.",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1020 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
926 ); 1021 );
927 1022
928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
929 $table->add_at (1, $row++, new DC::UI::Slider 1024 $table->add_at (1, $row++, new DC::UI::Slider
930 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1025 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
931 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1026 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
932 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1027 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
933 ); 1028 );
934 1029
935 $table->add_at (1, $row++, new DC::UI::Button 1030 $table->add_at (1, $row++, new DC::UI::Button
936 expand => 1, text => "Apply", 1031 expand => 1, text => "Apply",
937 tooltip => "Apply the video settings above.", 1032 tooltip => "Apply the video settings above.",
938 on_activate => sub { 1033 on_activate => sub {
939 video_shutdown (); 1034 video_shutdown ();
940 video_init (); 1035 video_init ();
1036 0
941 0 1037 }
942 } 1038 );
943 ); 1039 }
944 1040
1041 {
1042 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1043
1044 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1045
1046 my $row = 0;
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox 1048 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement}, 1049 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1050 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1051 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.", 1052 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
952 ); 1054 );
953 1055
1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1057 $table->add_at (1, $row++, new DC::UI::CheckBox
1058 state => $CFG->{smooth_transitions},
1059 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1060 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1061 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1062 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1063 );
1064
1065
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1066 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
955 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1068 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
957 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1069 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
958 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1070 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
959 ); 1071 );
960 1072
961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1073 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
962 $table->add_at (1, $row++, new DC::UI::CheckBox 1074 $table->add_at (1, $row++, new DC::UI::CheckBox
963 state => $CFG->{map_smoothing}, 1075 state => $CFG->{map_smoothing},
964 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1076 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
965 . "This increases load on the graphics subsystem and works only with TRT servers. " 1077 . "This increases load on the graphics subsystem and works only with TRT servers. "
966 . "Changes take effect at next login only.", 1078 . "Changes take effect at next login only.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1079 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
968 ); 1080 );
969 1081
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1082 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
971 $table->add_at (1, $row++, new DC::UI::CheckBox 1083 $table->add_at (1, $row++, new DC::UI::CheckBox
972 state => $CFG->{fow_enable}, 1084 state => $CFG->{fow_enable},
973 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1085 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1086 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
975 ); 1087 );
976 1088
1089 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1090 $table->add_at (1, $row++, new DC::UI::ImageButton
1091 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1092 bg => [0.3, 0.3, 0.2],
1093 force_w => 64,
1094 force_h => 64,
1095 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.",
1096 on_activate => sub {
1097 my ($self) = @_;
1098 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1099 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1100 $MAPWIDGET->update;
1101 }
1102 );
1103
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1104 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
978 $table->add_at (1, $row++, new DC::UI::Slider 1105 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1106 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
980 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1107 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
981 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1108 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
982 ); 1109 );
983 1110
984 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1111 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
985 $table->add_at (1, $row++, new DC::UI::Slider 1112 $table->add_at (1, $row++, new DC::UI::Slider
986 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1113 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
987 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1114 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
988 . "but you still need to press apply to correctly re-layout the widget.", 1115 . "but you still need to press apply to correctly re-layout the widget.",
989 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1116 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
990 ); 1117 );
991 1118
992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1119 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
993 $table->add_at (1, $row++, new DC::UI::Slider 1120 $table->add_at (1, $row++, new DC::UI::Slider
994 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1121 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
995 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1122 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
996 on_changed => sub { 1123 on_changed => sub {
997 $CFG->{gauge_fontsize} = $_[1]; 1124 $CFG->{gauge_fontsize} = $_[1];
998 &set_gauge_window_fontsize; 1125 &set_gauge_window_fontsize;
1126 0
999 0 1127 }
1000 } 1128 );
1001 );
1002 1129
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1130 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1131 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [$CFG->{gauge_size}, 0.2, 0.8], 1132 range => [$CFG->{gauge_size}, 0.2, 0.8],
1006 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1133 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1007 on_changed => sub { 1134 on_changed => sub {
1008 $CFG->{gauge_size} = $_[1]; 1135 $CFG->{gauge_size} = $_[1];
1009 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1136 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1137 0
1010 0 1138 }
1011 } 1139 );
1012 ); 1140 }
1013 1141
1014 $vbox 1142 $vbox
1015} 1143}
1016 1144
1017our $AUDIO_HW_CHUNKSIZE; 1145our $AUDIO_HW_CHUNKSIZE;
1029 ]); 1157 ]);
1030 1158
1031 my $text = !$freq 1159 my $text = !$freq
1032 ? "audio is off" 1160 ? "audio is off"
1033 : "audio is enabled\n" 1161 : "audio is enabled\n"
1162 . "driver: " . DC::SDL_AudioDriverName . "\n"
1034 . "frequency (Hz): $freq\n" 1163 . "frequency (Hz): $freq\n"
1035 . "channels: $chans"; 1164 . "channels: $chans\n"
1165 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1166 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1036 1167
1037 $AUDIO_INFO->set_text ($text); 1168 $AUDIO_INFO->set_text ($text);
1038} 1169}
1039 1170
1040sub audio_setup { 1171sub audio_setup {
1043 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1174 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
1044 1175
1045 my $row = 0; 1176 my $row = 0;
1046 1177
1047 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable"); 1178 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
1048 $table->add_at (1, $row++, new DC::UI::CheckBox 1179 $table->add_at (1, $row, new DC::UI::CheckBox
1049 state => $CFG->{audio_enable}, 1180 state => $CFG->{audio_enable},
1050 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.", 1181 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.",
1051 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1182 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
1183 );
1184 $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
1185
1186 $driver->add (new DC::UI::Label align => 1, text => " Audio driver override");
1187 $driver->add (new DC::UI::Entry
1188 text => $CFG->{audio_driver},
1189 template => "dsound1234",
1190 tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1191 . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1192 . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1193 . "or other system-specific drivers. Selecting the wrong driver here will simply result"
1194 . "in no sound.",
1195 on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1052 ); 1196 );
1053 1197
1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects"); 1198 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
1055 $table->add_at (1, $row, new DC::UI::CheckBox 1199 $table->add_at (1, $row, new DC::UI::CheckBox
1056 expand => 1, state => $CFG->{effects_enable}, 1200 expand => 1, state => $CFG->{effects_enable},
1069 ); 1213 );
1070 1214
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1215 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1072 $table->add_at (1, $row, new DC::UI::CheckBox 1216 $table->add_at (1, $row, new DC::UI::CheckBox
1073 expand => 1, state => $CFG->{bgm_enable}, 1217 expand => 1, state => $CFG->{bgm_enable},
1074 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1218 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1075 on_changed => sub { 1219 on_changed => sub {
1076 $CFG->{bgm_enable} = $_[1]; 1220 $CFG->{bgm_enable} = $_[1];
1077 $CONN->update_fx_want if $CONN; 1221 $CONN->update_fx_want if $CONN;
1078 audio_music_push; 1222 audio_music_push;
1079 1 1223 1
1090 c_colspan => 2, expand => 1, 1234 c_colspan => 2, expand => 1,
1091 value => $CFG->{audio_hw_frequency}, 1235 value => $CFG->{audio_hw_frequency},
1092 options => [ 1236 options => [
1093 [ 0, "default" , "Use System Default"], 1237 [ 0, "default" , "Use System Default"],
1094 [11025, "11 kHz" , "11kHz (low quality)"], 1238 [11025, "11 kHz" , "11kHz (low quality)"],
1095 [22050, "22 kHz" , "22kHz (reduced quality)"], 1239 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1096 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1240 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1097 [48000, "48 kHz" , "48kHz (studio quality)"], 1241 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1098 ], 1242 ],
1099 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1243 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1100 on_changed => sub { 1244 on_changed => sub {
1101 $CFG->{audio_hw_frequency} = $_[1]; 1245 $CFG->{audio_hw_frequency} = $_[1];
1102 audio_tab_update; 1246 audio_tab_update;
1126 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency"); 1270 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1127 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1271 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1128 c_colspan => 2, expand => 1, 1272 c_colspan => 2, expand => 1,
1129 value => $CFG->{audio_hw_chunksize}, 1273 value => $CFG->{audio_hw_chunksize},
1130 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1274 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1131 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1275 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1132 on_changed => sub { 1276 on_changed => sub {
1133 $CFG->{audio_hw_chunksize} = $_[1]; 1277 $CFG->{audio_hw_chunksize} = $_[1];
1134 audio_tab_update; 1278 audio_tab_update;
1135 1 1279 1
1136 } 1280 }
1180} 1324}
1181 1325
1182sub make_gauge_window { 1326sub make_gauge_window {
1183 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1327 my $gh = int $HEIGHT * $CFG->{gauge_size};
1184 1328
1185 my $win = new DC::UI::Frame ( 1329 $GAUGES->{win} = my $win = new DC::UI::Frame (
1186 force_x => 0, 1330 force_x => 0,
1187 force_y => "max", 1331 force_y => "max",
1188 force_w => $WIDTH, 1332 force_w => $WIDTH,
1189 force_h => $gh, 1333 force_h => $gh,
1190 ); 1334 );
1206 (new DC::UI::Empty expand => 1), 1350 (new DC::UI::Empty expand => 1),
1207 (my $hb = new DC::UI::HBox), 1351 (my $hb = new DC::UI::HBox),
1208 ], 1352 ],
1209 ); 1353 );
1210 1354
1211 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1355 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1212 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1356 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1213 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1357 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1214 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1358 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1215
1216 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1217 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1218 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1219 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1220
1221 $GAUGES = {
1222 exp => $exp, prg => $prg, sklprg => $sklprg,
1223 win => $win, range => $rng,
1224 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1225 };
1226 1359
1227 &set_gauge_window_fontsize; 1360 &set_gauge_window_fontsize;
1228 1361
1229 $win 1362 $win
1363}
1364
1365our $BW_WATCHER;
1366
1367sub debug_toggle($) {
1368 $DELIANTRA_DEBUG ^= $_[0];
1369
1370 if ($DELIANTRA_DEBUG & 16) {
1371 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1372 return unless $CONN;
1373 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1374 $CONN->{octets_in} = 0;
1375 };
1376 } else {
1377 undef $BW_WATCHER;
1378 }
1379
1230} 1380}
1231 1381
1232sub debug_setup { 1382sub debug_setup {
1233 my $table = new DC::UI::Table; 1383 my $table = new DC::UI::Table;
1234 1384
1235 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1385 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1236 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1386 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1237 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1387 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1238 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1388 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1239 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1389 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1240 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1390 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1241 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1391 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1242 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1392 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1393 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1394 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1395
1243 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1396 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1244
1245 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1397 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1246 1398
1247 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1399 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1248 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1400 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1249 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1401 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1250 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1402 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1371 para => ["Paralysation", 1523 para => ["Paralysation",
1372 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1524 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1373 deat => ["Death", 1525 deat => ["Death",
1374 "<b>Death</b> (resistance against death spells)"], 1526 "<b>Death</b> (resistance against death spells)"],
1375 phys => ["Physical", 1527 phys => ["Physical",
1376 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"], 1528 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
1377 blind => ["Blind", 1529 blind => ["Blind",
1378 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1530 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1379 fear => ["Fear", 1531 fear => ["Fear",
1380 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"], 1532 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1381 tund => ["Turn undead", 1533 tund => ["Turn undead",
1571 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1723 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1572 ); 1724 );
1573 1725
1574 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1726 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1575 $table->add_at (1, 4, new DC::UI::Entry 1727 $table->add_at (1, 4, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{user}, 1728 text => $PROFILE->{user},
1577 tooltip => "The name of your character on the server.", 1729 tooltip => "The name of your character on the server. The name is case-sensitive!",
1578 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1730 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1579 ); 1731 );
1580 1732
1581 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1733 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1582 $table->add_at (1, 5, new DC::UI::Entry 1734 $table->add_at (1, 5, new DC::UI::Entry
1583 text => $CFG->{profile}{default}{password}, 1735 text => $PROFILE->{password},
1584 hidden => 1, 1736 hidden => 1,
1585 tooltip => "The password for your character.", 1737 tooltip => "The password for your character.",
1586 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1738 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1587 ); 1739 );
1588 1740
1589 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1741 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1590 expand => 1, 1742 expand => 1,
1591 text => "Login / Register", 1743 text => "Login / Register",
1597 }, 1749 },
1598 ); 1750 );
1599 1751
1600 $vbox->add (new DC::UI::FancyFrame 1752 $vbox->add (new DC::UI::FancyFrame
1601 label => "How to Play", 1753 label => "How to Play",
1602 min_h => 200, 1754 min_h => 240,
1603 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1755 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1604 markup => 1756 markup =>
1605 "First select a suitable video resolution in the Graphics tab, above.\n\n" 1757 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1606 . "Then register a new account (or use an existibg one if you have one). " 1758 . "Then register a new account (or use an existing one if you have one). "
1607 . "To register an account, choose a username that hasn't been taken yet and " 1759 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1608 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1760 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1609 ), 1761 ),
1610 ); 1762 );
1611 1763
1612 $vbox 1764 $vbox
1627 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1779 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1628 1780
1629 $vbox->add ( 1781 $vbox->add (
1630 $HOST_ENTRY = new DC::UI::Entry 1782 $HOST_ENTRY = new DC::UI::Entry
1631 expand => 1, 1783 expand => 1,
1632 text => $CFG->{profile}{default}{host}, 1784 text => $PROFILE->{host},
1633 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1785 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1634 on_changed => sub { 1786 on_changed => sub {
1635 my ($self, $value) = @_; 1787 my ($self, $value) = @_;
1636 $CFG->{profile}{default}{host} = $value; 1788 $PROFILE->{host} = $value;
1637 1 1789 1
1638 } 1790 }
1639 ); 1791 );
1640 1792
1641 if (0) { #d# disabled 1793 if (0) { #d# disabled
1684 1836
1685 my $row = 0; 1837 my $row = 0;
1686 1838
1687 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1688 $table->add_at (1, $row++, new DC::UI::CheckBox 1840 $table->add_at (1, $row++, new DC::UI::CheckBox
1841 c_colspan => 2,
1689 state => $CFG->{show_tips}, 1842 state => $CFG->{show_tips},
1690 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1843 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1691 on_changed => sub { 1844 on_changed => sub {
1692 my ($self, $value) = @_; 1845 my ($self, $value) = @_;
1693 $CFG->{show_tips} = $value; 1846 $CFG->{show_tips} = $value;
1695 } 1848 }
1696 ); 1849 );
1697 1850
1698 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1851 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1699 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1852 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1853 c_colspan => 2,
1700 text => $CFG->{logview_max_par}, 1854 text => $CFG->{logview_max_par},
1701 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1855 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1702 . "sends more messages than this number, older messages get removed to save memory and " 1856 . "sends more messages than this number, older messages get removed to save memory and "
1703 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1857 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1704 on_changed => sub { 1858 on_changed => sub {
1706 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1860 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1707 0 1861 0
1708 }, 1862 },
1709 ); 1863 );
1710 1864
1865 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1866 $table->add_at (1, $row, new DC::UI::CheckBox
1867 state => $CFG->{config_autosave},
1868 tooltip => "Normally, configuration settings and the user interface layout "
1869 . "are saved on client exit. You can disable this behaviour by "
1870 . "unchecking this checkbox.",
1871 on_changed => sub {
1872 my ($self, $value) = @_;
1873 $CFG->{config_autosave} = $value;
1874 0
1875 }
1876 );
1877 $table->add_at (2, $row++, new DC::UI::Button
1878 text => "Save Now",
1879 tooltip => "Use this to manually save configuration and UI layout when "
1880 . "autosave is disabled.",
1881 on_activate => sub {
1882 DC::write_cfg;
1883 0
1884 }
1885 );
1886
1711 $table 1887 $table
1712} 1888}
1713 1889
1714sub autopickup_setup { 1890sub autopickup_setup {
1715 my $r = new DC::UI::ScrolledWindow ( 1891 my $r = new DC::UI::ScrolledWindow (
1721 col_expand => [0, 1, 0, 1], 1897 col_expand => [0, 1, 0, 1],
1722 ); 1898 );
1723 1899
1724 for ( 1900 for (
1725 ["General", 0, 0, 1901 ["General", 0, 0,
1726 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1727 ["Inhibit autopickup" => PICKUP_INHIBIT], 1902# ["Inhibit autopickup" => PICKUP_INHIBIT],
1728 ["Stop before pickup" => PICKUP_STOP], 1903 ["Stop before pickup" => PICKUP_STOP],
1729 ["Debug autopickup" => PICKUP_DEBUG], 1904 ["Debug autopickup" => PICKUP_DEBUG],
1730 ], 1905 ],
1731 ["Weapons", 0, 6, 1906 ["Weapons", 0, 6,
1732 ["All weapons" => PICKUP_ALLWEAPON], 1907 ["All weapons" => PICKUP_ALLWEAPON],
1780 $::CFG->{pickup} |= $mask; 1955 $::CFG->{pickup} |= $mask;
1781 } else { 1956 } else {
1782 $::CFG->{pickup} &= ~$mask; 1957 $::CFG->{pickup} &= ~$mask;
1783 } 1958 }
1784 1959
1785 $::CONN->send_command ("pickup $::CFG->{pickup}") 1960 $::CONN->send_pickup ($::CFG->{pickup})
1786 if defined $::CONN; 1961 if defined $::CONN;
1787 1962
1788 0 1963 0
1789 }); 1964 });
1790 1965
1807 }); 1982 });
1808 1983
1809 $table->add_at (3, 18, new DC::UI::Button 1984 $table->add_at (3, 18, new DC::UI::Button
1810 text => "set", 1985 text => "set",
1811 on_activate => sub { 1986 on_activate => sub {
1812 $::CONN->send_command ("pickup $::CFG->{pickup}") 1987 $::CONN->send_pickup ($::CFG->{pickup})
1813 if defined $::CONN; 1988 if defined $::CONN;
1814 0 1989 0
1815 }); 1990 });
1816 1991
1817 $r 1992 $r
1818} 1993}
1819 1994
1820my %SORT_ORDER = ( 1995my %SORT_ORDER = (
1821 type => sub { 1996 type => sub {
1997 use sort 'stable';
1822 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1998 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1823 }, 1999 },
1824 mtime => sub { 2000 mtime => sub {
2001 use sort 'stable';
1825 my $NOW = time; 2002 my $NOW = time;
1826 sort { 2003 sort {
1827 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 2004 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1828 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 2005 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1829 2006
1830 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2007 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1831 or $btime <=> $atime 2008 or $btime <=> $atime
1832 or $a->{type} <=> $b->{type} 2009 or $a->{type} <=> $b->{type}
1833 } @_ 2010 } @_
1834 }, 2011 },
1835 weight => sub { sort { 2012 weight => sub {
2013 use sort 'stable';
2014 sort {
1836 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2015 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1837 or $a->{type} <=> $b->{type} 2016 or $a->{type} <=> $b->{type}
1838 } @_ }, 2017 } @_
2018 },
1839); 2019);
1840 2020
1841sub inventory_widget { 2021sub inventory_widget {
1842 my $hb = new DC::UI::HBox homogeneous => 1; 2022 my $hb = new DC::UI::HBox homogeneous => 1;
1843 2023
1930 $PL_NOTEBOOK->set_current_page ($widget); 2110 $PL_NOTEBOOK->set_current_page ($widget);
1931 $PL_WINDOW->show; 2111 $PL_WINDOW->show;
1932 } 2112 }
1933} 2113}
1934 2114
1935sub player_window { 2115sub make_playerbook {
1936 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2116 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1937 x => "center", 2117 x => "center",
1938 y => "center", 2118 y => "center",
1939 force_w => $WIDTH * 9/10, 2119 force_w => $WIDTH * 9/10,
1940 force_h => $HEIGHT * 9/10, 2120 force_h => $HEIGHT * 9/10,
1974 "License, Author and Source info for media sent by the server."); 2154 "License, Author and Source info for media sent by the server.");
1975 2155
1976 $ntb->set_current_page ($INVENTORY_PAGE); 2156 $ntb->set_current_page ($INVENTORY_PAGE);
1977 2157
1978 $plwin->add ($ntb); 2158 $plwin->add ($ntb);
1979 $plwin
1980} 2159}
1981 2160
1982sub keyboard_setup { 2161sub keyboard_setup {
1983 DC::Macro::keyboard_setup 2162 DC::Macro::keyboard_setup
1984} 2163}
1985 2164
1986sub help_window { 2165sub make_help_window {
1987 my $win = new DC::UI::Toplevel 2166 my $win = new DC::UI::Toplevel
1988 x => 'center', 2167 x => 'center',
1989 y => 'center', 2168 y => 'center',
1990 z => 4, 2169 z => 4,
1991 name => 'doc_browser', 2170 name => 'doc_browser',
2080 2259
2081 $load_node->((DC::Pod::find @path)[0]); 2260 $load_node->((DC::Pod::find @path)[0]);
2082 $win->show; 2261 $win->show;
2083 }; 2262 };
2084 2263
2085 $win 2264 $HELP_WINDOW = $win;
2086}
2087
2088sub open_string_query {
2089 my ($title, $cb, $txt, $tooltip) = @_;
2090 my $dialog = new DC::UI::Toplevel
2091 x => "center",
2092 y => "center",
2093 z => 50,
2094 force_w => $WIDTH * 4/5,
2095 title => $title;
2096
2097 $dialog->add (
2098 my $e = new DC::UI::Entry
2099 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2100 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2101 tooltip => $tooltip
2102 );
2103
2104 $e->grab_focus;
2105 $e->set_text ($txt) if $txt;
2106 $dialog->show;
2107} 2265}
2108 2266
2109sub open_quit_dialog { 2267sub open_quit_dialog {
2110 unless ($QUIT_DIALOG) { 2268 unless ($QUIT_DIALOG) {
2111 $QUIT_DIALOG = new DC::UI::Toplevel 2269 $QUIT_DIALOG = new DC::UI::Toplevel
2133 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2291 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2134 ); 2292 );
2135 $hb->add (new DC::UI::Button 2293 $hb->add (new DC::UI::Button
2136 text => "Quit anyway", 2294 text => "Quit anyway",
2137 expand => 1, 2295 expand => 1,
2138 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2296 on_activate => sub {
2297 crash "Quit anyway";
2298 EV::unloop EV::UNLOOP_ALL;
2299 },
2139 ); 2300 );
2140 } 2301 }
2141 2302
2142 $QUIT_DIALOG->show; 2303 $QUIT_DIALOG->show;
2143 $QUIT_DIALOG->grab_focus; 2304 $QUIT_DIALOG->grab_focus;
2305}
2306
2307sub make_menubar {
2308 $MENUFRAME = new DC::UI::Toplevel
2309 border => 0,
2310 force_x => 0,
2311 force_y => 0,
2312 force_w => $::WIDTH,
2313 child => ($MENUBAR = new DC::UI::HBox),
2314 ;
2315
2316 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2317
2318 # 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
2319 make_gauge_window->show;
2320
2321# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2322# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2323
2324 make_playerbook;
2325
2326 $MENUPOPUP = DC::UI::Menu->new (items => [
2327 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2328 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2329 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2330 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2331 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2332 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2333 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2334 ["Quit…" , sub {
2335 if ($CONN) {
2336 open_quit_dialog;
2337 } else {
2338 EV::unloop EV::UNLOOP_ALL;
2339 }
2340 }],
2341 ]);
2342
2343 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2344 tooltip => "Shows the main menu",
2345 on_button_down => sub {
2346 my ($self, $ev) = @_;
2347 local $ev->{x} = 0;
2348 local $ev->{y} = 0;
2349 $MENUPOPUP->popup ($ev);
2350 },
2351 );
2352
2353 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2354 padding_x => 6,
2355 padding_y => 3,
2356 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2357 template => " Exp: 888,888,888,888 (lvl 188) ",
2358 );
2359
2360 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2361 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2362 . "will automatically pick up items as defined by your item pickup settings "
2363 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2364 . "disable autopickup by disabling this checkbox.",
2365 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2366 on_changed => sub {
2367 my ($self, $value) = @_;
2368 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2369 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2370 $CONN->send_pickup ($CFG->{pickup})
2371 if $CONN;
2372 },
2373 );
2374
2375 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2376 c_rescale => 1,
2377 padding_x => 6,
2378 padding_y => 3,
2379 force_w => $::WIDTH * 0.2,
2380 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2381 template => "two handed weapons 99%",
2382 );
2383
2384 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2385 expand => 1,
2386 align => 1, can_hover => 1, can_events => 1,
2387 text => "Range and Combat Slots",
2388 tooltip => "#stat_ranged",
2389 );
2390
2391 $MENUFRAME->show;
2392}
2393
2394sub open_string_query {
2395 my ($title, $cb, $txt, $tooltip) = @_;
2396 my $dialog = new DC::UI::Toplevel
2397 x => "center",
2398 y => "center",
2399 z => 50,
2400 force_w => $WIDTH * 4/5,
2401 title => $title;
2402
2403 $dialog->add (
2404 my $e = new DC::UI::Entry
2405 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2406 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2407 tooltip => $tooltip
2408 );
2409
2410 $e->grab_focus;
2411 $e->set_text ($txt) if $txt;
2412 $dialog->show;
2144} 2413}
2145 2414
2146sub show_tip_of_the_day { 2415sub show_tip_of_the_day {
2147 # find all tips 2416 # find all tips
2148 my @tod = DC::Pod::find tip_of_the_day => "*"; 2417 my @tod = DC::Pod::find tip_of_the_day => "*";
2195 2464
2196 $dialog->show; 2465 $dialog->show;
2197 }; 2466 };
2198} 2467}
2199 2468
2200sub sdl_init {
2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2202 and die "SDL::Init failed!\n";
2203}
2204
2205sub video_init { 2469sub video_init {
2470 DC::set_theme $CFG->{uitheme};
2471
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2472 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0; 2473 $SDL_REINIT = 0;
2208 2474
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2475 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2476 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2480 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215 2481
2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2482 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default 2483 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218 2484
2219 # now choose biggets mode <= 1024x768 2485 # now choose biggest mode <= 1024x768
2220 for (0 .. $#SDL_MODES) { 2486 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2487 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_; 2488 $CFG->{sdl_mode} = $_;
2223 } 2489 }
2224 } 2490 }
2266 2532
2267 $DEBUG_STATUS = new DC::UI::Label 2533 $DEBUG_STATUS = new DC::UI::Label
2268 padding => 0, 2534 padding => 0,
2269 z => 100, 2535 z => 100,
2270 force_x => "max", 2536 force_x => "max",
2271 force_y => 0; 2537 force_y => 20;
2272 $DEBUG_STATUS->show; 2538 $DEBUG_STATUS->show;
2273 2539
2274 $STATUSBOX = new DC::UI::Statusbox; 2540 $STATUSBOX = new DC::UI::Statusbox;
2275 2541
2276 $MODBOX = new DC::UI::Label 2542 $MODBOX = new DC::UI::Label
2287 2553
2288 (new DC::UI::Frame 2554 (new DC::UI::Frame
2289 bg => [0, 0, 0, 0.4], 2555 bg => [0, 0, 0, 0.4],
2290 force_x => 0, 2556 force_x => 0,
2291 force_y => "max", 2557 force_y => "max",
2292 child => (my $LR = new DC::UI::VBox), 2558 child => (my $LL = new DC::UI::VBox),
2293 )->show; 2559 )->show;
2294 2560
2295 $LR->add ($STATUSBOX); 2561 $LL->add ($STATUSBOX);
2296 $LR->add ($MODBOX); 2562 $LL->add ($MODBOX);
2297 $LR->add (new DC::UI::Label 2563 $LL->add (new DC::UI::Label
2298 align => 0, 2564 align => 0,
2299 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2565 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2300 fontsize => 0.5, 2566 fontsize => 0.5,
2301 fg => [1, 1, 0, 0.7], 2567 fg => [1, 1, 0, 0.7],
2302 ); 2568 );
2303 2569
2304 DC::UI::Toplevel->new ( 2570 DC::UI::Toplevel->new (
2305 title => "Minimap", 2571 title => "Minimap",
2306 name => "mapmap", 2572 name => "mapmap",
2307 x => 0, 2573 x => 0,
2308 y => $FONTSIZE + 8, 2574 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2309 border_bg => [1, 1, 1, 192/255], 2575 border_bg => [1, 1, 1, 192/255],
2310 bg => [1, 1, 1, 0], 2576 bg => [1, 1, 1, 0],
2311 child => ($MAPMAP = new DC::MapWidget::MapMap 2577 child => ($MAPMAP = new DC::MapWidget::MapMap
2312 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2578 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2313 ), 2579 ),
2314 )->show; 2580 )->show;
2315 2581
2316 $MAPWIDGET = new DC::MapWidget; 2582 $MAPWIDGET = new DC::MapWidget;
2317 $MAPWIDGET->connect (activate_console => sub { 2583 $MAPWIDGET->connect (activate_console => sub {
2342 $METASERVER = metaserver_dialog; 2608 $METASERVER = metaserver_dialog;
2343 # the name is changed to not conflict with the older name as users could have hidden it 2609 # the name is changed to not conflict with the older name as users could have hidden it
2344 $MESSAGE_WINDOW = new DC::UI::Dockbar 2610 $MESSAGE_WINDOW = new DC::UI::Dockbar
2345 name => "message_window2", 2611 name => "message_window2",
2346 title => 'Messages', 2612 title => 'Messages',
2613 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2347 force_w => $::WIDTH * 0.6, 2614 force_w => $::WIDTH * 0.6,
2348 force_h => $::HEIGHT * 0.25, 2615 force_h => $::HEIGHT * 0.25,
2349 ; 2616 ;
2350 2617
2351 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2618 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2371 . "After pressing the combo the binding will be saved automatically and the " 2638 . "After pressing the combo the binding will be saved automatically and the "
2372 . "binding editor closes"); 2639 . "binding editor closes");
2373 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2640 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2374 "Some debuggin' options. Do not ask."); 2641 "Some debuggin' options. Do not ask.");
2375 2642
2376 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2643 make_help_window;
2644 make_menubar;
2377 2645
2378 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2379 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2380
2381# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2382# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2383
2384 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
2385
2386 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2387 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2388
2389 $BUTTONBAR->add (new DC::UI::Button
2390 text => "Save Config",
2391 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2392 on_activate => sub {
2393 $::CFG->{layout} = DC::UI::get_layout;
2394 DC::write_cfg;
2395 status "Configuration Saved";
2396 0
2397 },
2398 );
2399
2400 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2401 tooltip => "View Documentation");
2402
2403 $BUTTONBAR->add (new DC::UI::Button
2404 text => "Quit",
2405 tooltip => "Terminates the program",
2406 on_activate => sub {
2407 if ($CONN) {
2408 open_quit_dialog;
2409 } else {
2410 EV::unloop EV::UNLOOP_ALL;
2411 }
2412 0
2413 },
2414 );
2415
2416 $BUTTONBAR->show;
2417 $SETUP_DIALOG->show; 2646 $SETUP_DIALOG->show;
2418 $MESSAGE_WINDOW->show; 2647 $MESSAGE_WINDOW->show;
2419 } 2648 }
2420 2649
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2650 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2651 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423 2652
2424 $CAVEAT_LABEL->set_text ("None :)"); 2653 $CAVEAT_LABEL->set_text ("None :)");
2654 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2655 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2656 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2657 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2427 2658
2428 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2659 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2429} 2660}
2439my $animate_timer; 2670my $animate_timer;
2440 2671
2441my $fps = 9; 2672my $fps = 9;
2442 2673
2443sub force_refresh { 2674sub force_refresh {
2444 if ($ENV{CFPLUS_DEBUG} & 4) { 2675 if ($DELIANTRA_DEBUG & 4) {
2445 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2676 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2446 debug sprintf "%3.2f", $fps; 2677 debug sprintf "%3.2f", $fps;
2447 } 2678 }
2448 2679
2449 undef $WANT_REFRESH; 2680 undef $WANT_REFRESH;
2457my $want_refresh = EV::prepare_ns \&force_refresh; 2688my $want_refresh = EV::prepare_ns \&force_refresh;
2458 2689
2459my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2690my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2460 $NOW = EV::now; 2691 $NOW = EV::now;
2461 2692
2462 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2693 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2463 for DC::poll_events; 2694 for DC::poll_events;
2464 2695
2465 if (%animate_object) { 2696 if (%animate_object) {
2466 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2697 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2467 $WANT_REFRESH = 1; 2698 $WANT_REFRESH = 1;
2479sub animation_stop { 2710sub animation_stop {
2480 my ($widget) = @_; 2711 my ($widget) = @_;
2481 delete $animate_object{$widget}; 2712 delete $animate_object{$widget};
2482} 2713}
2483 2714
2484%SDL_CB = (
2485 DC::SDL_QUIT => sub { 2715$SDL_CB[DC::SDL_QUIT] = sub {
2716 crash "SDL_QUIT";
2486 EV::unloop EV::UNLOOP_ALL; 2717 EV::unloop EV::UNLOOP_ALL;
2487 }, 2718};
2488 DC::SDL_VIDEORESIZE => sub { 2719$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2489 },
2490 DC::SDL_VIDEOEXPOSE => sub { 2720$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2491 DC::UI::full_refresh; 2721 DC::UI::full_refresh;
2492 }, 2722};
2493 DC::SDL_ACTIVEEVENT => sub { 2723$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2494# not useful, as APPACTIVE includes only iconified state, not unmapped 2724# not useful, as APPACTIVE includes only iconified state, not unmapped
2495# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2725# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2496# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2726# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2497# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2727# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2498# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2728# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2499# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2729# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2500 }, 2730};
2501 DC::SDL_KEYDOWN => sub { 2731$SDL_CB[DC::SDL_KEYDOWN] = sub {
2502 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2732 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2503 # alt-enter 2733 # alt-enter
2504 video_shutdown; 2734 video_shutdown;
2505 $FULLSCREEN_ENABLE->toggle; 2735 $FULLSCREEN_ENABLE->toggle;
2506 video_init; 2736 video_init;
2507 } else { 2737 } else {
2508 &DC::UI::feed_sdl_key_down_event; 2738 &DC::UI::feed_sdl_key_down_event;
2509 } 2739 }
2510 update_modbox; 2740 update_modbox;
2511 }, 2741};
2512 DC::SDL_KEYUP => sub { 2742$SDL_CB[DC::SDL_KEYUP] = sub {
2513 &DC::UI::feed_sdl_key_up_event; 2743 &DC::UI::feed_sdl_key_up_event;
2514 update_modbox; 2744 update_modbox;
2515 }, 2745};
2516 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2746$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2517 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2518 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2748$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2519 DC::SDL_USEREVENT => sub { 2749$SDL_CB[DC::SDL_USEREVENT] = sub {
2520 if ($_[0]{code} == 1) { 2750 if ($_[0]{code} == 1) {
2521 audio_channel_finished $_[0]{data1}; 2751 audio_channel_finished $_[0]{data1};
2522 } elsif ($_[0]{code} == 0) { 2752 } elsif ($_[0]{code} == 0) {
2523 audio_music_finished; 2753 audio_music_finished;
2524 }
2525 }, 2754 }
2526); 2755};
2527 2756
2528############################################################################# 2757#############################################################################
2529 2758
2530$SIG{INT} = $SIG{TERM} = sub { 2759$SIG{INT} = $SIG{TERM} = sub {
2531 EV::unloop; 2760 EV::unloop;
2532 #d# TODO calling exit here hangs the process in some futex 2761 #d# TODO calling exit here hangs the process in some futex
2533}; 2762};
2534 2763
2535# due to mac os x + sdl combined briandamage, we need this contortion 2764# due to mac os x + sdl combined braindamage, we need this contortion
2536sub main { 2765sub main {
2537 { 2766 {
2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2767 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2539 2768
2540 if (-e "$Deliantra::VARDIR/client.cf") { 2769 if (-e "$Deliantra::VARDIR/client.cf") {
2557 DC::DB::open_db; 2786 DC::DB::open_db;
2558 2787
2559 DC::UI::set_layout ($::CFG->{layout}); 2788 DC::UI::set_layout ($::CFG->{layout});
2560 2789
2561 my %DEF_CFG = ( 2790 my %DEF_CFG = (
2791 config_autosave => 1,
2562 sdl_mode => undef, 2792 sdl_mode => undef,
2563 fullscreen => 1, 2793 fullscreen => 1,
2564 fast => 0, 2794 fast => 0,
2565 force_opengl11 => undef, 2795 force_opengl11 => undef,
2566 disable_alpha => 0, 2796 disable_alpha => 0,
2567 smooth_movement => 1, 2797 smooth_movement => 1,
2798 smooth_transitions => 1,
2568 texture_compression => 1, 2799 texture_compression => 1,
2569 map_scale => 1, 2800 map_scale => 1,
2570 fow_enable => 1, 2801 fow_enable => 1,
2571 fow_intensity => 0, 2802 fow_intensity => 0,
2803 fow_texture => 0,
2572 map_smoothing => 1, 2804 map_smoothing => 1,
2573 gui_fontsize => 1, 2805 gui_fontsize => 1,
2574 log_fontsize => 0.7, 2806 log_fontsize => 0.7,
2575 gauge_fontsize => 1, 2807 gauge_fontsize => 1,
2576 gauge_size => 0.35, 2808 gauge_size => 0.35,
2584 effects_enable => 1, 2816 effects_enable => 1,
2585 effects_volume => 1, 2817 effects_volume => 1,
2586 bgm_enable => 1, 2818 bgm_enable => 1,
2587 bgm_volume => 0.5, 2819 bgm_volume => 0.5,
2588 output_rate => "", 2820 output_rate => "",
2589 pickup => 0, 2821 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2590 inv_sort => "mtime", 2822 inv_sort => "mtime",
2591 default => "profile", # default profile 2823 default => "profile", # default profile
2592 show_tips => 1, 2824 show_tips => 1,
2593 logview_max_par => 1000, 2825 logview_max_par => 1000,
2594 shift_fire_stop => 0, 2826 shift_fire_stop => 0,
2595 ); 2827 uitheme => "wood",
2828 map_shift_x => -24, # arbitrary
2829 map_shift_y => +24, # arbitrary
2596 2830 );
2831
2597 while (my ($k, $v) = each %DEF_CFG) { 2832 while (my ($k, $v) = each %DEF_CFG) {
2598 $CFG->{$k} = $v unless exists $CFG->{$k}; 2833 $CFG->{$k} = $v unless exists $CFG->{$k};
2599 } 2834 }
2600 2835
2601 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2836 my @args = @ARGV;
2837
2838 # OS X passes some process serial number of other shit. they
2839 # could have used an env var or any other sane mechanism. but
2840 # would it be os x then? no...
2841 shift @args if $args[0] =~ /^-psn_/;
2842
2843 my $profile = 'default';
2844
2845 for (my $i = 0; $i < @args; $i++) {
2846 if ($args[$i] =~ /^--?profile$/) {
2847 $profile = $args[$i + 1];
2848 splice @args, $i, 2, ();
2849 $i = 0;
2850 } elsif ($args[$i] =~ /^--?h/) {
2851 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2852 exit 0;
2853 }
2854 }
2855
2856 $CFG->{profile}{$profile} ||= {};
2602 $PROFILE = $CFG->{profile}{default}; 2857 $PROFILE = $CFG->{profile}{$profile};
2858 $PROFILE->{host} ||= "gameserver.deliantra.net";
2859
2860 $PROFILE->{host} = $args[0] if @args > 0;
2861 $PROFILE->{user} = $args[1] if @args > 1;
2862 $PROFILE->{password} = $args[2] if @args > 2;
2603 2863
2604 # convert old bindings (only default profile matters) 2864 # convert old bindings (only default profile matters)
2605 if (my $bindings = delete $PROFILE->{bindings}) { 2865 if (my $bindings = delete $PROFILE->{bindings}) {
2606 while (my ($mod, $syms) = each %$bindings) { 2866 while (my ($mod, $syms) = each %$bindings) {
2607 while (my ($sym, $cmds) = each %$syms) { 2867 while (my ($sym, $cmds) = each %$syms) {
2611 }; 2871 };
2612 } 2872 }
2613 } 2873 }
2614 } 2874 }
2615 2875
2616 sdl_init; 2876 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2877 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2617 2878
2618 { 2879 {
2619 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2880 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2620 DejaVuSans.ttf 2881 DejaVuSans.ttf
2621 DejaVuSansMono.ttf 2882 DejaVuSansMono.ttf
2623 DejaVuSansMono-Bold.ttf 2884 DejaVuSansMono-Bold.ttf
2624 DejaVuSans-Oblique.ttf 2885 DejaVuSans-Oblique.ttf
2625 DejaVuSansMono-Oblique.ttf 2886 DejaVuSansMono-Oblique.ttf
2626 DejaVuSans-BoldOblique.ttf 2887 DejaVuSans-BoldOblique.ttf
2627 DejaVuSansMono-BoldOblique.ttf 2888 DejaVuSansMono-BoldOblique.ttf
2889 mona.ttf
2628 ); 2890 );
2629 2891
2630 DC::add_font $_ for @fonts; 2892 DC::add_font $_ for @fonts;
2631 2893
2632 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2894 $FONT_PROP = new_from_file DC::Font $fonts[0];
2633 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2895 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2634 2896
2635 $FONT_PROP->make_default; 2897 $FONT_PROP->make_default;
2636 2898
2648# } 2910# }
2649# my $t2 = Time::HiRes::time; 2911# my $t2 = Time::HiRes::time;
2650# warn $t2-$t1; 2912# warn $t2-$t1;
2651# } 2913# }
2652 2914
2915 DC::IMG_Init;
2653 video_init; 2916 video_init;
2654 audio_init; 2917 audio_init;
2655 } 2918 }
2656 2919
2657 show_tip_of_the_day if $CFG->{show_tips}; 2920 show_tip_of_the_day if $CFG->{show_tips};
2659 our $STARTUP_CANCEL = EV::idle sub { 2922 our $STARTUP_CANCEL = EV::idle sub {
2660 undef $::STARTUP_CANCEL; 2923 undef $::STARTUP_CANCEL;
2661 $startup_done->(); 2924 $startup_done->();
2662 }; 2925 };
2663 2926
2927 debug_toggle 0;
2928
2664 delete $SIG{__DIE__}; 2929 delete $SIG{__DIE__};
2665 EV::loop; 2930 EV::loop;
2666 2931
2932 DC::write_cfg if $CFG->{config_autosave};
2933
2667#video_shutdown; 2934 #video_shutdown;
2668#audio_shutdown; 2935 #audio_shutdown;
2936
2669 DC::OpenGL::quit; 2937 DC::OpenGL::quit;
2670 DC::SDL_Quit; 2938 DC::SDL_Quit;
2671 DC::DB::Server::stop; 2939 DC::DB::Server::stop;
2672} 2940}
2673 2941
2677 2945
2678deliantra - A Deliantra MORPG game client 2946deliantra - A Deliantra MORPG game client
2679 2947
2680=head1 SYNOPSIS 2948=head1 SYNOPSIS
2681 2949
2682Just run it - no commandline arguments are supported. 2950 deliantra [--profile name] [host [user [password]]]
2951 deliantra --help
2683 2952
2684=head1 USAGE 2953=head1 USAGE
2685 2954
2686deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2955The deliantra client utilises OpenGL for all UI elements and the game. It
2687be used in fullscreen mode and interactively. 2956is supposed to be used in fullscreen mode and interactively.
2688 2957
2689=head1 DEBUGGING 2958=head1 DEBUGGING
2690 2959
2691
2692CFPLUS_DEBUG - environment variable 2960DELIANTRA_DEBUG - environment variable
2693 2961
2694 1 draw borders around widgets 2962 1 draw borders around widgets
2695 2 add low-level widget info to tooltips 2963 2 add low-level widget info to tooltips
2696 4 show fps 2964 4 show fps
2697 8 suppress tooltips 2965 8 suppress tooltips
2966 16 show bandwidth downstream
2698 2967
2699=head1 AUTHOR 2968=head1 AUTHOR
2700 2969
2701Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2970Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2702 2971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines