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.27 by root, Fri Jan 25 14:30:09 2008 UTC vs.
Revision 1.119 by root, Mon Dec 26 22:30:21 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines