ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.57 by root, Wed Jul 23 03:38:34 2008 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 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 use 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};
487 sub audio_tab_update; 541 sub audio_tab_update;
488 audio_tab_update; 542 audio_tab_update;
489} 543}
490 544
491sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
492 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
493 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
494 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
495 554
496 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
736} 795}
737 796
738sub dc_connect { 797sub dc_connect {
739 my ($host, $port) = @_; 798 my ($host, $port) = @_;
740 799
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 800 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
801 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 802
743 $CONN = 803 $CONN =
744 new DC::Protocol 804 new DC::Protocol
745 host => $host, 805 host => $host,
746 port => $port, 806 port => $port,
747 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
749 mapw => $mapsize, 809 mapw => $mapw,
750 maph => $mapsize, 810 maph => $maph,
751 811
812 c_version => {
813 client => "deliantra",
752 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
753 818
754 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
756 map => $MAP, 821 map => $MAP,
757 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
763 828
764 on_connect => sub { 829 on_connect => sub {
765 if ($_[0]) { 830 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
767 832
768 status "login successful"; 833 status "successfully connected to the server";
769 } else { 834 } else {
770 undef $CONN; 835 undef $CONN;
771 status "unable to connect: $!"; 836 status "unable to connect: $!";
772 stop_game(); 837 stop_game();
773 } 838 }
775 ; 840 ;
776} 841}
777 842
778sub start_game { 843sub start_game {
779 status "logging in..."; 844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
780 849
781 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 852
786 $MAP = new DC::Map; 853 $MAP = new DC::Map;
787 854
788 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
793 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 }
795 } 866 }
796 867
797 dc_connect $host, $port; 868 dc_connect $host, $port;
798 }; 869 };
799 } else { 870 } else {
800 dc_connect $host, $port; 871 dc_connect $host, $port;
801 } 872 }
802} 873}
803 874
804sub stop_game { 875sub stop_game {
876 crash "stop_game";
877
805 $LOGIN_BUTTON->set_text ("Login / Register"); 878 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 879 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 880 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 881 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 882 $SPELL_LIST->clear_spells;
823} 896}
824 897
825sub graphics_setup { 898sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 899 my $vbox = new DC::UI::VBox;
827 900
901 {
902 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
903
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 904 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 905
830 my $row = 0; 906 my $row = 0;
831 907
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 908 $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, 909 $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, 910 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 911 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 912
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 913 $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, 914 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 915 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 916 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 " 917 . "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 " 918 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 919 . "by installing the right driver for your graphics card.");
844 920
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
923 value => $CFG->{uitheme},
924 options => [
925 [wood => "Wood (the default)"],
926 [plain => "Plain (very)"],
927 [blue => "Blue (dark)"],
928 [metal => "Metal (light)"],
929 ],
930 tooltip => "Choose the User Interface theme that you like most :)",
931 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
932 );
933
845 my $vidmode_tooltip = 934 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 935 "<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>."; 936 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 937
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 938 $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); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 940
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
942 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 943 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 944 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 948 can_events => 1, tooltip => $vidmode_tooltip);
859 949
860 $MODE_SLIDER->connect (changed => sub { 950 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 951 my ($self, $value) = @_;
952
953 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
954 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
955 });
956 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
957
958 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
959 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
960 state => $CFG->{fullscreen},
961 tooltip => "Bring the client into fullscreen mode.",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{force_opengl11},
968 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
969 . "higher memory usage and slower performance. It will, however, help tremendously on "
970 . "cards that claim to support a feature but fall back to software rendering. "
971 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
972 . "but cards and drivers from other vendors (ATI) are often just as bad. "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
975 );
976
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
978 $table->add_at (1, $row++, new DC::UI::CheckBox
979 state => $CFG->{disable_alpha},
980 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
981 . "by disabling a number of textures and transparency effects. Normally, these "
982 . "effects do not cost a lot of resources, but some graphics cards might fall "
983 . "back to extremely slow rendering if this is enabled. If disabling this option "
984 . "noticably improves the framerate of the client please report this! "
985 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
986 on_changed => sub {
987 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 988 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 989 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
990 0
900 0 991 }
901 } 992 );
902 );
903 993
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 996 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 997 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 998 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 999 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 1000 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 1002 );
913 1003
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1004 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1005 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 1006 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 1007 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 1009 );
920 1010
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1013 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1014 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1015 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1016 );
927 1017
928 $table->add_at (1, $row++, new DC::UI::Button 1018 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1019 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1020 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1021 on_activate => sub {
932 video_shutdown (); 1022 video_shutdown ();
933 video_init (); 1023 video_init ();
1024 0
934 0 1025 }
935 } 1026 );
936 ); 1027 }
937 1028
1029 {
1030 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1031
1032 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1033
1034 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1035 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1037 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1038 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1039 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1040 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1042 );
946 1043
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{smooth_transitions},
1047 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1048 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1049 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1050 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1051 );
1052
1053
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1058 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1059 );
953 1060
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1061 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1062 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1063 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1064 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
958 . "This increases load on the graphics subsystem and works only with TRT servers. " 1065 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1066 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1067 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1068 );
962 1069
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1073 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1075 );
969 1076
1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1078 $table->add_at (1, $row++, new DC::UI::ImageButton
1079 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1080 bg => [0.3, 0.3, 0.2],
1081 force_w => 64,
1082 force_h => 64,
1083 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.",
1084 on_activate => sub {
1085 my ($self) = @_;
1086 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1087 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1088 $MAPWIDGET->update;
1089 }
1090 );
1091
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1095 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1097 );
976 1098
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1099 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1100 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1101 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1102 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1103 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1104 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1105 );
984 1106
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1107 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1108 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1109 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1110 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1111 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1112 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1113 &set_gauge_window_fontsize;
1114 0
992 0 1115 }
993 } 1116 );
994 );
995 1117
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1120 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1121 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1122 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1123 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1124 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1125 0
1003 0 1126 }
1004 } 1127 );
1005 ); 1128 }
1006 1129
1007 $vbox 1130 $vbox
1008} 1131}
1009 1132
1010our $AUDIO_HW_CHUNKSIZE; 1133our $AUDIO_HW_CHUNKSIZE;
1022 ]); 1145 ]);
1023 1146
1024 my $text = !$freq 1147 my $text = !$freq
1025 ? "audio is off" 1148 ? "audio is off"
1026 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
1027 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
1028 . "channels: $chans"; 1152 . "channels: $chans\n"
1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1029 1155
1030 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
1031} 1157}
1032 1158
1033sub audio_setup { 1159sub audio_setup {
1062 ); 1188 );
1063 1189
1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1065 $table->add_at (1, $row, new DC::UI::CheckBox 1191 $table->add_at (1, $row, new DC::UI::CheckBox
1066 expand => 1, state => $CFG->{bgm_enable}, 1192 expand => 1, state => $CFG->{bgm_enable},
1067 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1193 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1068 on_changed => sub { 1194 on_changed => sub {
1069 $CFG->{bgm_enable} = $_[1]; 1195 $CFG->{bgm_enable} = $_[1];
1070 $CONN->update_fx_want if $CONN; 1196 $CONN->update_fx_want if $CONN;
1071 audio_music_push; 1197 audio_music_push;
1072 1 1198 1
1173} 1299}
1174 1300
1175sub make_gauge_window { 1301sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1302 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1303
1178 my $win = new DC::UI::Frame ( 1304 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1305 force_x => 0,
1180 force_y => "max", 1306 force_y => "max",
1181 force_w => $WIDTH, 1307 force_w => $WIDTH,
1182 force_h => $gh, 1308 force_h => $gh,
1183 ); 1309 );
1199 (new DC::UI::Empty expand => 1), 1325 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1326 (my $hb = new DC::UI::HBox),
1201 ], 1327 ],
1202 ); 1328 );
1203 1329
1204 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1330 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1205 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1331 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1206 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1332 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1207 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1333 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1208
1209 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1210 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1211 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1212 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1213
1214 $GAUGES = {
1215 exp => $exp, prg => $prg, sklprg => $sklprg,
1216 win => $win, range => $rng,
1217 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1218 };
1219 1334
1220 &set_gauge_window_fontsize; 1335 &set_gauge_window_fontsize;
1221 1336
1222 $win 1337 $win
1338}
1339
1340our $BW_WATCHER;
1341
1342sub debug_toggle($) {
1343 $DELIANTRA_DEBUG ^= $_[0];
1344
1345 if ($DELIANTRA_DEBUG & 16) {
1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1347 return unless $CONN;
1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1349 $CONN->{octets_in} = 0;
1350 };
1351 } else {
1352 undef $BW_WATCHER;
1353 }
1354
1223} 1355}
1224 1356
1225sub debug_setup { 1357sub debug_setup {
1226 my $table = new DC::UI::Table; 1358 my $table = new DC::UI::Table;
1227 1359
1228 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1360 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1229 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1361 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1230 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1362 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1231 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1363 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1232 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1364 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1233 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1365 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1234 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1366 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1235 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1367 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1368 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1369 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1370
1236 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1371 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1237
1238 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1372 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1239 1373
1240 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1374 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1241 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1375 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1242 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1376 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1243 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1377 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1564 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1698 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1565 ); 1699 );
1566 1700
1567 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1701 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1568 $table->add_at (1, 4, new DC::UI::Entry 1702 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1703 text => $PROFILE->{user},
1570 tooltip => "The name of your character on the server.", 1704 tooltip => "The name of your character on the server. The name is case-sensitive!",
1571 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1705 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1572 ); 1706 );
1573 1707
1574 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1708 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1575 $table->add_at (1, 5, new DC::UI::Entry 1709 $table->add_at (1, 5, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{password}, 1710 text => $PROFILE->{password},
1577 hidden => 1, 1711 hidden => 1,
1578 tooltip => "The password for your character.", 1712 tooltip => "The password for your character.",
1579 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1713 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1580 ); 1714 );
1581 1715
1582 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1716 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1583 expand => 1, 1717 expand => 1,
1584 text => "Login / Register", 1718 text => "Login / Register",
1589 1 1723 1
1590 }, 1724 },
1591 ); 1725 );
1592 1726
1593 $vbox->add (new DC::UI::FancyFrame 1727 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1728 label => "How to Play",
1595 min_h => 200, 1729 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1730 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1731 markup =>
1732 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1733 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1734 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1735 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1736 ),
1601 ); 1737 );
1602 1738
1603 $vbox 1739 $vbox
1618 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1754 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1619 1755
1620 $vbox->add ( 1756 $vbox->add (
1621 $HOST_ENTRY = new DC::UI::Entry 1757 $HOST_ENTRY = new DC::UI::Entry
1622 expand => 1, 1758 expand => 1,
1623 text => $CFG->{profile}{default}{host}, 1759 text => $PROFILE->{host},
1624 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1760 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1625 on_changed => sub { 1761 on_changed => sub {
1626 my ($self, $value) = @_; 1762 my ($self, $value) = @_;
1627 $CFG->{profile}{default}{host} = $value; 1763 $PROFILE->{host} = $value;
1628 1 1764 1
1629 } 1765 }
1630 ); 1766 );
1631 1767
1632 if (0) { #d# disabled 1768 if (0) { #d# disabled
1675 1811
1676 my $row = 0; 1812 my $row = 0;
1677 1813
1678 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1679 $table->add_at (1, $row++, new DC::UI::CheckBox 1815 $table->add_at (1, $row++, new DC::UI::CheckBox
1816 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1817 state => $CFG->{show_tips},
1681 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1818 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1682 on_changed => sub { 1819 on_changed => sub {
1683 my ($self, $value) = @_; 1820 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1821 $CFG->{show_tips} = $value;
1686 } 1823 }
1687 ); 1824 );
1688 1825
1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1826 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1827 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1828 c_colspan => 2,
1691 text => $CFG->{logview_max_par}, 1829 text => $CFG->{logview_max_par},
1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1830 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1693 . "sends more messages than this number, older messages get removed to save memory and " 1831 . "sends more messages than this number, older messages get removed to save memory and "
1694 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1832 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1695 on_changed => sub { 1833 on_changed => sub {
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1835 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1836 0
1699 }, 1837 },
1700 ); 1838 );
1701 1839
1840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1841 $table->add_at (1, $row, new DC::UI::CheckBox
1842 state => $CFG->{config_autosave},
1843 tooltip => "Normally, configuration settings and the user interface layout "
1844 . "are saved on client exit. You can disable this behaviour by "
1845 . "unchecking this checkbox.",
1846 on_changed => sub {
1847 my ($self, $value) = @_;
1848 $CFG->{config_autosave} = $value;
1849 0
1850 }
1851 );
1852 $table->add_at (2, $row++, new DC::UI::Button
1853 text => "Save Now",
1854 tooltip => "Use this to manually save configuration and UI layout when "
1855 . "autosave is disabled.",
1856 on_activate => sub {
1857 DC::write_cfg;
1858 0
1859 }
1860 );
1861
1702 $table 1862 $table
1703} 1863}
1704 1864
1705sub autopickup_setup { 1865sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1866 my $r = new DC::UI::ScrolledWindow (
1712 col_expand => [0, 1, 0, 1], 1872 col_expand => [0, 1, 0, 1],
1713 ); 1873 );
1714 1874
1715 for ( 1875 for (
1716 ["General", 0, 0, 1876 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1877# ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1878 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1879 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1880 ],
1722 ["Weapons", 0, 6, 1881 ["Weapons", 0, 6,
1723 ["All weapons" => PICKUP_ALLWEAPON], 1882 ["All weapons" => PICKUP_ALLWEAPON],
1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1908 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1750 ["Ignore cursed" => PICKUP_NOT_CURSED], 1909 ["Ignore cursed" => PICKUP_NOT_CURSED],
1751 ["Jewelery" => PICKUP_JEWELS], 1910 ["Jewelery" => PICKUP_JEWELS],
1752 ["Flesh" => PICKUP_FLESH], 1911 ["Flesh" => PICKUP_FLESH],
1753 ], 1912 ],
1754 ["Weight/Value ratio", 2, 17] 1913 ["Value/Weight ratio", 2, 17]
1755 ) 1914 )
1756 { 1915 {
1757 my ($title, $x, $y, @bits) = @$_; 1916 my ($title, $x, $y, @bits) = @$_;
1758 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1917 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1759 1918
1771 $::CFG->{pickup} |= $mask; 1930 $::CFG->{pickup} |= $mask;
1772 } else { 1931 } else {
1773 $::CFG->{pickup} &= ~$mask; 1932 $::CFG->{pickup} &= ~$mask;
1774 } 1933 }
1775 1934
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1935 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1936 if defined $::CONN;
1778 1937
1779 0 1938 0
1780 }); 1939 });
1781 1940
1784 } 1943 }
1785 1944
1786 $table->add_at (2, 18, new DC::UI::ValSlider 1945 $table->add_at (2, 18, new DC::UI::ValSlider
1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1946 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1788 template => ">= 99", 1947 template => ">= 99",
1948 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1789 to_value => sub { ">= " . 5 * $_[0] }, 1949 to_value => sub { ">= " . 5 * $_[0] },
1790 on_changed => sub { 1950 on_changed => sub {
1791 my ($slider, $value) = @_; 1951 my ($slider, $value) = @_;
1792 1952
1793 $::CFG->{pickup} &= ~0xF; 1953 $::CFG->{pickup} &= ~0xF;
1797 }); 1957 });
1798 1958
1799 $table->add_at (3, 18, new DC::UI::Button 1959 $table->add_at (3, 18, new DC::UI::Button
1800 text => "set", 1960 text => "set",
1801 on_activate => sub { 1961 on_activate => sub {
1802 $::CONN->send_command ("pickup $::CFG->{pickup}") 1962 $::CONN->send_pickup ($::CFG->{pickup})
1803 if defined $::CONN; 1963 if defined $::CONN;
1804 0 1964 0
1805 }); 1965 });
1806 1966
1807 $r 1967 $r
1808} 1968}
1809 1969
1810my %SORT_ORDER = ( 1970my %SORT_ORDER = (
1811 type => sub { 1971 type => sub {
1972 use sort 'stable';
1812 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1973 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1813 }, 1974 },
1814 mtime => sub { 1975 mtime => sub {
1976 use sort 'stable';
1815 my $NOW = time; 1977 my $NOW = time;
1816 sort { 1978 sort {
1817 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1979 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1818 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1980 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1819 1981
1820 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1982 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1821 or $btime <=> $atime 1983 or $btime <=> $atime
1822 or $a->{type} <=> $b->{type} 1984 or $a->{type} <=> $b->{type}
1823 } @_ 1985 } @_
1824 }, 1986 },
1825 weight => sub { sort { 1987 weight => sub {
1988 use sort 'stable';
1989 sort {
1826 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1990 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1827 or $a->{type} <=> $b->{type} 1991 or $a->{type} <=> $b->{type}
1828 } @_ }, 1992 } @_
1993 },
1829); 1994);
1830 1995
1831sub inventory_widget { 1996sub inventory_widget {
1832 my $hb = new DC::UI::HBox homogeneous => 1; 1997 my $hb = new DC::UI::HBox homogeneous => 1;
1833 1998
1849 $::CFG->{inv_sort} = $_[1]; 2014 $::CFG->{inv_sort} = $_[1];
1850 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2015 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1851 }, 2016 },
1852 ); 2017 );
1853 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 2018 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1854 #TODO# update to weigh/maxweight 2019 #TODO# update to weight/maxweight
1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2020 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1856 2021
1857 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2022 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1858 $sw1->add ($INV = new DC::UI::Inventory); 2023 $sw1->add ($INV = new DC::UI::Inventory);
1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2024 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1920 $PL_NOTEBOOK->set_current_page ($widget); 2085 $PL_NOTEBOOK->set_current_page ($widget);
1921 $PL_WINDOW->show; 2086 $PL_WINDOW->show;
1922 } 2087 }
1923} 2088}
1924 2089
1925sub player_window { 2090sub make_playerbook {
1926 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2091 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1927 x => "center", 2092 x => "center",
1928 y => "center", 2093 y => "center",
1929 force_w => $WIDTH * 9/10, 2094 force_w => $WIDTH * 9/10,
1930 force_h => $HEIGHT * 9/10, 2095 force_h => $HEIGHT * 9/10,
1964 "License, Author and Source info for media sent by the server."); 2129 "License, Author and Source info for media sent by the server.");
1965 2130
1966 $ntb->set_current_page ($INVENTORY_PAGE); 2131 $ntb->set_current_page ($INVENTORY_PAGE);
1967 2132
1968 $plwin->add ($ntb); 2133 $plwin->add ($ntb);
1969 $plwin
1970} 2134}
1971 2135
1972sub keyboard_setup { 2136sub keyboard_setup {
1973 DC::Macro::keyboard_setup 2137 DC::Macro::keyboard_setup
1974} 2138}
1975 2139
1976sub help_window { 2140sub make_help_window {
1977 my $win = new DC::UI::Toplevel 2141 my $win = new DC::UI::Toplevel
1978 x => 'center', 2142 x => 'center',
1979 y => 'center', 2143 y => 'center',
1980 z => 4, 2144 z => 4,
1981 name => 'doc_browser', 2145 name => 'doc_browser',
2070 2234
2071 $load_node->((DC::Pod::find @path)[0]); 2235 $load_node->((DC::Pod::find @path)[0]);
2072 $win->show; 2236 $win->show;
2073 }; 2237 };
2074 2238
2075 $win 2239 $HELP_WINDOW = $win;
2076}
2077
2078sub open_string_query {
2079 my ($title, $cb, $txt, $tooltip) = @_;
2080 my $dialog = new DC::UI::Toplevel
2081 x => "center",
2082 y => "center",
2083 z => 50,
2084 force_w => $WIDTH * 4/5,
2085 title => $title;
2086
2087 $dialog->add (
2088 my $e = new DC::UI::Entry
2089 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2090 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2091 tooltip => $tooltip
2092 );
2093
2094 $e->grab_focus;
2095 $e->set_text ($txt) if $txt;
2096 $dialog->show;
2097} 2240}
2098 2241
2099sub open_quit_dialog { 2242sub open_quit_dialog {
2100 unless ($QUIT_DIALOG) { 2243 unless ($QUIT_DIALOG) {
2101 $QUIT_DIALOG = new DC::UI::Toplevel 2244 $QUIT_DIALOG = new DC::UI::Toplevel
2123 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2266 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2124 ); 2267 );
2125 $hb->add (new DC::UI::Button 2268 $hb->add (new DC::UI::Button
2126 text => "Quit anyway", 2269 text => "Quit anyway",
2127 expand => 1, 2270 expand => 1,
2128 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2271 on_activate => sub {
2272 crash "Quit anyway";
2273 EV::unloop EV::UNLOOP_ALL;
2274 },
2129 ); 2275 );
2130 } 2276 }
2131 2277
2132 $QUIT_DIALOG->show; 2278 $QUIT_DIALOG->show;
2133 $QUIT_DIALOG->grab_focus; 2279 $QUIT_DIALOG->grab_focus;
2280}
2281
2282sub make_menubar {
2283 $MENUFRAME = new DC::UI::Toplevel
2284 border => 0,
2285 force_x => 0,
2286 force_y => 0,
2287 force_w => $::WIDTH,
2288 child => ($MENUBAR = new DC::UI::HBox),
2289 ;
2290
2291 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2292
2293 # 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
2294 make_gauge_window->show;
2295
2296# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2297# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2298
2299 make_playerbook;
2300
2301 $MENUPOPUP = DC::UI::Menu->new (items => [
2302 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2303 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2304 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2305 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2306 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2307 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2308 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2309 ["Quit…" , sub {
2310 if ($CONN) {
2311 open_quit_dialog;
2312 } else {
2313 EV::unloop EV::UNLOOP_ALL;
2314 }
2315 }],
2316 ]);
2317
2318 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2319 tooltip => "Shows the main menu",
2320 on_button_down => sub {
2321 my ($self, $ev) = @_;
2322 local $ev->{x} = 0;
2323 local $ev->{y} = 0;
2324 $MENUPOPUP->popup ($ev);
2325 },
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2329 padding_x => 6,
2330 padding_y => 3,
2331 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2332 template => " Exp: 888,888,888,888 (lvl 188) ",
2333 );
2334
2335 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2336 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2337 . "will automatically pick up items as defined by your item pickup settings "
2338 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2339 . "disable autopickup by disabling this checkbox.",
2340 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2341 on_changed => sub {
2342 my ($self, $value) = @_;
2343 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2344 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2345 $CONN->send_pickup ($CFG->{pickup})
2346 if $CONN;
2347 },
2348 );
2349
2350 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2351 c_rescale => 1,
2352 padding_x => 6,
2353 padding_y => 3,
2354 force_w => $::WIDTH * 0.2,
2355 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2356 template => "two handed weapons 99%",
2357 );
2358
2359 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2360 expand => 1,
2361 align => 1, can_hover => 1, can_events => 1,
2362 text => "Range and Combat Slots",
2363 tooltip => "#stat_ranged",
2364 );
2365
2366 $MENUFRAME->show;
2367}
2368
2369sub open_string_query {
2370 my ($title, $cb, $txt, $tooltip) = @_;
2371 my $dialog = new DC::UI::Toplevel
2372 x => "center",
2373 y => "center",
2374 z => 50,
2375 force_w => $WIDTH * 4/5,
2376 title => $title;
2377
2378 $dialog->add (
2379 my $e = new DC::UI::Entry
2380 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2381 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2382 tooltip => $tooltip
2383 );
2384
2385 $e->grab_focus;
2386 $e->set_text ($txt) if $txt;
2387 $dialog->show;
2134} 2388}
2135 2389
2136sub show_tip_of_the_day { 2390sub show_tip_of_the_day {
2137 # find all tips 2391 # find all tips
2138 my @tod = DC::Pod::find tip_of_the_day => "*"; 2392 my @tod = DC::Pod::find tip_of_the_day => "*";
2191 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2445 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2192 and die "SDL::Init failed!\n"; 2446 and die "SDL::Init failed!\n";
2193} 2447}
2194 2448
2195sub video_init { 2449sub video_init {
2450 DC::set_theme $CFG->{uitheme};
2451
2196 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2452 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2197 $SDL_REINIT = 0; 2453 $SDL_REINIT = 0;
2198 2454
2199 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2455 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2200 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2456 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2457 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2458 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203 2459
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2460 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205 2461
2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2462 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0; 2463 $CFG->{sdl_mode} = 0; # lowest resolution by default
2464
2465 # now choose biggest mode <= 1024x768
2208 for (reverse 0 .. $#SDL_MODES) { 2466 for (0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2467 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2468 $CFG->{sdl_mode} = $_;
2469 }
2210 } 2470 }
2211 } 2471 }
2212 2472
2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2473 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2214 2474
2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2475 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2216 $FULLSCREEN = $CFG->{fullscreen}; 2476 $FULLSCREEN = $CFG->{fullscreen};
2217 $FAST = $CFG->{fast}; 2477 $FAST = $CFG->{fast};
2218 2478
2479 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2219 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2480 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2481 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2220 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2482 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2221 2483
2222 $SDL_ACTIVE = 1; 2484 $SDL_ACTIVE = 1;
2223 $LAST_REFRESH = time - 0.01; 2485 $LAST_REFRESH = time - 0.01;
2224 2486
2250 2512
2251 $DEBUG_STATUS = new DC::UI::Label 2513 $DEBUG_STATUS = new DC::UI::Label
2252 padding => 0, 2514 padding => 0,
2253 z => 100, 2515 z => 100,
2254 force_x => "max", 2516 force_x => "max",
2255 force_y => 0; 2517 force_y => 20;
2256 $DEBUG_STATUS->show; 2518 $DEBUG_STATUS->show;
2257 2519
2258 $STATUSBOX = new DC::UI::Statusbox; 2520 $STATUSBOX = new DC::UI::Statusbox;
2259 2521
2260 $MODBOX = new DC::UI::Label 2522 $MODBOX = new DC::UI::Label
2271 2533
2272 (new DC::UI::Frame 2534 (new DC::UI::Frame
2273 bg => [0, 0, 0, 0.4], 2535 bg => [0, 0, 0, 0.4],
2274 force_x => 0, 2536 force_x => 0,
2275 force_y => "max", 2537 force_y => "max",
2276 child => (my $LR = new DC::UI::VBox), 2538 child => (my $LL = new DC::UI::VBox),
2277 )->show; 2539 )->show;
2278 2540
2279 $LR->add ($STATUSBOX); 2541 $LL->add ($STATUSBOX);
2280 $LR->add ($MODBOX); 2542 $LL->add ($MODBOX);
2281 $LR->add (new DC::UI::Label 2543 $LL->add (new DC::UI::Label
2282 align => 0, 2544 align => 0,
2283 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2545 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2284 fontsize => 0.5, 2546 fontsize => 0.5,
2285 fg => [1, 1, 0, 0.7], 2547 fg => [1, 1, 0, 0.7],
2286 ); 2548 );
2287 2549
2288 DC::UI::Toplevel->new ( 2550 DC::UI::Toplevel->new (
2289 title => "Minimap", 2551 title => "Minimap",
2290 name => "mapmap", 2552 name => "mapmap",
2291 x => 0, 2553 x => 0,
2292 y => $FONTSIZE + 8, 2554 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2293 border_bg => [1, 1, 1, 192/255], 2555 border_bg => [1, 1, 1, 192/255],
2294 bg => [1, 1, 1, 0], 2556 bg => [1, 1, 1, 0],
2295 child => ($MAPMAP = new DC::MapWidget::MapMap 2557 child => ($MAPMAP = new DC::MapWidget::MapMap
2296 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2558 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2297 ), 2559 ),
2298 )->show; 2560 )->show;
2299 2561
2300 $MAPWIDGET = new DC::MapWidget; 2562 $MAPWIDGET = new DC::MapWidget;
2301 $MAPWIDGET->connect (activate_console => sub { 2563 $MAPWIDGET->connect (activate_console => sub {
2326 $METASERVER = metaserver_dialog; 2588 $METASERVER = metaserver_dialog;
2327 # the name is changed to not conflict with the older name as users could have hidden it 2589 # the name is changed to not conflict with the older name as users could have hidden it
2328 $MESSAGE_WINDOW = new DC::UI::Dockbar 2590 $MESSAGE_WINDOW = new DC::UI::Dockbar
2329 name => "message_window2", 2591 name => "message_window2",
2330 title => 'Messages', 2592 title => 'Messages',
2593 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2331 force_w => $::WIDTH * 0.6, 2594 force_w => $::WIDTH * 0.6,
2332 force_h => $::HEIGHT * 0.25, 2595 force_h => $::HEIGHT * 0.25,
2333 ; 2596 ;
2334 2597
2335 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2598 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2355 . "After pressing the combo the binding will be saved automatically and the " 2618 . "After pressing the combo the binding will be saved automatically and the "
2356 . "binding editor closes"); 2619 . "binding editor closes");
2357 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2620 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2358 "Some debuggin' options. Do not ask."); 2621 "Some debuggin' options. Do not ask.");
2359 2622
2360 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2623 make_help_window;
2624 make_menubar;
2361 2625
2362 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2363 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2364
2365# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2366# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2367
2368 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2369
2370 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2371 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2372
2373 $BUTTONBAR->add (new DC::UI::Button
2374 text => "Save Config",
2375 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2376 on_activate => sub {
2377 $::CFG->{layout} = DC::UI::get_layout;
2378 DC::write_cfg;
2379 status "Configuration Saved";
2380 0
2381 },
2382 );
2383
2384 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2385 tooltip => "View Documentation");
2386
2387 $BUTTONBAR->add (new DC::UI::Button
2388 text => "Quit",
2389 tooltip => "Terminates the program",
2390 on_activate => sub {
2391 if ($CONN) {
2392 open_quit_dialog;
2393 } else {
2394 EV::unloop EV::UNLOOP_ALL;
2395 }
2396 0
2397 },
2398 );
2399
2400 $BUTTONBAR->show;
2401 $SETUP_DIALOG->show; 2626 $SETUP_DIALOG->show;
2402 $MESSAGE_WINDOW->show; 2627 $MESSAGE_WINDOW->show;
2403 } 2628 }
2404 2629
2405 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2630 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2406 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2631 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2407 2632
2408 $CAVEAT_LABEL->set_text ("None :)"); 2633 $CAVEAT_LABEL->set_text ("None :)");
2634 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2635 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2409 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2636 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2410 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2637 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2411 2638
2412 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2639 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2413} 2640}
2423my $animate_timer; 2650my $animate_timer;
2424 2651
2425my $fps = 9; 2652my $fps = 9;
2426 2653
2427sub force_refresh { 2654sub force_refresh {
2428 if ($ENV{CFPLUS_DEBUG} & 4) { 2655 if ($DELIANTRA_DEBUG & 4) {
2429 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2656 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2430 debug sprintf "%3.2f", $fps; 2657 debug sprintf "%3.2f", $fps;
2431 } 2658 }
2432 2659
2433 undef $WANT_REFRESH; 2660 undef $WANT_REFRESH;
2441my $want_refresh = EV::prepare_ns \&force_refresh; 2668my $want_refresh = EV::prepare_ns \&force_refresh;
2442 2669
2443my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2670my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2444 $NOW = EV::now; 2671 $NOW = EV::now;
2445 2672
2446 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2673 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2447 for DC::poll_events; 2674 for DC::poll_events;
2448 2675
2449 if (%animate_object) { 2676 if (%animate_object) {
2450 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2677 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2451 $WANT_REFRESH = 1; 2678 $WANT_REFRESH = 1;
2463sub animation_stop { 2690sub animation_stop {
2464 my ($widget) = @_; 2691 my ($widget) = @_;
2465 delete $animate_object{$widget}; 2692 delete $animate_object{$widget};
2466} 2693}
2467 2694
2468%SDL_CB = (
2469 DC::SDL_QUIT => sub { 2695$SDL_CB[DC::SDL_QUIT] = sub {
2696 crash "SDL_QUIT";
2470 EV::unloop EV::UNLOOP_ALL; 2697 EV::unloop EV::UNLOOP_ALL;
2471 }, 2698};
2472 DC::SDL_VIDEORESIZE => sub { 2699$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2473 },
2474 DC::SDL_VIDEOEXPOSE => sub { 2700$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2475 DC::UI::full_refresh; 2701 DC::UI::full_refresh;
2476 }, 2702};
2477 DC::SDL_ACTIVEEVENT => sub { 2703$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2478# not useful, as APPACTIVE includes only iconified state, not unmapped 2704# not useful, as APPACTIVE includes only iconified state, not unmapped
2479# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2705# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2480# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2706# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2481# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2707# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2482# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2708# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2483# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2709# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2484 }, 2710};
2485 DC::SDL_KEYDOWN => sub { 2711$SDL_CB[DC::SDL_KEYDOWN] = sub {
2486 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2712 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2487 # alt-enter 2713 # alt-enter
2488 video_shutdown; 2714 video_shutdown;
2489 $FULLSCREEN_ENABLE->toggle; 2715 $FULLSCREEN_ENABLE->toggle;
2490 video_init; 2716 video_init;
2491 } else { 2717 } else {
2492 &DC::UI::feed_sdl_key_down_event; 2718 &DC::UI::feed_sdl_key_down_event;
2493 } 2719 }
2494 update_modbox; 2720 update_modbox;
2495 }, 2721};
2496 DC::SDL_KEYUP => sub { 2722$SDL_CB[DC::SDL_KEYUP] = sub {
2497 &DC::UI::feed_sdl_key_up_event; 2723 &DC::UI::feed_sdl_key_up_event;
2498 update_modbox; 2724 update_modbox;
2499 }, 2725};
2500 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2726$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2501 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2502 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2728$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2503 DC::SDL_USEREVENT => sub { 2729$SDL_CB[DC::SDL_USEREVENT] = sub {
2504 if ($_[0]{code} == 1) { 2730 if ($_[0]{code} == 1) {
2505 audio_channel_finished $_[0]{data1}; 2731 audio_channel_finished $_[0]{data1};
2506 } elsif ($_[0]{code} == 0) { 2732 } elsif ($_[0]{code} == 0) {
2507 audio_music_finished; 2733 audio_music_finished;
2508 }
2509 }, 2734 }
2510); 2735};
2511 2736
2512############################################################################# 2737#############################################################################
2513 2738
2514$SIG{INT} = $SIG{TERM} = sub { 2739$SIG{INT} = $SIG{TERM} = sub {
2515 EV::unloop; 2740 EV::unloop;
2516 #d# TODO calling exit here hangs the process in some futex 2741 #d# TODO calling exit here hangs the process in some futex
2517}; 2742};
2518 2743
2519{ 2744# due to mac os x + sdl combined braindamage, we need this contortion
2745sub main {
2746 {
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2747 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521 2748
2522 if (-e "$Deliantra::VARDIR/client.cf") { 2749 if (-e "$Deliantra::VARDIR/client.cf") {
2523 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2750 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2524 } else { 2751 } else {
2525 #TODO: compatibility cruft 2752 #TODO: compatibility cruft
2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2753 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2527 print STDERR "INFO: used old configuration file\n"; 2754 print STDERR "INFO: used old configuration file\n";
2528 } 2755 }
2529 2756
2530 DC::DB::Server::run; 2757 DC::DB::Server::run;
2531 2758
2532 if ($CFG->{db_schema} < 1) { 2759 if ($CFG->{db_schema} < 1) {
2533 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2760 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2534 DC::DB::nuke_db; 2761 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1; 2762 $CFG->{db_schema} = 1;
2536 DC::write_cfg; 2763 DC::write_cfg;
2537 } 2764 }
2538 2765
2539 DC::DB::open_db; 2766 DC::DB::open_db;
2540 2767
2541 DC::UI::set_layout ($::CFG->{layout}); 2768 DC::UI::set_layout ($::CFG->{layout});
2542 2769
2543 my %DEF_CFG = ( 2770 my %DEF_CFG = (
2771 config_autosave => 1,
2544 sdl_mode => 0, 2772 sdl_mode => undef,
2545 fullscreen => 1, 2773 fullscreen => 1,
2546 fast => 0, 2774 fast => 0,
2547 force_opengl11 => undef, 2775 force_opengl11 => undef,
2548 disable_alpha => 0, 2776 disable_alpha => 0,
2549 smooth_movement => 1, 2777 smooth_movement => 1,
2778 smooth_transitions => 1,
2550 texture_compression => 1, 2779 texture_compression => 1,
2551 map_scale => 1, 2780 map_scale => 1,
2552 fow_enable => 1, 2781 fow_enable => 1,
2553 fow_intensity => 0, 2782 fow_intensity => 0,
2783 fow_texture => 0,
2554 map_smoothing => 1, 2784 map_smoothing => 1,
2555 gui_fontsize => 1, 2785 gui_fontsize => 1,
2556 log_fontsize => 0.7, 2786 log_fontsize => 0.7,
2557 gauge_fontsize => 1, 2787 gauge_fontsize => 1,
2558 gauge_size => 0.35, 2788 gauge_size => 0.35,
2559 stat_fontsize => 0.7, 2789 stat_fontsize => 0.7,
2560 mapsize => 100, 2790 mapsize => 100,
2561 audio_enable => 1, 2791 audio_enable => 1,
2562 audio_hw_channels => 0, 2792 audio_hw_channels => 0,
2563 audio_hw_frequency => 0, 2793 audio_hw_frequency => 0,
2564 audio_hw_chunksize => 0, 2794 audio_hw_chunksize => 0,
2565 audio_mix_channels => 8, 2795 audio_mix_channels => 8,
2566 effects_enable => 1, 2796 effects_enable => 1,
2567 effects_volume => 1, 2797 effects_volume => 1,
2568 bgm_enable => 1, 2798 bgm_enable => 1,
2569 bgm_volume => 0.5, 2799 bgm_volume => 0.5,
2570 output_rate => "", 2800 output_rate => "",
2571 pickup => 0, 2801 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2572 inv_sort => "mtime", 2802 inv_sort => "mtime",
2573 default => "profile", # default profile 2803 default => "profile", # default profile
2574 show_tips => 1, 2804 show_tips => 1,
2575 logview_max_par => 1000, 2805 logview_max_par => 1000,
2576 shift_fire_stop => 0, 2806 shift_fire_stop => 0,
2807 uitheme => "wood",
2808 map_shift_x => -24, # arbitrary
2809 map_shift_y => +24, # arbitrary
2577 ); 2810 );
2578 2811
2579 while (my ($k, $v) = each %DEF_CFG) { 2812 while (my ($k, $v) = each %DEF_CFG) {
2580 $CFG->{$k} = $v unless exists $CFG->{$k}; 2813 $CFG->{$k} = $v unless exists $CFG->{$k};
2581 } 2814 }
2582 2815
2583 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2816 my @args = @ARGV;
2584 $PROFILE = $CFG->{profile}{default};
2585 2817
2586 # convert old bindings (only default profile matters) 2818 my $profile = 'default';
2587 if (my $bindings = delete $PROFILE->{bindings}) { 2819
2588 while (my ($mod, $syms) = each %$bindings) { 2820 for (my $i = 0; $i < @args; $i++) {
2589 while (my ($sym, $cmds) = each %$syms) { 2821 if ($args[$i] =~ /^--?profile$/) {
2590 push @{ $PROFILE->{macro} }, { 2822 $profile = $args[$i + 1];
2591 accelkey => [$mod*1, $sym*1], 2823 splice @args, $i, 2, ();
2592 action => $cmds,
2593 }; 2824 $i = 0;
2825 } elsif ($args[$i] =~ /^--?h/) {
2826 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2827 exit 0;
2594 } 2828 }
2595 } 2829 }
2596 }
2597 2830
2831 $CFG->{profile}{$profile} ||= {};
2832 $PROFILE = $CFG->{profile}{$profile};
2833 $PROFILE->{host} ||= "gameserver.deliantra.net";
2834
2835 $PROFILE->{host} = $args[0] if @args > 0;
2836 $PROFILE->{user} = $args[1] if @args > 1;
2837 $PROFILE->{password} = $args[2] if @args > 2;
2838
2839 # convert old bindings (only default profile matters)
2840 if (my $bindings = delete $PROFILE->{bindings}) {
2841 while (my ($mod, $syms) = each %$bindings) {
2842 while (my ($sym, $cmds) = each %$syms) {
2843 push @{ $PROFILE->{macro} }, {
2844 accelkey => [$mod*1, $sym*1],
2845 action => $cmds,
2846 };
2847 }
2848 }
2849 }
2850
2598 sdl_init; 2851 sdl_init;
2599 2852
2600 { 2853 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2854 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2855
2856 {
2601 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2857 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2602 DejaVuSans.ttf 2858 DejaVuSans.ttf
2603 DejaVuSansMono.ttf 2859 DejaVuSansMono.ttf
2604 DejaVuSans-Bold.ttf 2860 DejaVuSans-Bold.ttf
2605 DejaVuSansMono-Bold.ttf 2861 DejaVuSansMono-Bold.ttf
2606 DejaVuSans-Oblique.ttf 2862 DejaVuSans-Oblique.ttf
2607 DejaVuSansMono-Oblique.ttf 2863 DejaVuSansMono-Oblique.ttf
2608 DejaVuSans-BoldOblique.ttf 2864 DejaVuSans-BoldOblique.ttf
2609 DejaVuSansMono-BoldOblique.ttf 2865 DejaVuSansMono-BoldOblique.ttf
2866 mona.ttf
2610 ); 2867 );
2611 2868
2612 DC::add_font $_ for @fonts; 2869 DC::add_font $_ for @fonts;
2613 2870
2614 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2871 $FONT_PROP = new_from_file DC::Font $fonts[0];
2615 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2872 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2616 2873
2617 $FONT_PROP->make_default; 2874 $FONT_PROP->make_default;
2618 2875
2619 DC::pango_init; 2876 DC::pango_init;
2620 } 2877 }
2621 2878
2622# compare mono (ft) vs. rgba (cairo) 2879# compare mono (ft) vs. rgba (cairo)
2623# ft - 1.8s, cairo 3s, even in alpha-only mode 2880# ft - 1.8s, cairo 3s, even in alpha-only mode
2624# for my $rgba (0..1) { 2881# for my $rgba (0..1) {
2625# my $t1 = Time::HiRes::time; 2882# my $t1 = Time::HiRes::time;
2630# } 2887# }
2631# my $t2 = Time::HiRes::time; 2888# my $t2 = Time::HiRes::time;
2632# warn $t2-$t1; 2889# warn $t2-$t1;
2633# } 2890# }
2634 2891
2635 video_init; 2892 video_init;
2636 audio_init; 2893 audio_init;
2637} 2894 }
2638 2895
2639show_tip_of_the_day if $CFG->{show_tips}; 2896 show_tip_of_the_day if $CFG->{show_tips};
2640 2897
2641our $STARTUP_CANCEL = EV::idle sub { 2898 our $STARTUP_CANCEL = EV::idle sub {
2642 undef $::STARTUP_CANCEL; 2899 undef $::STARTUP_CANCEL;
2643 $startup_done->(); 2900 $startup_done->();
2644}; 2901 };
2645 2902
2903 debug_toggle 0;
2904
2646delete $SIG{__DIE__}; 2905 delete $SIG{__DIE__};
2647EV::loop; 2906 EV::loop;
2648 2907
2908 DC::write_cfg if $CFG->{config_autosave};
2909
2649#video_shutdown; 2910 #video_shutdown;
2650#audio_shutdown; 2911 #audio_shutdown;
2912
2651DC::OpenGL::quit; 2913 DC::OpenGL::quit;
2652DC::SDL_Quit; 2914 DC::SDL_Quit;
2653DC::DB::Server::stop; 2915 DC::DB::Server::stop;
2916}
2917
2918DC::SDL_braino; # see sub above
2654 2919
2655=head1 NAME 2920=head1 NAME
2656 2921
2657deliantra - A Deliantra MORPG game client 2922deliantra - A Deliantra MORPG game client
2658 2923
2659=head1 SYNOPSIS 2924=head1 SYNOPSIS
2660 2925
2661Just run it - no commandline arguments are supported. 2926 deliantra [--profile name] [host [user [password]]]
2927 deliantra --help
2662 2928
2663=head1 USAGE 2929=head1 USAGE
2664 2930
2665deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2931The deliantra client utilises OpenGL for all UI elements and the game. It
2666be used in fullscreen mode and interactively. 2932is supposed to be used in fullscreen mode and interactively.
2667 2933
2668=head1 DEBUGGING 2934=head1 DEBUGGING
2669 2935
2670
2671CFPLUS_DEBUG - environment variable 2936DELIANTRA_DEBUG - environment variable
2672 2937
2673 1 draw borders around widgets 2938 1 draw borders around widgets
2674 2 add low-level widget info to tooltips 2939 2 add low-level widget info to tooltips
2675 4 show fps 2940 4 show fps
2676 8 suppress tooltips 2941 8 suppress tooltips
2942 16 show bandwidth downstream
2677 2943
2678=head1 AUTHOR 2944=head1 AUTHOR
2679 2945
2680Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2946Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2681 2947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines