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.57 by root, Wed Jul 23 03:38:34 2008 UTC vs.
Revision 1.117 by root, Tue Aug 31 14:31:50 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
102use AnyEvent::DNS; 92use AnyEvent::Util ();
103use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
104 95
105use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
106 98
107use DC; 99use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
109use DC::OpenGL (); 113use DC::OpenGL ();
110use DC::Protocol; 114use DC::Protocol;
111use DC::DB; 115use DC::DB;
112use DC::UI; 116use DC::UI;
113use DC::UI::Canvas; 117use DC::UI::Canvas;
114use DC::UI::Inventory; 118use DC::UI::Inventory;
115use DC::UI::SpellList; 119use DC::UI::SpellList;
116use DC::UI::Dockable; 120use DC::UI::Dockable;
117use DC::UI::Dockbar; 121use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 122use DC::UI::ChatView;
120use DC::MessageDistributor; 123use DC::MessageDistributor;
121use DC::Pod; 124use DC::Pod;
122use DC::MapWidget; 125use DC::MapWidget;
123use DC::Macro; 126use DC::Macro;
124 127
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
127 130
128$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
130}; 134};
131 135
132my $MAX_FPS = 60; 136my $MAX_FPS = 60;
133 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
134our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
135 141
136our $LAST_REFRESH; 142our $LAST_REFRESH;
137our $NOW; 143our $NOW;
138 144
139our $CFG; 145our $CFG;
140our $CONN;
141our $PROFILE; # current profile 146our $PROFILE; # current profile
142our $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;
143 149
144our $WANT_REFRESH; 150our $WANT_REFRESH;
145 151
146our $MODE_SLIDER; 152our $MODE_SLIDER;
147our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
154our $FONTSIZE; 160our $FONTSIZE;
155 161
156our $FONT_PROP; 162our $FONT_PROP;
157our $FONT_FIXED; 163our $FONT_FIXED;
158 164
165our $CONN;
166
159our $MAP; 167our $MAP;
160our $MAPMAP; 168our $MAPMAP;
161our $MAPWIDGET; 169our $MAPWIDGET;
162our $COMPLETER; 170our $COMPLETER;
163our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
164our $METASERVER; 175our $METASERVER;
165our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
166our $QUIT_DIALOG; 177our $QUIT_DIALOG;
167our $HOST_ENTRY; 178our $HOST_ENTRY;
168our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
194our $FLOORBOX; 205our $FLOORBOX;
195our $GAUGES; 206our $GAUGES;
196our $STATWIDS; 207our $STATWIDS;
197 208
198our $SDL_ACTIVE; 209our $SDL_ACTIVE;
199our %SDL_CB; 210our @SDL_CB;
200 211
201our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
202our $STATUSBOX; 213our $STATUSBOX;
203our $MODBOX; 214our $MODBOX;
204our $DEBUG_STATUS; 215our $DEBUG_STATUS;
205 216
206our $INV; 217our $INV;
207our $INVR; 218our $INVR;
208our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
209 260
210############################################################################# 261#############################################################################
211 262
212sub status { 263sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
295 or return; 346 or return;
296 347
297 $meta->{data} 348 $meta->{data}
298 or return; 349 or return;
299 350
300 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
301 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
302 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
303 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
304 &audio_music_push ($face); 355 &audio_music_push ($face);
305 } 356 }
306 } else { 357 } else {
307 # fetch from database 358 # fetch from database
308 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
309 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
310 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
311 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
312 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
313 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
314 365
315 audio_sound_push ($face); 366 audio_sound_push ($face);
316 }; 367 };
363 414
364 audio_music_update_volume; 415 audio_music_update_volume;
365 416
366 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
367 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
368 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
369 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
370 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
371 425
372 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
373 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374 428
375 my $NOW = time; 429 my $NOW = time;
376 430
377 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
464 audio_music_push; 518 audio_music_push;
465} 519}
466 520
467sub audio_init { 521sub audio_init {
468 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
469 $ENV{MIX_EFFECTSMAXSPEED} = 1; 532 $ENV{MIX_EFFECTSMAXSPEED} = 1;
470 $SDL_MIXER = !DC::Mix_OpenAudio 533 $SDL_MIXER = !DC::Mix_OpenAudio
471 $CFG->{audio_hw_frequency}, 534 $CFG->{audio_hw_frequency},
472 DC::MIX_DEFAULT_FORMAT, 535 DC::MIX_DEFAULT_FORMAT,
473 $CFG->{audio_hw_channels}, 536 $CFG->{audio_hw_channels},
487 sub audio_tab_update; 550 sub audio_tab_update;
488 audio_tab_update; 551 audio_tab_update;
489} 552}
490 553
491sub audio_shutdown { 554sub audio_shutdown {
555 if ($SDL_MIXER) {
556 DC::MixMusic::halt;
557 DC::Mix_AllocateChannels 0;
558 }
559
492 undef $MUSIC_PLAYER; 560 undef $MUSIC_PLAYER;
493 undef $MUSIC_PLAYING_META; 561 undef $MUSIC_PLAYING_META;
494 undef $MUSIC_PLAYING_DATA; 562 undef $MUSIC_PLAYING_DATA;
495 563
496 $MUSIC_WANT = []; 564 $MUSIC_WANT = [];
498 %AUDIO_PLAY = (); 566 %AUDIO_PLAY = ();
499 %AUDIO_CHUNK = (); 567 %AUDIO_CHUNK = ();
500 568
501 DC::Mix_CloseAudio if $SDL_MIXER; 569 DC::Mix_CloseAudio if $SDL_MIXER;
502 undef $SDL_MIXER; 570 undef $SDL_MIXER;
571
572 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
503} 573}
504 574
505############################################################################# 575#############################################################################
506 576
507sub destroy_query_dialog { 577sub destroy_query_dialog {
736} 806}
737 807
738sub dc_connect { 808sub dc_connect {
739 my ($host, $port) = @_; 809 my ($host, $port) = @_;
740 810
741 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;
742 813
743 $CONN = 814 $CONN =
744 new DC::Protocol 815 new DC::Protocol
745 host => $host, 816 host => $host,
746 port => $port, 817 port => $port,
747 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
749 mapw => $mapsize, 820 mapw => $mapw,
750 maph => $mapsize, 821 maph => $maph,
751 822
823 c_version => {
824 client => "deliantra",
752 client => "$DC::VERSION $] $^O", 825 clientver => $DC::VERSION,
826 gl_vendor => DC::OpenGL::gl_vendor,
827 gl_version => DC::OpenGL::gl_version,
828 },
753 829
754 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
756 map => $MAP, 832 map => $MAP,
757 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
763 839
764 on_connect => sub { 840 on_connect => sub {
765 if ($_[0]) { 841 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
767 843
768 status "login successful"; 844 status "successfully connected to the server";
769 } else { 845 } else {
770 undef $CONN; 846 undef $CONN;
771 status "unable to connect: $!"; 847 status "unable to connect: $!";
772 stop_game(); 848 stop_game();
773 } 849 }
775 ; 851 ;
776} 852}
777 853
778sub start_game { 854sub start_game {
779 status "logging in..."; 855 status "logging in...";
856
857 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
858 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
859 or return status "$server: unable to parse server address, try an empty field.";
780 860
781 $LOGIN_BUTTON->set_text ("Logout"); 861 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 862 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 863
786 $MAP = new DC::Map; 864 $MAP = new DC::Map;
787 865
788 # hack to make SURE we find the IP address all right 866 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 867 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 868 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 869 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl 870 if ($_[0] ne "80.101.114.108") { # P-e-r-l
871 status "dns failure, trying differently";
872 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
873 unless (defined $host) {
793 status "dns failure, using hardcoded address"; 874 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 875 $host = "194.126.175.154";
876 }
795 } 877 }
796 878
797 dc_connect $host, $port; 879 dc_connect $host, $port;
798 }; 880 };
799 } else { 881 } else {
800 dc_connect $host, $port; 882 dc_connect $host, $port;
801 } 883 }
802} 884}
803 885
804sub stop_game { 886sub stop_game {
887 crash "stop_game";
888
805 $LOGIN_BUTTON->set_text ("Login / Register"); 889 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 890 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 891 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 892 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 893 $SPELL_LIST->clear_spells;
823} 907}
824 908
825sub graphics_setup { 909sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
827 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
828 $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]);
829 916
830 my $row = 0; 917 my $row = 0;
831 918
832 $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");
833 $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,
834 can_events => 1, 921 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 923
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 925 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 926 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 927 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 928 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 929 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 930 . "by installing the right driver for your graphics card.");
844 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
845 my $vidmode_tooltip = 945 my $vidmode_tooltip =
846 "<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). "
847 . "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>.";
848 948
849 $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");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 951
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
953 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 954 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 955 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
859 960
860 $MODE_SLIDER->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 962 my ($self, $value) = @_;
963
964 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
965 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
966 });
967 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
968
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
970 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
971 state => $CFG->{fullscreen},
972 tooltip => "Bring the client into fullscreen mode.",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
974 );
975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{force_opengl11},
979 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
980 . "higher memory usage and slower performance. It will, however, help tremendously on "
981 . "cards that claim to support a feature but fall back to software rendering. "
982 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
983 . "but cards and drivers from other vendors (ATI) are often just as bad. "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
986 );
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) = @_;
898 $CFG->{disable_alpha} = $value; 999 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 1000 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1001 0
900 0 1002 }
901 } 1003 );
902 );
903 1004
904 $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");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
907 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 "
908 . "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). "
909 . "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 "
910 . "forced OpenGL 1.1 mode.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 1013 );
913 1014
914 $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");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 1017 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 1020 );
920 1021
921 $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");
922 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1025 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1027 );
927 1028
928 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1032 on_activate => sub {
932 video_shutdown (); 1033 video_shutdown ();
933 video_init (); 1034 video_init ();
1035 0
934 0 1036 }
935 } 1037 );
936 ); 1038 }
937 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;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1048 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1049 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1050 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1051 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1053 );
946 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
947 $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");
948 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 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 }
952 ); 1070 );
953 1071
954 $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");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
957 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. "
958 . "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. "
959 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1079 );
962 1080
963 $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");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
966 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.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1086 );
969 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
970 $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");
971 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1106 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1108 );
976 1109
977 $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");
978 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1113 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1114 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1115 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1116 );
984 1117
985 $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");
986 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1121 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1122 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
992 0 1126 }
993 } 1127 );
994 );
995 1128
996 $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");
997 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 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.",
1000 on_changed => sub { 1133 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
1003 0 1137 }
1004 } 1138 );
1005 ); 1139 }
1006 1140
1007 $vbox 1141 $vbox
1008} 1142}
1009 1143
1010our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
1022 ]); 1156 ]);
1023 1157
1024 my $text = !$freq 1158 my $text = !$freq
1025 ? "audio is off" 1159 ? "audio is off"
1026 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1027 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1028 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1029 1166
1030 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1031} 1168}
1032 1169
1033sub audio_setup { 1170sub audio_setup {
1036 $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]);
1037 1174
1038 my $row = 0; 1175 my $row = 0;
1039 1176
1040 $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");
1041 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1042 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1043 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.",
1044 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 }
1045 ); 1195 );
1046 1196
1047 $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");
1048 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1049 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
1062 ); 1212 );
1063 1213
1064 $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");
1065 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1066 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1067 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.",
1068 on_changed => sub { 1218 on_changed => sub {
1069 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1070 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1071 audio_music_push; 1221 audio_music_push;
1072 1 1222 1
1083 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1084 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1085 options => [ 1235 options => [
1086 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1087 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1088 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1089 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1090 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1091 ], 1241 ],
1092 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.",
1093 on_changed => sub { 1243 on_changed => sub {
1094 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1095 audio_tab_update; 1245 audio_tab_update;
1119 $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");
1120 $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
1121 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1122 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1123 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 "
1124 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1125 on_changed => sub { 1275 on_changed => sub {
1126 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1127 audio_tab_update; 1277 audio_tab_update;
1128 1 1278 1
1129 } 1279 }
1173} 1323}
1174 1324
1175sub make_gauge_window { 1325sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1327
1178 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1329 force_x => 0,
1180 force_y => "max", 1330 force_y => "max",
1181 force_w => $WIDTH, 1331 force_w => $WIDTH,
1182 force_h => $gh, 1332 force_h => $gh,
1183 ); 1333 );
1199 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1201 ], 1351 ],
1202 ); 1352 );
1203 1353
1204 $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");
1205 $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");
1206 $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");
1207 $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");
1208
1209 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1210 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1211 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1212 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1213
1214 $GAUGES = {
1215 exp => $exp, prg => $prg, sklprg => $sklprg,
1216 win => $win, range => $rng,
1217 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1218 };
1219 1358
1220 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1221 1360
1222 $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
1223} 1379}
1224 1380
1225sub debug_setup { 1381sub debug_setup {
1226 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1227 1383
1228 $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");
1229 $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 });
1230 $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");
1231 $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 });
1232 $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");
1233 $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 });
1234 $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");
1235 $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
1236 $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() } );
1237
1238 $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#
1239 1397
1240 $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);
1241 $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);
1242 $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 );
1243 $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);
1364 para => ["Paralysation", 1522 para => ["Paralysation",
1365 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1366 deat => ["Death", 1524 deat => ["Death",
1367 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1368 phys => ["Physical", 1526 phys => ["Physical",
1369 "<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.)"], 1527 "<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.)"],
1370 blind => ["Blind", 1528 blind => ["Blind",
1371 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"], 1529 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1372 fear => ["Fear", 1530 fear => ["Fear",
1373 "<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)"], 1531 "<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)"],
1374 tund => ["Turn undead", 1532 tund => ["Turn undead",
1564 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]),
1565 ); 1723 );
1566 1724
1567 $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");
1568 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1570 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1571 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1572 ); 1730 );
1573 1731
1574 $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");
1575 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1577 hidden => 1, 1735 hidden => 1,
1578 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1579 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1580 ); 1738 );
1581 1739
1582 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1583 expand => 1, 1741 expand => 1,
1584 text => "Login / Register", 1742 text => "Login / Register",
1589 1 1747 1
1590 }, 1748 },
1591 ); 1749 );
1592 1750
1593 $vbox->add (new DC::UI::FancyFrame 1751 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1752 label => "How to Play",
1595 min_h => 200, 1753 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1754 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 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). "
1598 "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 "
1599 . "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.",
1600 ), 1760 ),
1601 ); 1761 );
1602 1762
1603 $vbox 1763 $vbox
1618 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1619 1779
1620 $vbox->add ( 1780 $vbox->add (
1621 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1622 expand => 1, 1782 expand => 1,
1623 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1624 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>)",
1625 on_changed => sub { 1785 on_changed => sub {
1626 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1627 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1628 1 1788 1
1629 } 1789 }
1630 ); 1790 );
1631 1791
1632 if (0) { #d# disabled 1792 if (0) { #d# disabled
1675 1835
1676 my $row = 0; 1836 my $row = 0;
1677 1837
1678 $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");
1679 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1681 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?",
1682 on_changed => sub { 1843 on_changed => sub {
1683 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1686 } 1847 }
1687 ); 1848 );
1688 1849
1689 $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");
1690 $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,
1691 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1692 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 "
1693 . "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 "
1694 . "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.",
1695 on_changed => sub { 1857 on_changed => sub {
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1860 0
1699 }, 1861 },
1700 ); 1862 );
1701 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
1702 $table 1886 $table
1703} 1887}
1704 1888
1705sub autopickup_setup { 1889sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
1712 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1713 ); 1897 );
1714 1898
1715 for ( 1899 for (
1716 ["General", 0, 0, 1900 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1904 ],
1722 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1723 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1932 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1750 ["Ignore cursed" => PICKUP_NOT_CURSED], 1933 ["Ignore cursed" => PICKUP_NOT_CURSED],
1751 ["Jewelery" => PICKUP_JEWELS], 1934 ["Jewelery" => PICKUP_JEWELS],
1752 ["Flesh" => PICKUP_FLESH], 1935 ["Flesh" => PICKUP_FLESH],
1753 ], 1936 ],
1754 ["Weight/Value ratio", 2, 17] 1937 ["Value/Weight ratio", 2, 17]
1755 ) 1938 )
1756 { 1939 {
1757 my ($title, $x, $y, @bits) = @$_; 1940 my ($title, $x, $y, @bits) = @$_;
1758 $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]);
1759 1942
1771 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1772 } else { 1955 } else {
1773 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1774 } 1957 }
1775 1958
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1960 if defined $::CONN;
1778 1961
1779 0 1962 0
1780 }); 1963 });
1781 1964
1784 } 1967 }
1785 1968
1786 $table->add_at (2, 18, new DC::UI::ValSlider 1969 $table->add_at (2, 18, new DC::UI::ValSlider
1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1970 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1788 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).",
1789 to_value => sub { ">= " . 5 * $_[0] }, 1973 to_value => sub { ">= " . 5 * $_[0] },
1790 on_changed => sub { 1974 on_changed => sub {
1791 my ($slider, $value) = @_; 1975 my ($slider, $value) = @_;
1792 1976
1793 $::CFG->{pickup} &= ~0xF; 1977 $::CFG->{pickup} &= ~0xF;
1797 }); 1981 });
1798 1982
1799 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1800 text => "set", 1984 text => "set",
1801 on_activate => sub { 1985 on_activate => sub {
1802 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1803 if defined $::CONN; 1987 if defined $::CONN;
1804 0 1988 0
1805 }); 1989 });
1806 1990
1807 $r 1991 $r
1808} 1992}
1809 1993
1810my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1811 type => sub { 1995 type => sub {
1996 use sort 'stable';
1812 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1813 }, 1998 },
1814 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1815 my $NOW = time; 2001 my $NOW = time;
1816 sort { 2002 sort {
1817 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;
1818 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;
1819 2005
1820 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1821 or $btime <=> $atime 2007 or $btime <=> $atime
1822 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1823 } @_ 2009 } @_
1824 }, 2010 },
1825 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1826 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1827 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1828 } @_ }, 2016 } @_
2017 },
1829); 2018);
1830 2019
1831sub inventory_widget { 2020sub inventory_widget {
1832 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1833 2022
1849 $::CFG->{inv_sort} = $_[1]; 2038 $::CFG->{inv_sort} = $_[1];
1850 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2039 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1851 }, 2040 },
1852 ); 2041 );
1853 $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);
1854 #TODO# update to weigh/maxweight 2043 #TODO# update to weight/maxweight
1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2044 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1856 2045
1857 $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);
1858 $sw1->add ($INV = new DC::UI::Inventory); 2047 $sw1->add ($INV = new DC::UI::Inventory);
1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2048 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1920 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1921 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1922 } 2111 }
1923} 2112}
1924 2113
1925sub player_window { 2114sub make_playerbook {
1926 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1927 x => "center", 2116 x => "center",
1928 y => "center", 2117 y => "center",
1929 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1930 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
1964 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
1965 2154
1966 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
1967 2156
1968 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
1969 $plwin
1970} 2158}
1971 2159
1972sub keyboard_setup { 2160sub keyboard_setup {
1973 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
1974} 2162}
1975 2163
1976sub help_window { 2164sub make_help_window {
1977 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
1978 x => 'center', 2166 x => 'center',
1979 y => 'center', 2167 y => 'center',
1980 z => 4, 2168 z => 4,
1981 name => 'doc_browser', 2169 name => 'doc_browser',
2070 2258
2071 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2072 $win->show; 2260 $win->show;
2073 }; 2261 };
2074 2262
2075 $win 2263 $HELP_WINDOW = $win;
2076}
2077
2078sub open_string_query {
2079 my ($title, $cb, $txt, $tooltip) = @_;
2080 my $dialog = new DC::UI::Toplevel
2081 x => "center",
2082 y => "center",
2083 z => 50,
2084 force_w => $WIDTH * 4/5,
2085 title => $title;
2086
2087 $dialog->add (
2088 my $e = new DC::UI::Entry
2089 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2090 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2091 tooltip => $tooltip
2092 );
2093
2094 $e->grab_focus;
2095 $e->set_text ($txt) if $txt;
2096 $dialog->show;
2097} 2264}
2098 2265
2099sub open_quit_dialog { 2266sub open_quit_dialog {
2100 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2101 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2123 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2290 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2124 ); 2291 );
2125 $hb->add (new DC::UI::Button 2292 $hb->add (new DC::UI::Button
2126 text => "Quit anyway", 2293 text => "Quit anyway",
2127 expand => 1, 2294 expand => 1,
2128 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2295 on_activate => sub {
2296 crash "Quit anyway";
2297 EV::unloop EV::UNLOOP_ALL;
2298 },
2129 ); 2299 );
2130 } 2300 }
2131 2301
2132 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2133 $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;
2134} 2412}
2135 2413
2136sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2137 # find all tips 2415 # find all tips
2138 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2185 2463
2186 $dialog->show; 2464 $dialog->show;
2187 }; 2465 };
2188} 2466}
2189 2467
2190sub sdl_init {
2191 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2192 and die "SDL::Init failed!\n";
2193}
2194
2195sub video_init { 2468sub video_init {
2469 DC::set_theme $CFG->{uitheme};
2470
2196 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2197 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
2198 2473
2199 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2474 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2200 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2475 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2476 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2477 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203 2478
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2479 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205 2480
2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2481 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0; 2482 $CFG->{sdl_mode} = 0; # lowest resolution by default
2483
2484 # now choose biggest mode <= 1024x768
2208 for (reverse 0 .. $#SDL_MODES) { 2485 for (0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2486 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2487 $CFG->{sdl_mode} = $_;
2488 }
2210 } 2489 }
2211 } 2490 }
2212 2491
2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2492 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2214 2493
2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2494 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2216 $FULLSCREEN = $CFG->{fullscreen}; 2495 $FULLSCREEN = $CFG->{fullscreen};
2217 $FAST = $CFG->{fast}; 2496 $FAST = $CFG->{fast};
2218 2497
2498 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2219 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
2220 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2501 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2221 2502
2222 $SDL_ACTIVE = 1; 2503 $SDL_ACTIVE = 1;
2223 $LAST_REFRESH = time - 0.01; 2504 $LAST_REFRESH = time - 0.01;
2224 2505
2250 2531
2251 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2252 padding => 0, 2533 padding => 0,
2253 z => 100, 2534 z => 100,
2254 force_x => "max", 2535 force_x => "max",
2255 force_y => 0; 2536 force_y => 20;
2256 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2257 2538
2258 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2259 2540
2260 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
2271 2552
2272 (new DC::UI::Frame 2553 (new DC::UI::Frame
2273 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2274 force_x => 0, 2555 force_x => 0,
2275 force_y => "max", 2556 force_y => "max",
2276 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2277 )->show; 2558 )->show;
2278 2559
2279 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2280 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2281 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2282 align => 0, 2563 align => 0,
2283 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2284 fontsize => 0.5, 2565 fontsize => 0.5,
2285 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2286 ); 2567 );
2287 2568
2288 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2289 title => "Minimap", 2570 title => "Minimap",
2290 name => "mapmap", 2571 name => "mapmap",
2291 x => 0, 2572 x => 0,
2292 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2293 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2294 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2295 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2296 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.",
2297 ), 2578 ),
2298 )->show; 2579 )->show;
2299 2580
2300 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2301 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2326 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2327 # 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
2328 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2329 name => "message_window2", 2610 name => "message_window2",
2330 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2331 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2332 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2333 ; 2615 ;
2334 2616
2335 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2355 . "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 "
2356 . "binding editor closes"); 2638 . "binding editor closes");
2357 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2358 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2359 2641
2360 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2361 2644
2362 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2363 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2364
2365# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2366# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2367
2368 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
2369
2370 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2371 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2372
2373 $BUTTONBAR->add (new DC::UI::Button
2374 text => "Save Config",
2375 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2376 on_activate => sub {
2377 $::CFG->{layout} = DC::UI::get_layout;
2378 DC::write_cfg;
2379 status "Configuration Saved";
2380 0
2381 },
2382 );
2383
2384 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2385 tooltip => "View Documentation");
2386
2387 $BUTTONBAR->add (new DC::UI::Button
2388 text => "Quit",
2389 tooltip => "Terminates the program",
2390 on_activate => sub {
2391 if ($CONN) {
2392 open_quit_dialog;
2393 } else {
2394 EV::unloop EV::UNLOOP_ALL;
2395 }
2396 0
2397 },
2398 );
2399
2400 $BUTTONBAR->show;
2401 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2402 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2403 } 2647 }
2404 2648
2405 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2649 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2406 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2407 2651
2408 $CAVEAT_LABEL->set_text ("None :)"); 2652 $CAVEAT_LABEL->set_text ("None :)");
2653 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2654 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2409 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2410 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2411 2657
2412 $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]);
2413} 2659}
2423my $animate_timer; 2669my $animate_timer;
2424 2670
2425my $fps = 9; 2671my $fps = 9;
2426 2672
2427sub force_refresh { 2673sub force_refresh {
2428 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2429 $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;
2430 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2431 } 2677 }
2432 2678
2433 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2441my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2442 2688
2443my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2444 $NOW = EV::now; 2690 $NOW = EV::now;
2445 2691
2446 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2447 for DC::poll_events; 2693 for DC::poll_events;
2448 2694
2449 if (%animate_object) { 2695 if (%animate_object) {
2450 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2451 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2463sub animation_stop { 2709sub animation_stop {
2464 my ($widget) = @_; 2710 my ($widget) = @_;
2465 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2466} 2712}
2467 2713
2468%SDL_CB = (
2469 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2715 crash "SDL_QUIT";
2470 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2471 }, 2717};
2472 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2473 },
2474 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2475 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2476 }, 2721};
2477 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2478# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2479# 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#
2480# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2481# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2482# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2483# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2484 }, 2729};
2485 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2486 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2487 # alt-enter 2732 # alt-enter
2488 video_shutdown; 2733 video_shutdown;
2489 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2490 video_init; 2735 video_init;
2491 } else { 2736 } else {
2492 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2493 } 2738 }
2494 update_modbox; 2739 update_modbox;
2495 }, 2740};
2496 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2497 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2498 update_modbox; 2743 update_modbox;
2499 }, 2744};
2500 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2501 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2502 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2503 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2504 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2505 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2506 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2507 audio_music_finished; 2752 audio_music_finished;
2508 }
2509 }, 2753 }
2510); 2754};
2511 2755
2512############################################################################# 2756#############################################################################
2513 2757
2514$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2515 EV::unloop; 2759 EV::unloop;
2516 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2517}; 2761};
2518 2762
2519{ 2763# due to mac os x + sdl combined braindamage, we need this contortion
2764sub main {
2765 {
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521 2767
2522 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2523 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2769 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2524 } else { 2770 } else {
2525 #TODO: compatibility cruft 2771 #TODO: compatibility cruft
2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2772 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2527 print STDERR "INFO: used old configuration file\n"; 2773 print STDERR "INFO: used old configuration file\n";
2528 } 2774 }
2529 2775
2530 DC::DB::Server::run; 2776 DC::DB::Server::run;
2531 2777
2532 if ($CFG->{db_schema} < 1) { 2778 if ($CFG->{db_schema} < 1) {
2533 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";
2534 DC::DB::nuke_db; 2780 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1; 2781 $CFG->{db_schema} = 1;
2536 DC::write_cfg; 2782 DC::write_cfg;
2537 } 2783 }
2538 2784
2539 DC::DB::open_db; 2785 DC::DB::open_db;
2540 2786
2541 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2542 2788
2543 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2544 sdl_mode => 0, 2791 sdl_mode => undef,
2545 fullscreen => 1, 2792 fullscreen => 1,
2546 fast => 0, 2793 fast => 0,
2547 force_opengl11 => undef, 2794 force_opengl11 => undef,
2548 disable_alpha => 0, 2795 disable_alpha => 0,
2549 smooth_movement => 1, 2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2550 texture_compression => 1, 2798 texture_compression => 1,
2551 map_scale => 1, 2799 map_scale => 1,
2552 fow_enable => 1, 2800 fow_enable => 1,
2553 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2554 map_smoothing => 1, 2803 map_smoothing => 1,
2555 gui_fontsize => 1, 2804 gui_fontsize => 1,
2556 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2557 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2558 gauge_size => 0.35, 2807 gauge_size => 0.35,
2559 stat_fontsize => 0.7, 2808 stat_fontsize => 0.7,
2560 mapsize => 100, 2809 mapsize => 100,
2561 audio_enable => 1, 2810 audio_enable => 1,
2562 audio_hw_channels => 0, 2811 audio_hw_channels => 0,
2563 audio_hw_frequency => 0, 2812 audio_hw_frequency => 0,
2564 audio_hw_chunksize => 0, 2813 audio_hw_chunksize => 0,
2565 audio_mix_channels => 8, 2814 audio_mix_channels => 8,
2566 effects_enable => 1, 2815 effects_enable => 1,
2567 effects_volume => 1, 2816 effects_volume => 1,
2568 bgm_enable => 1, 2817 bgm_enable => 1,
2569 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2570 output_rate => "", 2819 output_rate => "",
2571 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2572 inv_sort => "mtime", 2821 inv_sort => "mtime",
2573 default => "profile", # default profile 2822 default => "profile", # default profile
2574 show_tips => 1, 2823 show_tips => 1,
2575 logview_max_par => 1000, 2824 logview_max_par => 1000,
2576 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2577 ); 2829 );
2578 2830
2579 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2580 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2581 } 2833 }
2582 2834
2583 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2584 $PROFILE = $CFG->{profile}{default};
2585 2836
2586 # convert old bindings (only default profile matters) 2837 # OS X passes some process serial number of other shit. they
2587 if (my $bindings = delete $PROFILE->{bindings}) { 2838 # could have used an env var or any other sane mechanism. but
2588 while (my ($mod, $syms) = each %$bindings) { 2839 # would it be os x then? no...
2589 while (my ($sym, $cmds) = each %$syms) { 2840 shift @args if $args[0] =~ /^-psn_/;
2590 push @{ $PROFILE->{macro} }, { 2841
2591 accelkey => [$mod*1, $sym*1], 2842 my $profile = 'default';
2592 action => $cmds, 2843
2844 for (my $i = 0; $i < @args; $i++) {
2845 if ($args[$i] =~ /^--?profile$/) {
2846 $profile = $args[$i + 1];
2847 splice @args, $i, 2, ();
2593 }; 2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2594 } 2852 }
2595 } 2853 }
2596 }
2597 2854
2598 sdl_init; 2855 $CFG->{profile}{$profile} ||= {};
2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2599 2858
2600 { 2859 $PROFILE->{host} = $args[0] if @args > 0;
2860 $PROFILE->{user} = $args[1] if @args > 1;
2861 $PROFILE->{password} = $args[2] if @args > 2;
2862
2863 # convert old bindings (only default profile matters)
2864 if (my $bindings = delete $PROFILE->{bindings}) {
2865 while (my ($mod, $syms) = each %$bindings) {
2866 while (my ($sym, $cmds) = each %$syms) {
2867 push @{ $PROFILE->{macro} }, {
2868 accelkey => [$mod*1, $sym*1],
2869 action => $cmds,
2870 };
2871 }
2872 }
2873 }
2874
2875 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2876 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2877
2878 {
2601 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2602 DejaVuSans.ttf 2880 DejaVuSans.ttf
2603 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
2604 DejaVuSans-Bold.ttf 2882 DejaVuSans-Bold.ttf
2605 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2606 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2607 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2608 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2609 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2610 ); 2889 );
2611 2890
2612 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2613 2892
2614 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2615 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2616 2895
2617 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2618 2897
2619 DC::pango_init; 2898 DC::pango_init;
2620 } 2899 }
2621 2900
2622# compare mono (ft) vs. rgba (cairo) 2901# compare mono (ft) vs. rgba (cairo)
2623# ft - 1.8s, cairo 3s, even in alpha-only mode 2902# ft - 1.8s, cairo 3s, even in alpha-only mode
2624# for my $rgba (0..1) { 2903# for my $rgba (0..1) {
2625# my $t1 = Time::HiRes::time; 2904# my $t1 = Time::HiRes::time;
2630# } 2909# }
2631# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2632# warn $t2-$t1; 2911# warn $t2-$t1;
2633# } 2912# }
2634 2913
2914 DC::IMG_Init;
2635 video_init; 2915 video_init;
2636 audio_init; 2916 audio_init;
2637} 2917 }
2638 2918
2639show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
2640 2920
2641our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2642 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2643 $startup_done->(); 2923 $startup_done->();
2644}; 2924 };
2645 2925
2926 debug_toggle 0;
2927
2646delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2647EV::loop; 2929 EV::loop;
2648 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2649#video_shutdown; 2933 #video_shutdown;
2650#audio_shutdown; 2934 #audio_shutdown;
2935
2651DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2652DC::SDL_Quit; 2937 DC::SDL_Quit;
2653DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2939}
2940
2941DC::SDL_braino; # see sub above
2654 2942
2655=head1 NAME 2943=head1 NAME
2656 2944
2657deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2658 2946
2659=head1 SYNOPSIS 2947=head1 SYNOPSIS
2660 2948
2661Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2662 2951
2663=head1 USAGE 2952=head1 USAGE
2664 2953
2665deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2954The deliantra client utilises OpenGL for all UI elements and the game. It
2666be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2667 2956
2668=head1 DEBUGGING 2957=head1 DEBUGGING
2669 2958
2670
2671CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2672 2960
2673 1 draw borders around widgets 2961 1 draw borders around widgets
2674 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2675 4 show fps 2963 4 show fps
2676 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2677 2966
2678=head1 AUTHOR 2967=head1 AUTHOR
2679 2968
2680Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2681 2970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines