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.22 by root, Sat Dec 29 13:44:31 2007 UTC vs.
Revision 1.115 by root, Sat Apr 24 09:53:09 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines