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.55 by root, Fri Jul 18 23:00:52 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,
955 range => [ ($CFG->{sdl_mode}) x 3 ],
854 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
855 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
856 height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
857 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
858 960
859 $MODE_SLIDER->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
860 my ($self, $value) = @_;
861
862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
864 });
865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
866
867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
869 state => $CFG->{fullscreen},
870 tooltip => "Bring the client into fullscreen mode.",
871 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
872 );
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
875 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{force_opengl11},
877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
878 . "higher memory usage and slower performance. It will, however, help tremendously on "
879 . "cards that claim to support a feature but fall back to software rendering. "
880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884 );
885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 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) = @_;
897 $CFG->{disable_alpha} = $value; 999 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 1000 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
1001 0
899 0 1002 }
900 } 1003 );
901 );
902 1004
903 $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");
904 $table->add_at (1, $row++, new DC::UI::CheckBox 1006 $table->add_at (1, $row++, new DC::UI::CheckBox
905 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
906 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 "
907 . "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). "
908 . "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 "
909 . "forced OpenGL 1.1 mode.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911 ); 1013 );
912 1014
913 $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");
914 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
915 state => $CFG->{fast}, 1017 state => $CFG->{fast},
916 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
918 ); 1020 );
919 1021
920 $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");
921 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
922 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
923 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.",
924 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
925 ); 1027 );
926 1028
927 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
928 expand => 1, text => "Apply", 1030 expand => 1, text => "Apply",
929 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
930 on_activate => sub { 1032 on_activate => sub {
931 video_shutdown (); 1033 video_shutdown ();
932 video_init (); 1034 video_init ();
1035 0
933 0 1036 }
934 } 1037 );
1038 }
1039
1040 {
1041 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1042
1043 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1044
1045 my $row = 0;
1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1047 $table->add_at (1, $row++, new DC::UI::CheckBox
1048 state => $CFG->{smooth_movement},
1049 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1050 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1051 . "then disable this option. Changes take effect immdiately.",
1052 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935 ); 1053 );
936 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
937 $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");
938 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
940 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
941 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 }
942 ); 1070 );
943 1071
944 $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");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
947 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. "
948 . "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. "
949 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
951 ); 1079 );
952 1080
953 $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");
954 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
956 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.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
958 ); 1086 );
959 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
960 $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");
961 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
963 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.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
965 ); 1108 );
966 1109
967 $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");
968 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
969 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
970 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, "
971 . "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.",
972 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 },
973 ); 1116 );
974 1117
975 $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");
976 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
977 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
978 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.",
979 on_changed => sub { 1122 on_changed => sub {
980 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
981 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
982 0 1126 }
983 } 1127 );
984 );
985 1128
986 $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");
987 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
989 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.",
990 on_changed => sub { 1133 on_changed => sub {
991 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
992 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
993 0 1137 }
994 } 1138 );
995 ); 1139 }
996 1140
997 $vbox 1141 $vbox
998} 1142}
999 1143
1000our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
1012 ]); 1156 ]);
1013 1157
1014 my $text = !$freq 1158 my $text = !$freq
1015 ? "audio is off" 1159 ? "audio is off"
1016 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
1017 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
1018 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1019 1166
1020 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
1021} 1168}
1022 1169
1023sub audio_setup { 1170sub audio_setup {
1026 $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]);
1027 1174
1028 my $row = 0; 1175 my $row = 0;
1029 1176
1030 $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");
1031 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
1032 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
1033 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.",
1034 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 }
1035 ); 1195 );
1036 1196
1037 $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");
1038 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
1039 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
1052 ); 1212 );
1053 1213
1054 $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");
1055 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
1056 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
1057 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.",
1058 on_changed => sub { 1218 on_changed => sub {
1059 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
1060 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
1061 audio_music_push; 1221 audio_music_push;
1062 1 1222 1
1073 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
1074 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
1075 options => [ 1235 options => [
1076 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
1077 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
1078 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
1079 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
1080 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
1081 ], 1241 ],
1082 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.",
1083 on_changed => sub { 1243 on_changed => sub {
1084 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1085 audio_tab_update; 1245 audio_tab_update;
1109 $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");
1110 $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
1111 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1112 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1113 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 "
1114 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1115 on_changed => sub { 1275 on_changed => sub {
1116 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1117 audio_tab_update; 1277 audio_tab_update;
1118 1 1278 1
1119 } 1279 }
1163} 1323}
1164 1324
1165sub make_gauge_window { 1325sub make_gauge_window {
1166 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1167 1327
1168 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1169 force_x => 0, 1329 force_x => 0,
1170 force_y => "max", 1330 force_y => "max",
1171 force_w => $WIDTH, 1331 force_w => $WIDTH,
1172 force_h => $gh, 1332 force_h => $gh,
1173 ); 1333 );
1189 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1190 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1191 ], 1351 ],
1192 ); 1352 );
1193 1353
1194 $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");
1195 $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");
1196 $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");
1197 $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");
1198
1199 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1200 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1201 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1202 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1203
1204 $GAUGES = {
1205 exp => $exp, prg => $prg, sklprg => $sklprg,
1206 win => $win, range => $rng,
1207 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1208 };
1209 1358
1210 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1211 1360
1212 $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
1213} 1379}
1214 1380
1215sub debug_setup { 1381sub debug_setup {
1216 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1217 1383
1218 $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");
1219 $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 });
1220 $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");
1221 $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 });
1222 $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");
1223 $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 });
1224 $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");
1225 $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
1226 $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() } );
1227
1228 $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#
1229 1397
1230 $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);
1231 $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);
1232 $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 );
1233 $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);
1354 para => ["Paralysation", 1522 para => ["Paralysation",
1355 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"], 1523 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1356 deat => ["Death", 1524 deat => ["Death",
1357 "<b>Death</b> (resistance against death spells)"], 1525 "<b>Death</b> (resistance against death spells)"],
1358 phys => ["Physical", 1526 phys => ["Physical",
1359 "<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.)"],
1360 blind => ["Blind", 1528 blind => ["Blind",
1361 "<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)"],
1362 fear => ["Fear", 1530 fear => ["Fear",
1363 "<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)"],
1364 tund => ["Turn undead", 1532 tund => ["Turn undead",
1554 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]),
1555 ); 1723 );
1556 1724
1557 $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");
1558 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1559 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1560 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1562 ); 1730 );
1563 1731
1564 $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");
1565 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1566 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1567 hidden => 1, 1735 hidden => 1,
1568 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1569 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1570 ); 1738 );
1571 1739
1572 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1573 expand => 1, 1741 expand => 1,
1574 text => "Login / Register", 1742 text => "Login / Register",
1579 1 1747 1
1580 }, 1748 },
1581 ); 1749 );
1582 1750
1583 $vbox->add (new DC::UI::FancyFrame 1751 $vbox->add (new DC::UI::FancyFrame
1584 label => "Registering", 1752 label => "How to Play",
1585 min_h => 200, 1753 min_h => 240,
1586 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1754 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587 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). "
1588 "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 "
1589 . "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.",
1590 ), 1760 ),
1591 ); 1761 );
1592 1762
1593 $vbox 1763 $vbox
1608 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1609 1779
1610 $vbox->add ( 1780 $vbox->add (
1611 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1612 expand => 1, 1782 expand => 1,
1613 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1614 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>)",
1615 on_changed => sub { 1785 on_changed => sub {
1616 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1617 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1618 1 1788 1
1619 } 1789 }
1620 ); 1790 );
1621 1791
1622 if (0) { #d# disabled 1792 if (0) { #d# disabled
1665 1835
1666 my $row = 0; 1836 my $row = 0;
1667 1837
1668 $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");
1669 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1670 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1671 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?",
1672 on_changed => sub { 1843 on_changed => sub {
1673 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1674 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1676 } 1847 }
1677 ); 1848 );
1678 1849
1679 $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");
1680 $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,
1681 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1682 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 "
1683 . "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 "
1684 . "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.",
1685 on_changed => sub { 1857 on_changed => sub {
1687 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1688 0 1860 0
1689 }, 1861 },
1690 ); 1862 );
1691 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
1692 $table 1886 $table
1693} 1887}
1694 1888
1695sub autopickup_setup { 1889sub autopickup_setup {
1696 my $r = new DC::UI::ScrolledWindow ( 1890 my $r = new DC::UI::ScrolledWindow (
1702 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1703 ); 1897 );
1704 1898
1705 for ( 1899 for (
1706 ["General", 0, 0, 1900 ["General", 0, 0,
1707 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1708 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1709 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1710 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1711 ], 1904 ],
1712 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1713 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1739 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1932 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740 ["Ignore cursed" => PICKUP_NOT_CURSED], 1933 ["Ignore cursed" => PICKUP_NOT_CURSED],
1741 ["Jewelery" => PICKUP_JEWELS], 1934 ["Jewelery" => PICKUP_JEWELS],
1742 ["Flesh" => PICKUP_FLESH], 1935 ["Flesh" => PICKUP_FLESH],
1743 ], 1936 ],
1744 ["Weight/Value ratio", 2, 17] 1937 ["Value/Weight ratio", 2, 17]
1745 ) 1938 )
1746 { 1939 {
1747 my ($title, $x, $y, @bits) = @$_; 1940 my ($title, $x, $y, @bits) = @$_;
1748 $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]);
1749 1942
1761 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1762 } else { 1955 } else {
1763 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1764 } 1957 }
1765 1958
1766 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1767 if defined $::CONN; 1960 if defined $::CONN;
1768 1961
1769 0 1962 0
1770 }); 1963 });
1771 1964
1774 } 1967 }
1775 1968
1776 $table->add_at (2, 18, new DC::UI::ValSlider 1969 $table->add_at (2, 18, new DC::UI::ValSlider
1777 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1970 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778 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).",
1779 to_value => sub { ">= " . 5 * $_[0] }, 1973 to_value => sub { ">= " . 5 * $_[0] },
1780 on_changed => sub { 1974 on_changed => sub {
1781 my ($slider, $value) = @_; 1975 my ($slider, $value) = @_;
1782 1976
1783 $::CFG->{pickup} &= ~0xF; 1977 $::CFG->{pickup} &= ~0xF;
1787 }); 1981 });
1788 1982
1789 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1790 text => "set", 1984 text => "set",
1791 on_activate => sub { 1985 on_activate => sub {
1792 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1793 if defined $::CONN; 1987 if defined $::CONN;
1794 0 1988 0
1795 }); 1989 });
1796 1990
1797 $r 1991 $r
1798} 1992}
1799 1993
1800my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1801 type => sub { 1995 type => sub {
1996 use sort 'stable';
1802 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1803 }, 1998 },
1804 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1805 my $NOW = time; 2001 my $NOW = time;
1806 sort { 2002 sort {
1807 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;
1808 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;
1809 2005
1810 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1811 or $btime <=> $atime 2007 or $btime <=> $atime
1812 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1813 } @_ 2009 } @_
1814 }, 2010 },
1815 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1816 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1817 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1818 } @_ }, 2016 } @_
2017 },
1819); 2018);
1820 2019
1821sub inventory_widget { 2020sub inventory_widget {
1822 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1823 2022
1839 $::CFG->{inv_sort} = $_[1]; 2038 $::CFG->{inv_sort} = $_[1];
1840 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2039 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1841 }, 2040 },
1842 ); 2041 );
1843 $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);
1844 #TODO# update to weigh/maxweight 2043 #TODO# update to weight/maxweight
1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2044 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846 2045
1847 $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);
1848 $sw1->add ($INV = new DC::UI::Inventory); 2047 $sw1->add ($INV = new DC::UI::Inventory);
1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2048 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1910 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1911 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1912 } 2111 }
1913} 2112}
1914 2113
1915sub player_window { 2114sub make_playerbook {
1916 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1917 x => "center", 2116 x => "center",
1918 y => "center", 2117 y => "center",
1919 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1920 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
1954 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
1955 2154
1956 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
1957 2156
1958 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
1959 $plwin
1960} 2158}
1961 2159
1962sub keyboard_setup { 2160sub keyboard_setup {
1963 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
1964} 2162}
1965 2163
1966sub help_window { 2164sub make_help_window {
1967 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
1968 x => 'center', 2166 x => 'center',
1969 y => 'center', 2167 y => 'center',
1970 z => 4, 2168 z => 4,
1971 name => 'doc_browser', 2169 name => 'doc_browser',
2060 2258
2061 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
2062 $win->show; 2260 $win->show;
2063 }; 2261 };
2064 2262
2065 $win 2263 $HELP_WINDOW = $win;
2066}
2067
2068sub open_string_query {
2069 my ($title, $cb, $txt, $tooltip) = @_;
2070 my $dialog = new DC::UI::Toplevel
2071 x => "center",
2072 y => "center",
2073 z => 50,
2074 force_w => $WIDTH * 4/5,
2075 title => $title;
2076
2077 $dialog->add (
2078 my $e = new DC::UI::Entry
2079 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2080 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2081 tooltip => $tooltip
2082 );
2083
2084 $e->grab_focus;
2085 $e->set_text ($txt) if $txt;
2086 $dialog->show;
2087} 2264}
2088 2265
2089sub open_quit_dialog { 2266sub open_quit_dialog {
2090 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2091 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2113 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2290 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114 ); 2291 );
2115 $hb->add (new DC::UI::Button 2292 $hb->add (new DC::UI::Button
2116 text => "Quit anyway", 2293 text => "Quit anyway",
2117 expand => 1, 2294 expand => 1,
2118 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2295 on_activate => sub {
2296 crash "Quit anyway";
2297 EV::unloop EV::UNLOOP_ALL;
2298 },
2119 ); 2299 );
2120 } 2300 }
2121 2301
2122 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2123 $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;
2124} 2412}
2125 2413
2126sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2127 # find all tips 2415 # find all tips
2128 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2175 2463
2176 $dialog->show; 2464 $dialog->show;
2177 }; 2465 };
2178} 2466}
2179 2467
2180sub sdl_init {
2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2182 and die "SDL::Init failed!\n";
2183}
2184
2185sub video_init { 2468sub video_init {
2469 DC::set_theme $CFG->{uitheme};
2470
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2471 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0; 2472 $SDL_REINIT = 0;
2188 2473
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2474 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2475 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2476 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @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)";
2193 2478
2194 @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;
2195 2480
2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2481 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197 $CFG->{sdl_mode} = 0; 2482 $CFG->{sdl_mode} = 0; # lowest resolution by default
2483
2484 # now choose biggest mode <= 1024x768
2198 for (reverse 0 .. $#SDL_MODES) { 2485 for (0 .. $#SDL_MODES) {
2199 $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 }
2200 } 2489 }
2201 } 2490 }
2202 2491
2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2492 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204 2493
2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2494 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206 $FULLSCREEN = $CFG->{fullscreen}; 2495 $FULLSCREEN = $CFG->{fullscreen};
2207 $FAST = $CFG->{fast}; 2496 $FAST = $CFG->{fast};
2208 2497
2498 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2209 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
2210 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2501 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211 2502
2212 $SDL_ACTIVE = 1; 2503 $SDL_ACTIVE = 1;
2213 $LAST_REFRESH = time - 0.01; 2504 $LAST_REFRESH = time - 0.01;
2214 2505
2240 2531
2241 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2242 padding => 0, 2533 padding => 0,
2243 z => 100, 2534 z => 100,
2244 force_x => "max", 2535 force_x => "max",
2245 force_y => 0; 2536 force_y => 20;
2246 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2247 2538
2248 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2249 2540
2250 $MODBOX = new DC::UI::Label 2541 $MODBOX = new DC::UI::Label
2261 2552
2262 (new DC::UI::Frame 2553 (new DC::UI::Frame
2263 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2264 force_x => 0, 2555 force_x => 0,
2265 force_y => "max", 2556 force_y => "max",
2266 child => (my $LR = new DC::UI::VBox), 2557 child => (my $LL = new DC::UI::VBox),
2267 )->show; 2558 )->show;
2268 2559
2269 $LR->add ($STATUSBOX); 2560 $LL->add ($STATUSBOX);
2270 $LR->add ($MODBOX); 2561 $LL->add ($MODBOX);
2271 $LR->add (new DC::UI::Label 2562 $LL->add (new DC::UI::Label
2272 align => 0, 2563 align => 0,
2273 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2564 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2274 fontsize => 0.5, 2565 fontsize => 0.5,
2275 fg => [1, 1, 0, 0.7], 2566 fg => [1, 1, 0, 0.7],
2276 ); 2567 );
2277 2568
2278 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2279 title => "Minimap", 2570 title => "Minimap",
2280 name => "mapmap", 2571 name => "mapmap",
2281 x => 0, 2572 x => 0,
2282 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2283 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2284 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2285 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2286 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.",
2287 ), 2578 ),
2288 )->show; 2579 )->show;
2289 2580
2290 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2291 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2316 $METASERVER = metaserver_dialog; 2607 $METASERVER = metaserver_dialog;
2317 # 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
2318 $MESSAGE_WINDOW = new DC::UI::Dockbar 2609 $MESSAGE_WINDOW = new DC::UI::Dockbar
2319 name => "message_window2", 2610 name => "message_window2",
2320 title => 'Messages', 2611 title => 'Messages',
2612 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2321 force_w => $::WIDTH * 0.6, 2613 force_w => $::WIDTH * 0.6,
2322 force_h => $::HEIGHT * 0.25, 2614 force_h => $::HEIGHT * 0.25,
2323 ; 2615 ;
2324 2616
2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2345 . "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 "
2346 . "binding editor closes"); 2638 . "binding editor closes");
2347 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2348 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2349 2641
2350 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2351 2644
2352 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2353 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2354
2355# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2356# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2357
2358 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
2359
2360 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2361 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2362
2363 $BUTTONBAR->add (new DC::UI::Button
2364 text => "Save Config",
2365 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2366 on_activate => sub {
2367 $::CFG->{layout} = DC::UI::get_layout;
2368 DC::write_cfg;
2369 status "Configuration Saved";
2370 0
2371 },
2372 );
2373
2374 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2375 tooltip => "View Documentation");
2376
2377 $BUTTONBAR->add (new DC::UI::Button
2378 text => "Quit",
2379 tooltip => "Terminates the program",
2380 on_activate => sub {
2381 if ($CONN) {
2382 open_quit_dialog;
2383 } else {
2384 EV::unloop EV::UNLOOP_ALL;
2385 }
2386 0
2387 },
2388 );
2389
2390 $BUTTONBAR->show;
2391 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2392 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2393 } 2647 }
2394 2648
2395 $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]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2650 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397 2651
2398 $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;
2399 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2655 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2656 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401 2657
2402 $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]);
2403} 2659}
2413my $animate_timer; 2669my $animate_timer;
2414 2670
2415my $fps = 9; 2671my $fps = 9;
2416 2672
2417sub force_refresh { 2673sub force_refresh {
2418 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2419 $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;
2420 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2421 } 2677 }
2422 2678
2423 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2431my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2432 2688
2433my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2434 $NOW = EV::now; 2690 $NOW = EV::now;
2435 2691
2436 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2437 for DC::poll_events; 2693 for DC::poll_events;
2438 2694
2439 if (%animate_object) { 2695 if (%animate_object) {
2440 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2441 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2453sub animation_stop { 2709sub animation_stop {
2454 my ($widget) = @_; 2710 my ($widget) = @_;
2455 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2456} 2712}
2457 2713
2458%SDL_CB = (
2459 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2715 crash "SDL_QUIT";
2460 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2461 }, 2717};
2462 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2463 },
2464 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2465 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2466 }, 2721};
2467 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2468# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2469# 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#
2470# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2471# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2472# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2474 }, 2729};
2475 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2477 # alt-enter 2732 # alt-enter
2478 video_shutdown; 2733 video_shutdown;
2479 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2480 video_init; 2735 video_init;
2481 } else { 2736 } else {
2482 &DC::UI::feed_sdl_key_down_event; 2737 &DC::UI::feed_sdl_key_down_event;
2483 } 2738 }
2484 update_modbox; 2739 update_modbox;
2485 }, 2740};
2486 DC::SDL_KEYUP => sub { 2741$SDL_CB[DC::SDL_KEYUP] = sub {
2487 &DC::UI::feed_sdl_key_up_event; 2742 &DC::UI::feed_sdl_key_up_event;
2488 update_modbox; 2743 update_modbox;
2489 }, 2744};
2490 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2491 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2492 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2493 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2494 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2495 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2496 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2497 audio_music_finished; 2752 audio_music_finished;
2498 }
2499 }, 2753 }
2500); 2754};
2501 2755
2502############################################################################# 2756#############################################################################
2503 2757
2504$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2505 EV::unloop; 2759 EV::unloop;
2506 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2507}; 2761};
2508 2762
2509{ 2763# due to mac os x + sdl combined braindamage, we need this contortion
2764sub main {
2765 {
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2766 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511 2767
2512 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2513 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2769 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514 } else { 2770 } else {
2515 #TODO: compatibility cruft 2771 #TODO: compatibility cruft
2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2772 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517 print STDERR "INFO: used old configuration file\n"; 2773 print STDERR "INFO: used old configuration file\n";
2518 } 2774 }
2519 2775
2520 DC::DB::Server::run; 2776 DC::DB::Server::run;
2521 2777
2522 if ($CFG->{db_schema} < 1) { 2778 if ($CFG->{db_schema} < 1) {
2523 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";
2524 DC::DB::nuke_db; 2780 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1; 2781 $CFG->{db_schema} = 1;
2526 DC::write_cfg; 2782 DC::write_cfg;
2527 } 2783 }
2528 2784
2529 DC::DB::open_db; 2785 DC::DB::open_db;
2530 2786
2531 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2532 2788
2533 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2534 sdl_mode => 0, 2791 sdl_mode => undef,
2535 fullscreen => 1, 2792 fullscreen => 1,
2536 fast => 0, 2793 fast => 0,
2537 force_opengl11 => undef, 2794 force_opengl11 => undef,
2538 disable_alpha => 0, 2795 disable_alpha => 0,
2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2539 texture_compression => 1, 2798 texture_compression => 1,
2540 map_scale => 1, 2799 map_scale => 1,
2541 fow_enable => 1, 2800 fow_enable => 1,
2542 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2543 map_smoothing => 1, 2803 map_smoothing => 1,
2544 gui_fontsize => 1, 2804 gui_fontsize => 1,
2545 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2546 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2547 gauge_size => 0.35, 2807 gauge_size => 0.35,
2548 stat_fontsize => 0.7, 2808 stat_fontsize => 0.7,
2549 mapsize => 100, 2809 mapsize => 100,
2550 audio_enable => 1, 2810 audio_enable => 1,
2551 audio_hw_channels => 0, 2811 audio_hw_channels => 0,
2552 audio_hw_frequency => 0, 2812 audio_hw_frequency => 0,
2553 audio_hw_chunksize => 0, 2813 audio_hw_chunksize => 0,
2554 audio_mix_channels => 8, 2814 audio_mix_channels => 8,
2555 effects_enable => 1, 2815 effects_enable => 1,
2556 effects_volume => 1, 2816 effects_volume => 1,
2557 bgm_enable => 1, 2817 bgm_enable => 1,
2558 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2559 output_rate => "", 2819 output_rate => "",
2560 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2561 inv_sort => "mtime", 2821 inv_sort => "mtime",
2562 default => "profile", # default profile 2822 default => "profile", # default profile
2563 show_tips => 1, 2823 show_tips => 1,
2564 logview_max_par => 1000, 2824 logview_max_par => 1000,
2565 shift_fire_stop => 0, 2825 shift_fire_stop => 0,
2826 uitheme => "wood",
2827 map_shift_x => -24, # arbitrary
2828 map_shift_y => +24, # arbitrary
2566 ); 2829 );
2567 2830
2568 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2569 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2570 } 2833 }
2571 2834
2572 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2573 $PROFILE = $CFG->{profile}{default};
2574 2836
2575 # convert old bindings (only default profile matters) 2837 # OS X passes some process serial number of other shit. they
2576 if (my $bindings = delete $PROFILE->{bindings}) { 2838 # could have used an env var or any other sane mechanism. but
2577 while (my ($mod, $syms) = each %$bindings) { 2839 # would it be os x then? no...
2578 while (my ($sym, $cmds) = each %$syms) { 2840 shift @args if $args[0] =~ /^-psn_/;
2579 push @{ $PROFILE->{macro} }, { 2841
2580 accelkey => [$mod*1, $sym*1], 2842 my $profile = 'default';
2581 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, ();
2582 }; 2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2583 } 2852 }
2584 } 2853 }
2585 }
2586 2854
2587 sdl_init; 2855 $CFG->{profile}{$profile} ||= {};
2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2588 2858
2589 { 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 {
2590 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591 DejaVuSans.ttf 2880 DejaVuSans.ttf
2592 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
2593 DejaVuSans-Bold.ttf 2882 DejaVuSans-Bold.ttf
2594 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2595 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2596 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2597 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2598 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2599 ); 2889 );
2600 2890
2601 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2602 2892
2603 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2604 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2605 2895
2606 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2607 2897
2608 DC::pango_init; 2898 DC::pango_init;
2609 } 2899 }
2610 2900
2611# compare mono (ft) vs. rgba (cairo) 2901# compare mono (ft) vs. rgba (cairo)
2612# ft - 1.8s, cairo 3s, even in alpha-only mode 2902# ft - 1.8s, cairo 3s, even in alpha-only mode
2613# for my $rgba (0..1) { 2903# for my $rgba (0..1) {
2614# my $t1 = Time::HiRes::time; 2904# my $t1 = Time::HiRes::time;
2619# } 2909# }
2620# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2621# warn $t2-$t1; 2911# warn $t2-$t1;
2622# } 2912# }
2623 2913
2914 DC::IMG_Init;
2624 video_init; 2915 video_init;
2625 audio_init; 2916 audio_init;
2626} 2917 }
2627 2918
2628show_tip_of_the_day if $CFG->{show_tips}; 2919 show_tip_of_the_day if $CFG->{show_tips};
2629 2920
2630our $STARTUP_CANCEL = EV::idle sub { 2921 our $STARTUP_CANCEL = EV::idle sub {
2631 undef $::STARTUP_CANCEL; 2922 undef $::STARTUP_CANCEL;
2632 $startup_done->(); 2923 $startup_done->();
2633}; 2924 };
2634 2925
2926 debug_toggle 0;
2927
2635delete $SIG{__DIE__}; 2928 delete $SIG{__DIE__};
2636EV::loop; 2929 EV::loop;
2637 2930
2931 DC::write_cfg if $CFG->{config_autosave};
2932
2638#video_shutdown; 2933 #video_shutdown;
2639#audio_shutdown; 2934 #audio_shutdown;
2935
2640DC::OpenGL::quit; 2936 DC::OpenGL::quit;
2641DC::SDL_Quit; 2937 DC::SDL_Quit;
2642DC::DB::Server::stop; 2938 DC::DB::Server::stop;
2939}
2940
2941DC::SDL_braino; # see sub above
2643 2942
2644=head1 NAME 2943=head1 NAME
2645 2944
2646deliantra - A Deliantra MORPG game client 2945deliantra - A Deliantra MORPG game client
2647 2946
2648=head1 SYNOPSIS 2947=head1 SYNOPSIS
2649 2948
2650Just run it - no commandline arguments are supported. 2949 deliantra [--profile name] [host [user [password]]]
2950 deliantra --help
2651 2951
2652=head1 USAGE 2952=head1 USAGE
2653 2953
2654deliantra 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
2655be used in fullscreen mode and interactively. 2955is supposed to be used in fullscreen mode and interactively.
2656 2956
2657=head1 DEBUGGING 2957=head1 DEBUGGING
2658 2958
2659
2660CFPLUS_DEBUG - environment variable 2959DELIANTRA_DEBUG - environment variable
2661 2960
2662 1 draw borders around widgets 2961 1 draw borders around widgets
2663 2 add low-level widget info to tooltips 2962 2 add low-level widget info to tooltips
2664 4 show fps 2963 4 show fps
2665 8 suppress tooltips 2964 8 suppress tooltips
2965 16 show bandwidth downstream
2666 2966
2667=head1 AUTHOR 2967=head1 AUTHOR
2668 2968
2669Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2969Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670 2970
2671 2971
2672 2972

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines