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.21 by root, Fri Dec 28 17:28:01 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
653 [Cha => CS_STAT_CHA], 760 [Cha => CS_STAT_CHA],
654 ) { 761 ) {
655 my ($name, $id) = @$_; 762 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 763 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 764 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 765 expand => 1,
660 can_events => 1, 766 can_events => 1,
661 can_hover => 1, 767 can_hover => 1,
662 tooltip => "#stat_$name", 768 tooltip => "#stat_$name",
663 ); 769 );
697 803
698 $vbox->add (@dialog); 804 $vbox->add (@dialog);
699 $dialog->show; 805 $dialog->show;
700} 806}
701 807
702sub start_game { 808sub dc_connect {
703 status "logging in..."; 809 my ($host, $port) = @_;
704 810
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707
708 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;
709 813
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 814 $CONN =
715 new DC::Protocol 815 new DC::Protocol
716 host => $host, 816 host => $host,
717 port => $port || 13327, 817 port => $port,
718 user => $PROFILE->{user}, 818 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 819 pass => $PROFILE->{password},
720 mapw => $mapsize, 820 mapw => $mapw,
721 maph => $mapsize, 821 maph => $maph,
722 822
723 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 },
724 829
725 map_widget => $MAPWIDGET, 830 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 831 statusbox => $STATUSBOX,
727 map => $MAP, 832 map => $MAP,
728 mapmap => $MAPMAP, 833 mapmap => $MAPMAP,
729 query => \&server_query, 834 query => \&server_query,
730 835
731 setup_req => { 836 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 837 smoothing => $CFG->{map_smoothing}*1,
733 }, 838 },
734 };
735 839
736 if ($CONN) { 840 on_connect => sub {
841 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 842 DC::lowdelay fileno $CONN->{fh};
738 843
739 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 };
740 } else { 881 } else {
741 status "unable to connect"; 882 dc_connect $host, $port;
742 stop_game();
743 } 883 }
744} 884}
745 885
746sub stop_game { 886sub stop_game {
887 crash "stop_game";
888
747 $LOGIN_BUTTON->set_text ("Login / Register"); 889 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 890 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
749 $SETUP_DIALOG->show; 891 $SETUP_DIALOG->show;
750 $PL_WINDOW->hide; 892 $PL_WINDOW->hide;
751 $SPELL_LIST->clear_spells; 893 $SPELL_LIST->clear_spells;
765} 907}
766 908
767sub graphics_setup { 909sub graphics_setup {
768 my $vbox = new DC::UI::VBox; 910 my $vbox = new DC::UI::VBox;
769 911
912 {
913 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
914
770 $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]);
771 916
772 my $row = 0; 917 my $row = 0;
773 918
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 919 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, 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,
776 can_events => 1, 921 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 922 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 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
779 my $vidmode_tooltip = 945 my $vidmode_tooltip =
780 "<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). "
781 . "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>.";
782 948
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 950 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 951
786 $hbox->add (my $mode_slider = new DC::UI::Slider 952 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 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 ],
788 tooltip => $vidmode_tooltip); 956 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 957 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 958 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 959 can_events => 1, tooltip => $vidmode_tooltip);
792 960
793 $mode_slider->connect (changed => sub { 961 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 962 my ($self, $value) = @_;
795 963
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 964 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $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]});
798 }); 966 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 967 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 968
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 970 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 971 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 972 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 974 );
807 975
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 978 state => $CFG->{force_opengl11},
811 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 "
812 . "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 "
813 . "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. "
814 . "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, "
815 . "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. "
816 . "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>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 986 );
819 987
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 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
1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
1006 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 1007 state => $CFG->{texture_compression},
823 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 "
824 . "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). "
825 . "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 "
826 . "forced OpenGL 1.1 mode.", 1011 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 1013 );
829 1014
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 1017 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 1018 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 1020 );
836 1021
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1024 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 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.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 1027 );
843 1028
844 $table->add_at (1, $row++, new DC::UI::Button 1029 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 1030 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 1031 tooltip => "Apply the video settings above.",
847 on_activate => sub { 1032 on_activate => sub {
848 video_shutdown (); 1033 video_shutdown ();
849 video_init (); 1034 video_init ();
1035 0
850 0 1036 }
851 } 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 }
852 ); 1053 );
853 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
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 1066 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1067 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1068 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 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 }
859 ); 1070 );
860 1071
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1073 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 1074 state => $CFG->{map_smoothing},
864 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. "
865 . "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. "
866 . "Changes take effect at next login only.", 1077 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1078 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 1079 );
869 1080
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 1082 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 1083 state => $CFG->{fow_enable},
873 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.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1085 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 1086 );
876 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
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 1104 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1105 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 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.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 1108 );
883 1109
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1110 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 1111 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1112 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 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, "
888 . "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.",
889 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 },
890 ); 1116 );
891 1117
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1120 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 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.",
896 on_changed => sub { 1122 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 1123 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 1124 &set_gauge_window_fontsize;
1125 0
899 0 1126 }
900 } 1127 );
901 );
902 1128
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1129 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1130 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1131 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 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.",
907 on_changed => sub { 1133 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1134 $CFG->{gauge_size} = $_[1];
909 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1135 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1136 0
910 0 1137 }
911 } 1138 );
912 ); 1139 }
913 1140
914 $vbox 1141 $vbox
915} 1142}
916 1143
917our $AUDIO_HW_CHUNKSIZE; 1144our $AUDIO_HW_CHUNKSIZE;
929 ]); 1156 ]);
930 1157
931 my $text = !$freq 1158 my $text = !$freq
932 ? "audio is off" 1159 ? "audio is off"
933 : "audio is enabled\n" 1160 : "audio is enabled\n"
1161 . "driver: " . DC::SDL_AudioDriverName . "\n"
934 . "frequency (Hz): $freq\n" 1162 . "frequency (Hz): $freq\n"
935 . "channels: $chans"; 1163 . "channels: $chans\n"
1164 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1165 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
936 1166
937 $AUDIO_INFO->set_text ($text); 1167 $AUDIO_INFO->set_text ($text);
938} 1168}
939 1169
940sub audio_setup { 1170sub audio_setup {
942 1172
943 $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]);
944 1174
945 my $row = 0; 1175 my $row = 0;
946 1176
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1177 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1178 $table->add_at (1, $row, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1179 state => $CFG->{audio_enable},
950 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.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1181 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 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 }
1195 );
953 1196
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1197 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1198 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1199 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1200 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1201 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1202 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1209 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1210 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1211 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1212 );
970 1213
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1215 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1216 expand => 1, state => $CFG->{bgm_enable},
974 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.",
975 on_changed => sub { 1218 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1219 $CFG->{bgm_enable} = $_[1];
977 $CONN->update_fx_want if $CONN; 1220 $CONN->update_fx_want if $CONN;
978 audio_music_push; 1221 audio_music_push;
979 1 1222 1
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1226 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1227 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1228 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1229 );
987 1230
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1231 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1232 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1233 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1234 value => $CFG->{audio_hw_frequency},
992 options => [ 1235 options => [
993 [ 0, "default" , "Use System Default"], 1236 [ 0, "default" , "Use System Default"],
994 [11025, "11 kHz" , "11kHz (low quality)"], 1237 [11025, "11 kHz" , "11kHz (low quality)"],
995 [22050, "22 kHz" , "22kHz (reduced quality)"], 1238 [22050, "22 kHz" , "22kHz (reduced quality, recommended)"],
996 [44100, "44.1 kHz", "44.1kHz (cd quality)"], 1239 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
997 [48000, "48 kHz" , "48kHz (studio quality)"], 1240 [48000, "48 kHz" , "48kHz (studio quality, not recommended)"],
998 ], 1241 ],
999 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.",
1000 on_changed => sub { 1243 on_changed => sub {
1001 $CFG->{audio_hw_frequency} = $_[1]; 1244 $CFG->{audio_hw_frequency} = $_[1];
1002 audio_tab_update; 1245 audio_tab_update;
1003 1 1246 1
1004 } 1247 }
1005 ); 1248 );
1006 1249
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1250 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1251 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1252 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1253 value => $CFG->{audio_hw_channels},
1011 options => [ 1254 options => [
1012 [0, "default" , "Use System Default"], 1255 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1264 audio_tab_update;
1022 1 1265 1
1023 } 1266 }
1024 ); 1267 );
1025 1268
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1269 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $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
1028 c_colspan => 2, expand => 1, 1271 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1272 value => $CFG->{audio_hw_chunksize},
1030 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 "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1274 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
1032 on_changed => sub { 1275 on_changed => sub {
1033 $CFG->{audio_hw_chunksize} = $_[1]; 1276 $CFG->{audio_hw_chunksize} = $_[1];
1034 audio_tab_update; 1277 audio_tab_update;
1035 1 1278 1
1036 } 1279 }
1037 ); 1280 );
1038 1281
1039 # should really be a slider 1282 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1283 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1284 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1285 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1286 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1287 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1288 template => ">= 99",
1051 1; 1294 1;
1052 } 1295 }
1053 ); 1296 );
1054 1297
1055 $table->add_at (1, $row++, new DC::UI::Button 1298 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1299 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1300 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1301 on_activate => sub {
1059 audio_shutdown (); 1302 audio_shutdown ();
1060 audio_init (); 1303 audio_init ();
1061 0 1304 0
1080} 1323}
1081 1324
1082sub make_gauge_window { 1325sub make_gauge_window {
1083 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1326 my $gh = int $HEIGHT * $CFG->{gauge_size};
1084 1327
1085 my $win = new DC::UI::Frame ( 1328 $GAUGES->{win} = my $win = new DC::UI::Frame (
1086 force_x => 0, 1329 force_x => 0,
1087 force_y => "max", 1330 force_y => "max",
1088 force_w => $WIDTH, 1331 force_w => $WIDTH,
1089 force_h => $gh, 1332 force_h => $gh,
1090 ); 1333 );
1106 (new DC::UI::Empty expand => 1), 1349 (new DC::UI::Empty expand => 1),
1107 (my $hb = new DC::UI::HBox), 1350 (my $hb = new DC::UI::HBox),
1108 ], 1351 ],
1109 ); 1352 );
1110 1353
1111 $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");
1112 $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");
1113 $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");
1114 $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");
1115
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120
1121 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1125 };
1126 1358
1127 &set_gauge_window_fontsize; 1359 &set_gauge_window_fontsize;
1128 1360
1129 $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
1130} 1379}
1131 1380
1132sub debug_setup { 1381sub debug_setup {
1133 my $table = new DC::UI::Table; 1382 my $table = new DC::UI::Table;
1134 1383
1135 $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");
1136 $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 });
1137 $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");
1138 $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 });
1139 $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");
1140 $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 });
1141 $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");
1142 $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
1143 $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() } );
1144
1145 $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#
1146 1397
1147 $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);
1148 $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);
1149 $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 );
1150 $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);
1190 $vb->add (new DC::UI::FancyFrame 1441 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1442 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1443 child => (my $pi = new DC::UI::VBox),
1193 ); 1444 );
1194 1445
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1446 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1447 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1448 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1449 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1450 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1451 tooltip => "The map you are currently on (if supported by the server).");
1201 1452
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1453 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1454 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1455 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1456 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1457 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1458 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1459 tooltip => "The weight limit: you cannot carry more than this.");
1209 1460
1210 $vb->add (new DC::UI::FancyFrame 1461 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1462 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1483 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1484 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1485 my ($col, $row, $id, $label, $template) = @$_;
1235 1486
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1487 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1488 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1489 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1490 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1491 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1492 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1493 }
1243 1494
1244 $vb->add (new DC::UI::FancyFrame 1495 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1496 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1497 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1498 );
1248 1499
1249 my $row = 0; 1500 my $row = 0;
1250 my $col = 0; 1501 my $col = 0;
1251 1502
1290 1541
1291 for (qw/slow holyw conf fire depl magic 1542 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1543 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1544 blind fear tund elec cold ghit/)
1294 { 1545 {
1295 $tbl2->add_at ($col, $row, 1546 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1547 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1548 new DC::UI::Label
1298 font => $FONT_FIXED, 1549 font => $FONT_FIXED,
1299 template => "-100%", 1550 template => "-100%",
1300 align => +1, 1551 align => 1,
1301 valign => 0,
1302 can_events => 1, 1552 can_events => 1,
1303 can_hover => 1, 1553 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1554 tooltip => $resist_names{$_}->[1],
1305 ); 1555 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1556 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1558 can_hover => 1,
1309 can_events => 1, 1559 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1560 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1561 tooltip => $resist_names{$_}->[1],
1312 ); 1562 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1563 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1564 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1565 font => $FONT_FIXED,
1566 align => 1,
1316 can_hover => 1, 1567 can_hover => 1,
1317 can_events => 1, 1568 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1569 tooltip => $resist_names{$_}->[1],
1319 ); 1570 );
1320 1571
1321 $row++; 1572 $row++;
1322 if ($row % 6 == 0) { 1573 if ($row % 6 == 0) {
1323 $col += 3; 1574 $col += 4;
1324 $row = 0; 1575 $row = 0;
1325 } 1576 }
1326 } 1577 }
1327 1578
1328 #update_stats_window ({}); 1579 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1625 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1626 "Short information about this server provided by its admins.",
1376 ); 1627 );
1377 my @col = qw(#Users Host Uptime Version Description); 1628 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1629 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1630 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1631 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1632 for 0 .. $#col;
1383 1633
1384 my @align = qw(1 0 1 1 -1); 1634 my @align = qw(1 0.5 1 1 0);
1385 1635
1386 my $y = 0; 1636 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1637 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1638 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1639 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1720 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1721 label => "Login Settings",
1472 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]),
1473 ); 1723 );
1474 1724
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1725 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1726 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1727 text => $PROFILE->{user},
1478 tooltip => "The name of your character on the server.", 1728 tooltip => "The name of your character on the server. The name is case-sensitive!",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1729 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1480 ); 1730 );
1481 1731
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1732 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1733 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1734 text => $PROFILE->{password},
1485 hidden => 1, 1735 hidden => 1,
1486 tooltip => "The password for your character.", 1736 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1737 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1488 ); 1738 );
1489 1739
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1740 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1741 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1742 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1743 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1744 on_activate => sub {
1496 $CONN ? stop_game 1745 $CONN ? stop_game
1497 : start_game; 1746 : start_game;
1498 1 1747 1
1499 }, 1748 },
1500 ); 1749 );
1501 1750
1502 $vbox->add (new DC::UI::FancyFrame 1751 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1752 label => "How to Play",
1504 min_h => 200, 1753 min_h => 240,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1754 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 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). "
1507 "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 "
1508 . "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.",
1509 ), 1760 ),
1510 ); 1761 );
1511 1762
1512 $vbox 1763 $vbox
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1771 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1772 );
1522 1773
1523 my $row = 0; 1774 my $row = 0;
1524 1775
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1776 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1777 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1778 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1779
1529 $vbox->add ( 1780 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1781 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1782 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1783 text => $PROFILE->{host},
1533 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>)",
1534 on_changed => sub { 1785 on_changed => sub {
1535 my ($self, $value) = @_; 1786 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1787 $PROFILE->{host} = $value;
1537 1 1788 1
1538 } 1789 }
1539 ); 1790 );
1540 1791
1541 if (0) { #d# disabled 1792 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1793 $vbox->add (new DC::UI::Button
1543 expand => 1, 1794 expand => 1,
1544 text => "Server List", 1795 text => "Server List",
1545 other => $METASERVER, 1796 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1797 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1798 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1799 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1800 );
1550 }#d# 1801 }#d#
1551 } 1802 }
1552 1803
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1804 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1805 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1806 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1807 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1808 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1809 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1810 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1811 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1812 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1813 );
1563 1814
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1815 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1816 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1817 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1818 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1819 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1820 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1833sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1834 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1835
1585 my $row = 0; 1836 my $row = 0;
1586 1837
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1839 $table->add_at (1, $row++, new DC::UI::CheckBox
1840 c_colspan => 2,
1589 state => $CFG->{show_tips}, 1841 state => $CFG->{show_tips},
1590 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?",
1591 on_changed => sub { 1843 on_changed => sub {
1592 my ($self, $value) = @_; 1844 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1845 $CFG->{show_tips} = $value;
1594 0 1846 0
1595 } 1847 }
1596 ); 1848 );
1597 1849
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $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,
1600 text => $CFG->{logview_max_par}, 1853 text => $CFG->{logview_max_par},
1601 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 "
1602 . "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 "
1603 . "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.",
1604 on_changed => sub { 1857 on_changed => sub {
1605 my ($self, $value) = @_; 1858 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1859 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1860 0
1608 }, 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 }
1609 ); 1884 );
1610 1885
1611 $table 1886 $table
1612} 1887}
1613 1888
1621 col_expand => [0, 1, 0, 1], 1896 col_expand => [0, 1, 0, 1],
1622 ); 1897 );
1623 1898
1624 for ( 1899 for (
1625 ["General", 0, 0, 1900 ["General", 0, 0,
1626 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1627 ["Inhibit autopickup" => PICKUP_INHIBIT], 1901# ["Inhibit autopickup" => PICKUP_INHIBIT],
1628 ["Stop before pickup" => PICKUP_STOP], 1902 ["Stop before pickup" => PICKUP_STOP],
1629 ["Debug autopickup" => PICKUP_DEBUG], 1903 ["Debug autopickup" => PICKUP_DEBUG],
1630 ], 1904 ],
1631 ["Weapons", 0, 6, 1905 ["Weapons", 0, 6,
1632 ["All weapons" => PICKUP_ALLWEAPON], 1906 ["All weapons" => PICKUP_ALLWEAPON],
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1932 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1933 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1934 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1935 ["Flesh" => PICKUP_FLESH],
1662 ], 1936 ],
1663 ["Weight/Value ratio", 2, 17] 1937 ["Value/Weight ratio", 2, 17]
1664 ) 1938 )
1665 { 1939 {
1666 my ($title, $x, $y, @bits) = @$_; 1940 my ($title, $x, $y, @bits) = @$_;
1667 $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]);
1668 1942
1680 $::CFG->{pickup} |= $mask; 1954 $::CFG->{pickup} |= $mask;
1681 } else { 1955 } else {
1682 $::CFG->{pickup} &= ~$mask; 1956 $::CFG->{pickup} &= ~$mask;
1683 } 1957 }
1684 1958
1685 $::CONN->send_command ("pickup $::CFG->{pickup}") 1959 $::CONN->send_pickup ($::CFG->{pickup})
1686 if defined $::CONN; 1960 if defined $::CONN;
1687 1961
1688 0 1962 0
1689 }); 1963 });
1690 1964
1693 } 1967 }
1694 1968
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1969 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1970 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 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).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1973 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1974 on_changed => sub {
1700 my ($slider, $value) = @_; 1975 my ($slider, $value) = @_;
1701 1976
1702 $::CFG->{pickup} &= ~0xF; 1977 $::CFG->{pickup} &= ~0xF;
1706 }); 1981 });
1707 1982
1708 $table->add_at (3, 18, new DC::UI::Button 1983 $table->add_at (3, 18, new DC::UI::Button
1709 text => "set", 1984 text => "set",
1710 on_activate => sub { 1985 on_activate => sub {
1711 $::CONN->send_command ("pickup $::CFG->{pickup}") 1986 $::CONN->send_pickup ($::CFG->{pickup})
1712 if defined $::CONN; 1987 if defined $::CONN;
1713 0 1988 0
1714 }); 1989 });
1715 1990
1716 $r 1991 $r
1717} 1992}
1718 1993
1719my %SORT_ORDER = ( 1994my %SORT_ORDER = (
1720 type => undef, 1995 type => sub {
1996 use sort 'stable';
1997 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1998 },
1721 mtime => sub { 1999 mtime => sub {
2000 use sort 'stable';
1722 my $NOW = time; 2001 my $NOW = time;
1723 sort { 2002 sort {
1724 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;
1725 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;
1726 2005
1727 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 2006 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1728 or $btime <=> $atime 2007 or $btime <=> $atime
1729 or $a->{type} <=> $b->{type} 2008 or $a->{type} <=> $b->{type}
1730 } @_ 2009 } @_
1731 }, 2010 },
1732 weight => sub { sort { 2011 weight => sub {
2012 use sort 'stable';
2013 sort {
1733 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 2014 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1734 or $a->{type} <=> $b->{type} 2015 or $a->{type} <=> $b->{type}
1735 } @_ }, 2016 } @_
2017 },
1736); 2018);
1737 2019
1738sub inventory_widget { 2020sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 2021 my $hb = new DC::UI::HBox homogeneous => 1;
1740 2022
1741 $hb->add (my $vb1 = new DC::UI::VBox); 2023 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 2024 $vb1->add (new DC::UI::Label text => "Player");
1743 2025
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 2026 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 2027
1746 use sort 'stable'; 2028 use sort 'stable';
1747 2029
1756 $::CFG->{inv_sort} = $_[1]; 2038 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2039 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 2040 },
1759 ); 2041 );
1760 $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);
1761 #TODO# update to weigh/maxweight 2043 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 2044 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 2045
1764 $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);
1765 $sw1->add ($INV = new DC::UI::Inventory); 2047 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2048 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 2049
1827 $PL_NOTEBOOK->set_current_page ($widget); 2109 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2110 $PL_WINDOW->show;
1829 } 2111 }
1830} 2112}
1831 2113
1832sub player_window { 2114sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2115 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2116 x => "center",
1835 y => "center", 2117 y => "center",
1836 force_w => $WIDTH * 9/10, 2118 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2119 force_h => $HEIGHT * 9/10,
1871 "License, Author and Source info for media sent by the server."); 2153 "License, Author and Source info for media sent by the server.");
1872 2154
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2155 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2156
1875 $plwin->add ($ntb); 2157 $plwin->add ($ntb);
1876 $plwin
1877} 2158}
1878 2159
1879sub keyboard_setup { 2160sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2161 DC::Macro::keyboard_setup
1881} 2162}
1882 2163
1883sub help_window { 2164sub make_help_window {
1884 my $win = new DC::UI::Toplevel 2165 my $win = new DC::UI::Toplevel
1885 x => 'center', 2166 x => 'center',
1886 y => 'center', 2167 y => 'center',
1887 z => 4, 2168 z => 4,
1888 name => 'doc_browser', 2169 name => 'doc_browser',
1947 my @path = DC::Pod::full_path_of $node; 2228 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2229 pop @path; # drop current node
1949 2230
1950 for my $node (@path) { 2231 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2232 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2233 text => $node->[DC::Pod::N_KW][0],
1953 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>",
1954 on_activate => sub { 2235 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2236 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2237 $load_node->($node);
1957 }, 2238 },
1958 ); 2239 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2240 $buttons->add (new DC::UI::Label text => "/");
1960 } 2241 }
1961 2242
1962 $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);
1963 2244
1964 $curnode = $node; 2245 $curnode = $node;
1965 2246
1966 $viewer->clear; 2247 $viewer->clear;
1967 $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);
1977 2258
1978 $load_node->((DC::Pod::find @path)[0]); 2259 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2260 $win->show;
1980 }; 2261 };
1981 2262
1982 $win 2263 $HELP_WINDOW = $win;
1983}
1984
1985sub open_string_query {
1986 my ($title, $cb, $txt, $tooltip) = @_;
1987 my $dialog = new DC::UI::Toplevel
1988 x => "center",
1989 y => "center",
1990 z => 50,
1991 force_w => $WIDTH * 4/5,
1992 title => $title;
1993
1994 $dialog->add (
1995 my $e = new DC::UI::Entry
1996 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1997 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1998 tooltip => $tooltip
1999 );
2000
2001 $e->grab_focus;
2002 $e->set_text ($txt) if $txt;
2003 $dialog->show;
2004} 2264}
2005 2265
2006sub open_quit_dialog { 2266sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2267 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2268 $QUIT_DIALOG = new DC::UI::Toplevel
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2290 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2291 );
2032 $hb->add (new DC::UI::Button 2292 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2293 text => "Quit anyway",
2034 expand => 1, 2294 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2295 on_activate => sub {
2296 crash "Quit anyway";
2297 EV::unloop EV::UNLOOP_ALL;
2298 },
2036 ); 2299 );
2037 } 2300 }
2038 2301
2039 $QUIT_DIALOG->show; 2302 $QUIT_DIALOG->show;
2040 $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;
2041} 2412}
2042 2413
2043sub show_tip_of_the_day { 2414sub show_tip_of_the_day {
2044 # find all tips 2415 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2416 my @tod = DC::Pod::find tip_of_the_day => "*";
2092 2463
2093 $dialog->show; 2464 $dialog->show;
2094 }; 2465 };
2095} 2466}
2096 2467
2097sub sdl_init {
2098 DC::SDL_Init
2099 and die "SDL::Init failed!\n";
2100}
2101
2102sub 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
2103 $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 }
2104 2491
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2492 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2493
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2494 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2495 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2496 $FAST = $CFG->{fast};
2110 2497
2498 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 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
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2501 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2502
2114 $SDL_ACTIVE = 1; 2503 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2504 $LAST_REFRESH = time - 0.01;
2116 2505
2142 2531
2143 $DEBUG_STATUS = new DC::UI::Label 2532 $DEBUG_STATUS = new DC::UI::Label
2144 padding => 0, 2533 padding => 0,
2145 z => 100, 2534 z => 100,
2146 force_x => "max", 2535 force_x => "max",
2147 force_y => 0; 2536 force_y => 20;
2148 $DEBUG_STATUS->show; 2537 $DEBUG_STATUS->show;
2149 2538
2150 $STATUSBOX = new DC::UI::Statusbox; 2539 $STATUSBOX = new DC::UI::Statusbox;
2151 $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;
2152 2552
2153 (new DC::UI::Frame 2553 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2554 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2555 force_x => 0,
2156 force_y => "max", 2556 force_y => "max",
2157 child => $STATUSBOX, 2557 child => (my $LL = new DC::UI::VBox),
2158 )->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 );
2159 2568
2160 DC::UI::Toplevel->new ( 2569 DC::UI::Toplevel->new (
2161 title => "Minimap", 2570 title => "Minimap",
2162 name => "mapmap", 2571 name => "mapmap",
2163 x => 0, 2572 x => 0,
2164 y => $FONTSIZE + 8, 2573 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2165 border_bg => [1, 1, 1, 192/255], 2574 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2575 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2576 child => ($MAPMAP = new DC::MapWidget::MapMap
2168 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.",
2169 ), 2578 ),
2170 )->show; 2579 )->show;
2171 2580
2172 $MAPWIDGET = new DC::MapWidget; 2581 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2582 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2583 my ($mapwidget, $preset) = @_;
2175 2584
2176 $MESSAGE_WINDOW->activate_console ($preset) 2585 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2586 if $MESSAGE_DIST;
2178 }); 2587 });
2179 $MAPWIDGET->show; 2588 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2589 $MAPWIDGET->grab_focus;
2181 2590
2182 $COMPLETER = new DC::MapWidget::Command:: 2591 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2603 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2604 has_close_button => 1,
2196 ; 2605 ;
2197 2606
2198 $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
2199 $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 ;
2200 2616
2617 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2618
2201 $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,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2620 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2621
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2622 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2623 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2624 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2219 . "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 "
2220 . "binding editor closes"); 2638 . "binding editor closes");
2221 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2639 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2222 "Some debuggin' options. Do not ask."); 2640 "Some debuggin' options. Do not ask.");
2223 2641
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2642 make_help_window;
2643 make_menubar;
2225 2644
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231
2232 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
2233
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2236
2237 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2243 status "Configuration Saved";
2244 0
2245 },
2246 );
2247
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation");
2250
2251
2252 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit",
2254 tooltip => "Terminates the program",
2255 on_activate => sub {
2256 if ($CONN) {
2257 open_quit_dialog;
2258 } else {
2259 EV::unloop EV::UNLOOP_ALL;
2260 }
2261 0
2262 },
2263 );
2264
2265 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2645 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2646 $MESSAGE_WINDOW->show;
2268 } 2647 }
2269 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
2270 $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]);
2271} 2659}
2272 2660
2273sub video_shutdown { 2661sub video_shutdown {
2274 DC::OpenGL::shutdown; 2662 DC::OpenGL::shutdown;
2663 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2664
2276 undef $SDL_ACTIVE; 2665 undef $SDL_ACTIVE;
2277} 2666}
2278 2667
2279my %animate_object; 2668my %animate_object;
2280my $animate_timer; 2669my $animate_timer;
2281 2670
2282my $fps = 9; 2671my $fps = 9;
2283 2672
2284sub force_refresh { 2673sub force_refresh {
2285 if ($ENV{CFPLUS_DEBUG} & 4) { 2674 if ($DELIANTRA_DEBUG & 4) {
2286 $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;
2287 debug sprintf "%3.2f", $fps; 2676 debug sprintf "%3.2f", $fps;
2288 } 2677 }
2289 2678
2290 undef $WANT_REFRESH; 2679 undef $WANT_REFRESH;
2298my $want_refresh = EV::prepare_ns \&force_refresh; 2687my $want_refresh = EV::prepare_ns \&force_refresh;
2299 2688
2300my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2689my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2301 $NOW = EV::now; 2690 $NOW = EV::now;
2302 2691
2303 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2692 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2304 for DC::poll_events; 2693 for DC::poll_events;
2305 2694
2306 if (%animate_object) { 2695 if (%animate_object) {
2307 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2696 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2308 $WANT_REFRESH = 1; 2697 $WANT_REFRESH = 1;
2320sub animation_stop { 2709sub animation_stop {
2321 my ($widget) = @_; 2710 my ($widget) = @_;
2322 delete $animate_object{$widget}; 2711 delete $animate_object{$widget};
2323} 2712}
2324 2713
2325%SDL_CB = (
2326 DC::SDL_QUIT => sub { 2714$SDL_CB[DC::SDL_QUIT] = sub {
2715 crash "SDL_QUIT";
2327 EV::unloop EV::UNLOOP_ALL; 2716 EV::unloop EV::UNLOOP_ALL;
2328 }, 2717};
2329 DC::SDL_VIDEORESIZE => sub { 2718$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2330 },
2331 DC::SDL_VIDEOEXPOSE => sub { 2719$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2332 DC::UI::full_refresh; 2720 DC::UI::full_refresh;
2333 }, 2721};
2334 DC::SDL_ACTIVEEVENT => sub { 2722$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2335# not useful, as APPACTIVE includes only iconified state, not unmapped 2723# not useful, as APPACTIVE includes only iconified state, not unmapped
2336# 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#
2337# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2725# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2338# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2726# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2339# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2727# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2728# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2729};
2342 DC::SDL_KEYDOWN => sub { 2730$SDL_CB[DC::SDL_KEYDOWN] = sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2731 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2732 # alt-enter
2733 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2734 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2735 video_init;
2348 } else { 2736 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2737 &DC::UI::feed_sdl_key_down_event;
2350 }
2351 }, 2738 }
2352 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};
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2745$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2746$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2747$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2748$SDL_CB[DC::SDL_USEREVENT] = sub {
2357 if ($_[0]{code} == 1) { 2749 if ($_[0]{code} == 1) {
2358 audio_channel_finished $_[0]{data1}; 2750 audio_channel_finished $_[0]{data1};
2359 } elsif ($_[0]{code} == 0) { 2751 } elsif ($_[0]{code} == 0) {
2360 audio_music_finished; 2752 audio_music_finished;
2361 }
2362 }, 2753 }
2363); 2754};
2364 2755
2365############################################################################# 2756#############################################################################
2366 2757
2367$SIG{INT} = $SIG{TERM} = sub { 2758$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2759 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2760 #d# TODO calling exit here hangs the process in some futex
2370}; 2761};
2371 2762
2372{ 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
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2768 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2769 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2770 } else {
2376 #TODO: compatibility cruft 2771 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2772 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2773 print STDERR "INFO: used old configuration file\n";
2379 } 2774 }
2380 2775
2381 DC::DB::Server::run; 2776 DC::DB::Server::run;
2382 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
2383 DC::UI::set_layout ($::CFG->{layout}); 2787 DC::UI::set_layout ($::CFG->{layout});
2384 2788
2385 my %DEF_CFG = ( 2789 my %DEF_CFG = (
2790 config_autosave => 1,
2386 sdl_mode => 0, 2791 sdl_mode => undef,
2387 fullscreen => 1, 2792 fullscreen => 1,
2388 fast => 0, 2793 fast => 0,
2389 force_opengl11 => undef, 2794 force_opengl11 => undef,
2795 disable_alpha => 0,
2796 smooth_movement => 1,
2797 smooth_transitions => 1,
2390 texture_compression => 1, 2798 texture_compression => 1,
2391 map_scale => 1, 2799 map_scale => 1,
2392 fow_enable => 1, 2800 fow_enable => 1,
2393 fow_intensity => 0, 2801 fow_intensity => 0,
2802 fow_texture => 0,
2394 map_smoothing => 1, 2803 map_smoothing => 1,
2395 gui_fontsize => 1, 2804 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2805 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2806 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2807 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2808 stat_fontsize => 0.7,
2400 mapsize => 100, 2809 mapsize => 100,
2401 audio_enable => 1, 2810 audio_enable => 1,
2402 audio_hw_channels => 0, 2811 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2812 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2813 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2814 audio_mix_channels => 8,
2406 effects_enable => 1, 2815 effects_enable => 1,
2407 effects_volume => 1, 2816 effects_volume => 1,
2408 bgm_enable => 1, 2817 bgm_enable => 1,
2409 bgm_volume => 0.5, 2818 bgm_volume => 0.5,
2410 output_rate => "", 2819 output_rate => "",
2411 pickup => 0, 2820 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2412 inv_sort => "mtime", 2821 inv_sort => "mtime",
2413 default => "profile", # default profile 2822 default => "profile", # default profile
2414 show_tips => 1, 2823 show_tips => 1,
2415 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
2416 ); 2829 );
2417 2830
2418 while (my ($k, $v) = each %DEF_CFG) { 2831 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2832 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2833 }
2421 2834
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2835 my @args = @ARGV;
2423 $PROFILE = $CFG->{profile}{default};
2424 2836
2425 # convert old bindings (only default profile matters) 2837 # OS X passes some process serial number of other shit. they
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2838 # could have used an env var or any other sane mechanism. but
2427 while (my ($mod, $syms) = each %$bindings) { 2839 # would it be os x then? no...
2428 while (my ($sym, $cmds) = each %$syms) { 2840 shift @args if $args[0] =~ /^-psn_/;
2429 push @{ $PROFILE->{macro} }, { 2841
2430 accelkey => [$mod*1, $sym*1], 2842 my $profile = 'default';
2431 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, ();
2432 }; 2848 $i = 0;
2849 } elsif ($args[$i] =~ /^--?h/) {
2850 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2851 exit 0;
2433 } 2852 }
2434 } 2853 }
2435 }
2436 2854
2437 sdl_init; 2855 $CFG->{profile}{$profile} ||= {};
2856 $PROFILE = $CFG->{profile}{$profile};
2857 $PROFILE->{host} ||= "gameserver.deliantra.net";
2438 2858
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2859 $PROFILE->{host} = $args[0] if @args > 0;
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2860 $PROFILE->{user} = $args[1] if @args > 1;
2441 @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;
2442 2862
2443 @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 }
2444 2874
2445 $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";
2446 2877
2447 { 2878 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2879 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2880 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2881 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2882 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2883 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2884 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2885 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2886 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2887 DejaVuSansMono-BoldOblique.ttf
2888 mona.ttf
2457 ); 2889 );
2458 2890
2459 DC::add_font $_ for @fonts; 2891 DC::add_font $_ for @fonts;
2460
2461 DC::pango_init;
2462 2892
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2893 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2894 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2895
2466 $FONT_PROP->make_default; 2896 $FONT_PROP->make_default;
2467 } 2897
2898 DC::pango_init;
2899 }
2468 2900
2469# compare mono (ft) vs. rgba (cairo) 2901# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2902# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2903# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2904# my $t1 = Time::HiRes::time;
2477# } 2909# }
2478# my $t2 = Time::HiRes::time; 2910# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2911# warn $t2-$t1;
2480# } 2912# }
2481 2913
2482 video_init; 2914 video_init;
2483 audio_init; 2915 audio_init;
2484} 2916 }
2485 2917
2486show_tip_of_the_day if $CFG->{show_tips}; 2918 show_tip_of_the_day if $CFG->{show_tips};
2487 2919
2488our $STARTUP_CANCEL = EV::idle sub { 2920 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2921 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2922 $startup_done->();
2491}; 2923 };
2492 2924
2925 debug_toggle 0;
2926
2927 delete $SIG{__DIE__};
2493EV::loop; 2928 EV::loop;
2494 2929
2930 DC::write_cfg if $CFG->{config_autosave};
2931
2495#video_shutdown; 2932 #video_shutdown;
2496#audio_shutdown; 2933 #audio_shutdown;
2934
2497DC::OpenGL::quit; 2935 DC::OpenGL::quit;
2498DC::SDL_Quit; 2936 DC::SDL_Quit;
2499DC::DB::Server::stop; 2937 DC::DB::Server::stop;
2938}
2939
2940DC::SDL_braino; # see sub above
2500 2941
2501=head1 NAME 2942=head1 NAME
2502 2943
2503deliantra - A Deliantra MORPG game client 2944deliantra - A Deliantra MORPG game client
2504 2945
2505=head1 SYNOPSIS 2946=head1 SYNOPSIS
2506 2947
2507Just run it - no commandline arguments are supported. 2948 deliantra [--profile name] [host [user [password]]]
2949 deliantra --help
2508 2950
2509=head1 USAGE 2951=head1 USAGE
2510 2952
2511deliantra 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
2512be used in fullscreen mode and interactively. 2954is supposed to be used in fullscreen mode and interactively.
2513 2955
2514=head1 DEBUGGING 2956=head1 DEBUGGING
2515 2957
2516
2517CFPLUS_DEBUG - environment variable 2958DELIANTRA_DEBUG - environment variable
2518 2959
2519 1 draw borders around widgets 2960 1 draw borders around widgets
2520 2 add low-level widget info to tooltips 2961 2 add low-level widget info to tooltips
2521 4 show fps 2962 4 show fps
2522 8 suppress tooltips 2963 8 suppress tooltips
2964 16 show bandwidth downstream
2523 2965
2524=head1 AUTHOR 2966=head1 AUTHOR
2525 2967
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2968Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2969
2528 2970
2529 2971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines