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.44 by root, Mon May 26 03:34:02 2008 UTC vs.
Revision 1.115 by root, Sat Apr 24 09:53:09 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines