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.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines