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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.110 by root, Mon Apr 12 02:03:33 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines