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.52 by root, Fri Jul 18 21:18:42 2008 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"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
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
102use AnyEvent::DNS; 92use AnyEvent::Util ();
103use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
104 95
105use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
106 98
107use DC; 99use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 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
109use DC::OpenGL (); 113use DC::OpenGL ();
110use DC::Protocol; 114use DC::Protocol;
111use DC::DB; 115use DC::DB;
112use DC::UI; 116use DC::UI;
113use DC::UI::Canvas; 117use DC::UI::Canvas;
114use DC::UI::Inventory; 118use DC::UI::Inventory;
115use DC::UI::SpellList; 119use DC::UI::SpellList;
116use DC::UI::Dockable; 120use DC::UI::Dockable;
117use DC::UI::Dockbar; 121use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 122use DC::UI::ChatView;
120use DC::MessageDistributor; 123use DC::MessageDistributor;
121use DC::Pod; 124use DC::Pod;
122use DC::MapWidget; 125use DC::MapWidget;
123use DC::Macro; 126use DC::Macro;
124 127
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
127 130
128$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
130}; 134};
131 135
132my $MAX_FPS = 60; 136my $MAX_FPS = 60;
133 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
134our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
135 141
136our $LAST_REFRESH; 142our $LAST_REFRESH;
137our $NOW; 143our $NOW;
138 144
139our $CFG; 145our $CFG;
140our $CONN;
141our $PROFILE; # current profile 146our $PROFILE; # current profile
142our $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;
143 149
144our $WANT_REFRESH; 150our $WANT_REFRESH;
151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
145 154
146our @SDL_MODES; 155our @SDL_MODES;
147our $SDL_REINIT = 1; 156our $SDL_REINIT = 1;
148our $WIDTH; 157our $WIDTH;
149our $HEIGHT; 158our $HEIGHT;
151our $FONTSIZE; 160our $FONTSIZE;
152 161
153our $FONT_PROP; 162our $FONT_PROP;
154our $FONT_FIXED; 163our $FONT_FIXED;
155 164
165our $CONN;
166
156our $MAP; 167our $MAP;
157our $MAPMAP; 168our $MAPMAP;
158our $MAPWIDGET; 169our $MAPWIDGET;
159our $COMPLETER; 170our $COMPLETER;
160our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
161our $METASERVER; 175our $METASERVER;
162our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
163our $QUIT_DIALOG; 177our $QUIT_DIALOG;
164our $HOST_ENTRY; 178our $HOST_ENTRY;
165our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
191our $FLOORBOX; 205our $FLOORBOX;
192our $GAUGES; 206our $GAUGES;
193our $STATWIDS; 207our $STATWIDS;
194 208
195our $SDL_ACTIVE; 209our $SDL_ACTIVE;
196our %SDL_CB; 210our @SDL_CB;
197 211
198our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
199our $STATUSBOX; 213our $STATUSBOX;
200our $MODBOX; 214our $MODBOX;
201our $DEBUG_STATUS; 215our $DEBUG_STATUS;
202 216
203our $INV; 217our $INV;
204our $INVR; 218our $INVR;
205our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
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}
206 260
207############################################################################# 261#############################################################################
208 262
209sub status { 263sub status {
210 $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]);
292 or return; 346 or return;
293 347
294 $meta->{data} 348 $meta->{data}
295 or return; 349 or return;
296 350
297 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
298 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
299 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
300 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
301 &audio_music_push ($face); 355 &audio_music_push ($face);
302 } 356 }
303 } else { 357 } else {
304 # fetch from database 358 # fetch from database
305 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
306 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
307 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
308 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;
309 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
310 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
311 365
312 audio_sound_push ($face); 366 audio_sound_push ($face);
313 }; 367 };
360 414
361 audio_music_update_volume; 415 audio_music_update_volume;
362 416
363 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
364 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
365 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
366 ? 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
367 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
368 425
369 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
370 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
371 428
372 my $NOW = time; 429 my $NOW = time;
373 430
374 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
375 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
484 sub audio_tab_update; 541 sub audio_tab_update;
485 audio_tab_update; 542 audio_tab_update;
486} 543}
487 544
488sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
489 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
490 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
491 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
492 554
493 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
733} 795}
734 796
735sub dc_connect { 797sub dc_connect {
736 my ($host, $port) = @_; 798 my ($host, $port) = @_;
737 799
738 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;
739 802
740 $CONN = 803 $CONN =
741 new DC::Protocol 804 new DC::Protocol
742 host => $host, 805 host => $host,
743 port => $port, 806 port => $port,
744 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
745 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
746 mapw => $mapsize, 809 mapw => $mapw,
747 maph => $mapsize, 810 maph => $maph,
748 811
812 c_version => {
813 client => "deliantra",
749 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
750 818
751 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
752 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
753 map => $MAP, 821 map => $MAP,
754 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
760 828
761 on_connect => sub { 829 on_connect => sub {
762 if ($_[0]) { 830 if ($_[0]) {
763 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
764 832
765 status "login successful"; 833 status "successfully connected to the server";
766 } else { 834 } else {
767 undef $CONN; 835 undef $CONN;
768 status "unable to connect: $!"; 836 status "unable to connect: $!";
769 stop_game(); 837 stop_game();
770 } 838 }
772 ; 840 ;
773} 841}
774 842
775sub start_game { 843sub start_game {
776 status "logging in..."; 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.";
777 849
778 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
779 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
780
781 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
782 852
783 $MAP = new DC::Map; 853 $MAP = new DC::Map;
784 854
785 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
786 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
787 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
788 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
789 if ($_[0] ne "80.101.114.108") { # Perl 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) {
790 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
791 $host = "129.13.162.95"; 864 $host = "129.13.162.95";
865 }
792 } 866 }
793 867
794 dc_connect $host, $port; 868 dc_connect $host, $port;
795 }; 869 };
796 } else { 870 } else {
797 dc_connect $host, $port; 871 dc_connect $host, $port;
798 } 872 }
799} 873}
800 874
801sub stop_game { 875sub stop_game {
876 crash "stop_game";
877
802 $LOGIN_BUTTON->set_text ("Login / Register"); 878 $LOGIN_BUTTON->set_text ("Login / Register");
803 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 879 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
804 $SETUP_DIALOG->show; 880 $SETUP_DIALOG->show;
805 $PL_WINDOW->hide; 881 $PL_WINDOW->hide;
806 $SPELL_LIST->clear_spells; 882 $SPELL_LIST->clear_spells;
820} 896}
821 897
822sub graphics_setup { 898sub graphics_setup {
823 my $vbox = new DC::UI::VBox; 899 my $vbox = new DC::UI::VBox;
824 900
901 {
902 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
903
825 $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]);
826 905
827 my $row = 0; 906 my $row = 0;
828 907
829 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
830 $table->add_at (1, $row++, new DC::UI::Label 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,
831 can_events => 1, 910 can_events => 1,
832 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 911 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
833 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
834 my $vidmode_tooltip = 934 my $vidmode_tooltip =
835 "<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). "
836 . "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>.";
837 937
838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
839 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
840 940
841 $hbox->add (my $mode_slider = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
842 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 ],
843 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
844 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
845 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
846 can_events => 1, tooltip => $vidmode_tooltip); 948 can_events => 1, tooltip => $vidmode_tooltip);
847 949
848 $mode_slider->connect (changed => sub { 950 $MODE_SLIDER->connect (changed => sub {
849 my ($self, $value) = @_;
850
851 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
852 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
853 });
854 $mode_slider->emit (changed => $mode_slider->{range}[0]);
855
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
857 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
858 state => $CFG->{fullscreen},
859 tooltip => "Bring the client into fullscreen mode.",
860 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
861 );
862
863 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
864 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{force_opengl11},
866 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
867 . "higher memory usage and slower performance. It will, however, help tremendously on "
868 . "cards that claim to support a feature but fall back to software rendering. "
869 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
870 . "but cards and drivers from other vendors (ATI) are often just as bad. "
871 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{disable_alpha},
878 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
879 . "by disabling a number of textures and transparency effects. Normally, these "
880 . "effects do not cost a lot of resources, but some graphics cards might fall "
881 . "back to etxremely slow rendering if this is enabled. If disabling this option "
882 . "noticably improves the framerate of the client please report this! "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub {
885 my ($self, $value) = @_; 951 my ($self, $value) = @_;
952
953 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
954 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
955 });
956 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
957
958 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
959 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
960 state => $CFG->{fullscreen},
961 tooltip => "Bring the client into fullscreen mode.",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{force_opengl11},
968 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
969 . "higher memory usage and slower performance. It will, however, help tremendously on "
970 . "cards that claim to support a feature but fall back to software rendering. "
971 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
972 . "but cards and drivers from other vendors (ATI) are often just as bad. "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
975 );
976
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
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) = @_;
886 $CFG->{disable_alpha} = $value; 988 $CFG->{disable_alpha} = $value;
887 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 989 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
990 0
888 0 991 }
889 } 992 );
890 );
891 993
892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
893 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
894 state => $CFG->{texture_compression}, 996 state => $CFG->{texture_compression},
895 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 "
896 . "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). "
897 . "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 "
898 . "forced OpenGL 1.1 mode.", 1000 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
899 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
900 ); 1002 );
901 1003
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1004 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
903 $table->add_at (1, $row++, new DC::UI::CheckBox 1005 $table->add_at (1, $row++, new DC::UI::CheckBox
904 state => $CFG->{fast}, 1006 state => $CFG->{fast},
905 tooltip => "Lower the visual quality considerably to speed up rendering.", 1007 tooltip => "Lower the visual quality considerably to speed up rendering.",
906 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
907 ); 1009 );
908 1010
909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1011 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
910 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
911 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1013 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
912 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.",
913 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1015 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
914 ); 1016 );
915 1017
916 $table->add_at (1, $row++, new DC::UI::Button 1018 $table->add_at (1, $row++, new DC::UI::Button
917 expand => 1, text => "Apply", 1019 expand => 1, text => "Apply",
918 tooltip => "Apply the video settings above.", 1020 tooltip => "Apply the video settings above.",
919 on_activate => sub { 1021 on_activate => sub {
920 video_shutdown (); 1022 video_shutdown ();
921 video_init (); 1023 video_init ();
1024 0
922 0 1025 }
923 } 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 }
924 ); 1042 );
925 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
926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
927 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
928 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
929 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
930 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 }
931 ); 1059 );
932 1060
933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1061 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
934 $table->add_at (1, $row++, new DC::UI::CheckBox 1062 $table->add_at (1, $row++, new DC::UI::CheckBox
935 state => $CFG->{map_smoothing}, 1063 state => $CFG->{map_smoothing},
936 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. "
937 . "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. "
938 . "Changes take effect at next login only.", 1066 . "Changes take effect at next login only.",
939 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1067 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
940 ); 1068 );
941 1069
942 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
943 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
944 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
945 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.",
946 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
947 ); 1075 );
948 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
949 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
950 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
951 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
952 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.",
953 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
954 ); 1097 );
955 1098
956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1099 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
957 $table->add_at (1, $row++, new DC::UI::Slider 1100 $table->add_at (1, $row++, new DC::UI::Slider
958 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1101 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
959 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, "
960 . "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.",
961 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1104 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
962 ); 1105 );
963 1106
964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1107 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
965 $table->add_at (1, $row++, new DC::UI::Slider 1108 $table->add_at (1, $row++, new DC::UI::Slider
966 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1109 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
967 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.",
968 on_changed => sub { 1111 on_changed => sub {
969 $CFG->{gauge_fontsize} = $_[1]; 1112 $CFG->{gauge_fontsize} = $_[1];
970 &set_gauge_window_fontsize; 1113 &set_gauge_window_fontsize;
1114 0
971 0 1115 }
972 } 1116 );
973 );
974 1117
975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1118 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
976 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
977 range => [$CFG->{gauge_size}, 0.2, 0.8], 1120 range => [$CFG->{gauge_size}, 0.2, 0.8],
978 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.",
979 on_changed => sub { 1122 on_changed => sub {
980 $CFG->{gauge_size} = $_[1]; 1123 $CFG->{gauge_size} = $_[1];
981 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1124 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1125 0
982 0 1126 }
983 } 1127 );
984 ); 1128 }
985 1129
986 $vbox 1130 $vbox
987} 1131}
988 1132
989our $AUDIO_HW_CHUNKSIZE; 1133our $AUDIO_HW_CHUNKSIZE;
1002 1146
1003 my $text = !$freq 1147 my $text = !$freq
1004 ? "audio is off" 1148 ? "audio is off"
1005 : "audio is enabled\n" 1149 : "audio is enabled\n"
1006 . "frequency (Hz): $freq\n" 1150 . "frequency (Hz): $freq\n"
1007 . "channels: $chans"; 1151 . "channels: $chans\n"
1152 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1153 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1008 1154
1009 $AUDIO_INFO->set_text ($text); 1155 $AUDIO_INFO->set_text ($text);
1010} 1156}
1011 1157
1012sub audio_setup { 1158sub audio_setup {
1041 ); 1187 );
1042 1188
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1189 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1044 $table->add_at (1, $row, new DC::UI::CheckBox 1190 $table->add_at (1, $row, new DC::UI::CheckBox
1045 expand => 1, state => $CFG->{bgm_enable}, 1191 expand => 1, state => $CFG->{bgm_enable},
1046 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.",
1047 on_changed => sub { 1193 on_changed => sub {
1048 $CFG->{bgm_enable} = $_[1]; 1194 $CFG->{bgm_enable} = $_[1];
1049 $CONN->update_fx_want if $CONN; 1195 $CONN->update_fx_want if $CONN;
1050 audio_music_push; 1196 audio_music_push;
1051 1 1197 1
1152} 1298}
1153 1299
1154sub make_gauge_window { 1300sub make_gauge_window {
1155 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1301 my $gh = int $HEIGHT * $CFG->{gauge_size};
1156 1302
1157 my $win = new DC::UI::Frame ( 1303 $GAUGES->{win} = my $win = new DC::UI::Frame (
1158 force_x => 0, 1304 force_x => 0,
1159 force_y => "max", 1305 force_y => "max",
1160 force_w => $WIDTH, 1306 force_w => $WIDTH,
1161 force_h => $gh, 1307 force_h => $gh,
1162 ); 1308 );
1178 (new DC::UI::Empty expand => 1), 1324 (new DC::UI::Empty expand => 1),
1179 (my $hb = new DC::UI::HBox), 1325 (my $hb = new DC::UI::HBox),
1180 ], 1326 ],
1181 ); 1327 );
1182 1328
1183 $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");
1184 $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");
1185 $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");
1186 $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");
1187
1188 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1189 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1190 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1191 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1192
1193 $GAUGES = {
1194 exp => $exp, prg => $prg, sklprg => $sklprg,
1195 win => $win, range => $rng,
1196 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1197 };
1198 1333
1199 &set_gauge_window_fontsize; 1334 &set_gauge_window_fontsize;
1200 1335
1201 $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
1202} 1354}
1203 1355
1204sub debug_setup { 1356sub debug_setup {
1205 my $table = new DC::UI::Table; 1357 my $table = new DC::UI::Table;
1206 1358
1207 $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");
1208 $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 });
1209 $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");
1210 $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 });
1211 $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");
1212 $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 });
1213 $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");
1214 $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
1215 $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() } );
1216
1217 $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#
1218 1372
1219 $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);
1220 $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);
1221 $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 );
1222 $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);
1543 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]),
1544 ); 1698 );
1545 1699
1546 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1700 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1547 $table->add_at (1, 4, new DC::UI::Entry 1701 $table->add_at (1, 4, new DC::UI::Entry
1548 text => $CFG->{profile}{default}{user}, 1702 text => $PROFILE->{user},
1549 tooltip => "The name of your character on the server.", 1703 tooltip => "The name of your character on the server. The name is case-sensitive!",
1550 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1704 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1551 ); 1705 );
1552 1706
1553 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1707 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1554 $table->add_at (1, 5, new DC::UI::Entry 1708 $table->add_at (1, 5, new DC::UI::Entry
1555 text => $CFG->{profile}{default}{password}, 1709 text => $PROFILE->{password},
1556 hidden => 1, 1710 hidden => 1,
1557 tooltip => "The password for your character.", 1711 tooltip => "The password for your character.",
1558 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1712 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1559 ); 1713 );
1560 1714
1561 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1715 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1562 expand => 1, 1716 expand => 1,
1563 text => "Login / Register", 1717 text => "Login / Register",
1568 1 1722 1
1569 }, 1723 },
1570 ); 1724 );
1571 1725
1572 $vbox->add (new DC::UI::FancyFrame 1726 $vbox->add (new DC::UI::FancyFrame
1573 label => "Registering", 1727 label => "How to Play",
1574 min_h => 200, 1728 min_h => 240,
1575 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1729 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1576 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). "
1577 "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 "
1578 . "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.",
1579 ), 1735 ),
1580 ); 1736 );
1581 1737
1582 $vbox 1738 $vbox
1597 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1753 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1598 1754
1599 $vbox->add ( 1755 $vbox->add (
1600 $HOST_ENTRY = new DC::UI::Entry 1756 $HOST_ENTRY = new DC::UI::Entry
1601 expand => 1, 1757 expand => 1,
1602 text => $CFG->{profile}{default}{host}, 1758 text => $PROFILE->{host},
1603 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1759 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1604 on_changed => sub { 1760 on_changed => sub {
1605 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1606 $CFG->{profile}{default}{host} = $value; 1762 $PROFILE->{host} = $value;
1607 1 1763 1
1608 } 1764 }
1609 ); 1765 );
1610 1766
1611 if (0) { #d# disabled 1767 if (0) { #d# disabled
1654 1810
1655 my $row = 0; 1811 my $row = 0;
1656 1812
1657 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1658 $table->add_at (1, $row++, new DC::UI::CheckBox 1814 $table->add_at (1, $row++, new DC::UI::CheckBox
1815 c_colspan => 2,
1659 state => $CFG->{show_tips}, 1816 state => $CFG->{show_tips},
1660 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?",
1661 on_changed => sub { 1818 on_changed => sub {
1662 my ($self, $value) = @_; 1819 my ($self, $value) = @_;
1663 $CFG->{show_tips} = $value; 1820 $CFG->{show_tips} = $value;
1665 } 1822 }
1666 ); 1823 );
1667 1824
1668 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1825 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1669 $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,
1670 text => $CFG->{logview_max_par}, 1828 text => $CFG->{logview_max_par},
1671 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1829 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1672 . "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 "
1673 . "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.",
1674 on_changed => sub { 1832 on_changed => sub {
1676 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1834 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1677 0 1835 0
1678 }, 1836 },
1679 ); 1837 );
1680 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 }
1859 );
1860
1681 $table 1861 $table
1682} 1862}
1683 1863
1684sub autopickup_setup { 1864sub autopickup_setup {
1685 my $r = new DC::UI::ScrolledWindow ( 1865 my $r = new DC::UI::ScrolledWindow (
1691 col_expand => [0, 1, 0, 1], 1871 col_expand => [0, 1, 0, 1],
1692 ); 1872 );
1693 1873
1694 for ( 1874 for (
1695 ["General", 0, 0, 1875 ["General", 0, 0,
1696 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1697 ["Inhibit autopickup" => PICKUP_INHIBIT], 1876# ["Inhibit autopickup" => PICKUP_INHIBIT],
1698 ["Stop before pickup" => PICKUP_STOP], 1877 ["Stop before pickup" => PICKUP_STOP],
1699 ["Debug autopickup" => PICKUP_DEBUG], 1878 ["Debug autopickup" => PICKUP_DEBUG],
1700 ], 1879 ],
1701 ["Weapons", 0, 6, 1880 ["Weapons", 0, 6,
1702 ["All weapons" => PICKUP_ALLWEAPON], 1881 ["All weapons" => PICKUP_ALLWEAPON],
1728 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1907 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1729 ["Ignore cursed" => PICKUP_NOT_CURSED], 1908 ["Ignore cursed" => PICKUP_NOT_CURSED],
1730 ["Jewelery" => PICKUP_JEWELS], 1909 ["Jewelery" => PICKUP_JEWELS],
1731 ["Flesh" => PICKUP_FLESH], 1910 ["Flesh" => PICKUP_FLESH],
1732 ], 1911 ],
1733 ["Weight/Value ratio", 2, 17] 1912 ["Value/Weight ratio", 2, 17]
1734 ) 1913 )
1735 { 1914 {
1736 my ($title, $x, $y, @bits) = @$_; 1915 my ($title, $x, $y, @bits) = @$_;
1737 $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]);
1738 1917
1750 $::CFG->{pickup} |= $mask; 1929 $::CFG->{pickup} |= $mask;
1751 } else { 1930 } else {
1752 $::CFG->{pickup} &= ~$mask; 1931 $::CFG->{pickup} &= ~$mask;
1753 } 1932 }
1754 1933
1755 $::CONN->send_command ("pickup $::CFG->{pickup}") 1934 $::CONN->send_pickup ($::CFG->{pickup})
1756 if defined $::CONN; 1935 if defined $::CONN;
1757 1936
1758 0 1937 0
1759 }); 1938 });
1760 1939
1763 } 1942 }
1764 1943
1765 $table->add_at (2, 18, new DC::UI::ValSlider 1944 $table->add_at (2, 18, new DC::UI::ValSlider
1766 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1945 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1767 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).",
1768 to_value => sub { ">= " . 5 * $_[0] }, 1948 to_value => sub { ">= " . 5 * $_[0] },
1769 on_changed => sub { 1949 on_changed => sub {
1770 my ($slider, $value) = @_; 1950 my ($slider, $value) = @_;
1771 1951
1772 $::CFG->{pickup} &= ~0xF; 1952 $::CFG->{pickup} &= ~0xF;
1776 }); 1956 });
1777 1957
1778 $table->add_at (3, 18, new DC::UI::Button 1958 $table->add_at (3, 18, new DC::UI::Button
1779 text => "set", 1959 text => "set",
1780 on_activate => sub { 1960 on_activate => sub {
1781 $::CONN->send_command ("pickup $::CFG->{pickup}") 1961 $::CONN->send_pickup ($::CFG->{pickup})
1782 if defined $::CONN; 1962 if defined $::CONN;
1783 0 1963 0
1784 }); 1964 });
1785 1965
1786 $r 1966 $r
1787} 1967}
1788 1968
1789my %SORT_ORDER = ( 1969my %SORT_ORDER = (
1790 type => sub { 1970 type => sub {
1971 use sort 'stable';
1791 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1972 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1792 }, 1973 },
1793 mtime => sub { 1974 mtime => sub {
1975 use sort 'stable';
1794 my $NOW = time; 1976 my $NOW = time;
1795 sort { 1977 sort {
1796 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;
1797 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;
1798 1980
1799 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1981 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1800 or $btime <=> $atime 1982 or $btime <=> $atime
1801 or $a->{type} <=> $b->{type} 1983 or $a->{type} <=> $b->{type}
1802 } @_ 1984 } @_
1803 }, 1985 },
1804 weight => sub { sort { 1986 weight => sub {
1987 use sort 'stable';
1988 sort {
1805 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1989 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1806 or $a->{type} <=> $b->{type} 1990 or $a->{type} <=> $b->{type}
1807 } @_ }, 1991 } @_
1992 },
1808); 1993);
1809 1994
1810sub inventory_widget { 1995sub inventory_widget {
1811 my $hb = new DC::UI::HBox homogeneous => 1; 1996 my $hb = new DC::UI::HBox homogeneous => 1;
1812 1997
1828 $::CFG->{inv_sort} = $_[1]; 2013 $::CFG->{inv_sort} = $_[1];
1829 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2014 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1830 }, 2015 },
1831 ); 2016 );
1832 $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);
1833 #TODO# update to weigh/maxweight 2018 #TODO# update to weight/maxweight
1834 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2019 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1835 2020
1836 $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);
1837 $sw1->add ($INV = new DC::UI::Inventory); 2022 $sw1->add ($INV = new DC::UI::Inventory);
1838 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2023 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1899 $PL_NOTEBOOK->set_current_page ($widget); 2084 $PL_NOTEBOOK->set_current_page ($widget);
1900 $PL_WINDOW->show; 2085 $PL_WINDOW->show;
1901 } 2086 }
1902} 2087}
1903 2088
1904sub player_window { 2089sub make_playerbook {
1905 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2090 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1906 x => "center", 2091 x => "center",
1907 y => "center", 2092 y => "center",
1908 force_w => $WIDTH * 9/10, 2093 force_w => $WIDTH * 9/10,
1909 force_h => $HEIGHT * 9/10, 2094 force_h => $HEIGHT * 9/10,
1943 "License, Author and Source info for media sent by the server."); 2128 "License, Author and Source info for media sent by the server.");
1944 2129
1945 $ntb->set_current_page ($INVENTORY_PAGE); 2130 $ntb->set_current_page ($INVENTORY_PAGE);
1946 2131
1947 $plwin->add ($ntb); 2132 $plwin->add ($ntb);
1948 $plwin
1949} 2133}
1950 2134
1951sub keyboard_setup { 2135sub keyboard_setup {
1952 DC::Macro::keyboard_setup 2136 DC::Macro::keyboard_setup
1953} 2137}
1954 2138
1955sub help_window { 2139sub make_help_window {
1956 my $win = new DC::UI::Toplevel 2140 my $win = new DC::UI::Toplevel
1957 x => 'center', 2141 x => 'center',
1958 y => 'center', 2142 y => 'center',
1959 z => 4, 2143 z => 4,
1960 name => 'doc_browser', 2144 name => 'doc_browser',
2049 2233
2050 $load_node->((DC::Pod::find @path)[0]); 2234 $load_node->((DC::Pod::find @path)[0]);
2051 $win->show; 2235 $win->show;
2052 }; 2236 };
2053 2237
2054 $win 2238 $HELP_WINDOW = $win;
2055}
2056
2057sub open_string_query {
2058 my ($title, $cb, $txt, $tooltip) = @_;
2059 my $dialog = new DC::UI::Toplevel
2060 x => "center",
2061 y => "center",
2062 z => 50,
2063 force_w => $WIDTH * 4/5,
2064 title => $title;
2065
2066 $dialog->add (
2067 my $e = new DC::UI::Entry
2068 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2069 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2070 tooltip => $tooltip
2071 );
2072
2073 $e->grab_focus;
2074 $e->set_text ($txt) if $txt;
2075 $dialog->show;
2076} 2239}
2077 2240
2078sub open_quit_dialog { 2241sub open_quit_dialog {
2079 unless ($QUIT_DIALOG) { 2242 unless ($QUIT_DIALOG) {
2080 $QUIT_DIALOG = new DC::UI::Toplevel 2243 $QUIT_DIALOG = new DC::UI::Toplevel
2102 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2265 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2103 ); 2266 );
2104 $hb->add (new DC::UI::Button 2267 $hb->add (new DC::UI::Button
2105 text => "Quit anyway", 2268 text => "Quit anyway",
2106 expand => 1, 2269 expand => 1,
2107 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2270 on_activate => sub {
2271 crash "Quit anyway";
2272 EV::unloop EV::UNLOOP_ALL;
2273 },
2108 ); 2274 );
2109 } 2275 }
2110 2276
2111 $QUIT_DIALOG->show; 2277 $QUIT_DIALOG->show;
2112 $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;
2113} 2387}
2114 2388
2115sub show_tip_of_the_day { 2389sub show_tip_of_the_day {
2116 # find all tips 2390 # find all tips
2117 my @tod = DC::Pod::find tip_of_the_day => "*"; 2391 my @tod = DC::Pod::find tip_of_the_day => "*";
2170 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2444 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2171 and die "SDL::Init failed!\n"; 2445 and die "SDL::Init failed!\n";
2172} 2446}
2173 2447
2174sub video_init { 2448sub video_init {
2449 DC::set_theme $CFG->{uitheme};
2450
2175 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2451 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2176 $SDL_REINIT = 0; 2452 $SDL_REINIT = 0;
2177 2453
2178 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2454 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2179 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2455 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2180 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2456 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2181 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2457 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2182 2458
2183 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2459 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2184 2460
2185 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2461 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2186 $CFG->{sdl_mode} = 0; 2462 $CFG->{sdl_mode} = 0; # lowest resolution by default
2463
2464 # now choose biggest mode <= 1024x768
2187 for (reverse 0 .. $#SDL_MODES) { 2465 for (0 .. $#SDL_MODES) {
2188 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2466 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2467 $CFG->{sdl_mode} = $_;
2468 }
2189 } 2469 }
2190 } 2470 }
2191 2471
2192 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2472 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2193 2473
2194 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2474 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2195 $FULLSCREEN = $CFG->{fullscreen}; 2475 $FULLSCREEN = $CFG->{fullscreen};
2196 $FAST = $CFG->{fast}; 2476 $FAST = $CFG->{fast};
2197 2477
2478 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2198 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
2199 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2481 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2200 2482
2201 $SDL_ACTIVE = 1; 2483 $SDL_ACTIVE = 1;
2202 $LAST_REFRESH = time - 0.01; 2484 $LAST_REFRESH = time - 0.01;
2203 2485
2229 2511
2230 $DEBUG_STATUS = new DC::UI::Label 2512 $DEBUG_STATUS = new DC::UI::Label
2231 padding => 0, 2513 padding => 0,
2232 z => 100, 2514 z => 100,
2233 force_x => "max", 2515 force_x => "max",
2234 force_y => 0; 2516 force_y => 20;
2235 $DEBUG_STATUS->show; 2517 $DEBUG_STATUS->show;
2236 2518
2237 $STATUSBOX = new DC::UI::Statusbox; 2519 $STATUSBOX = new DC::UI::Statusbox;
2238 2520
2239 $MODBOX = new DC::UI::Label 2521 $MODBOX = new DC::UI::Label
2250 2532
2251 (new DC::UI::Frame 2533 (new DC::UI::Frame
2252 bg => [0, 0, 0, 0.4], 2534 bg => [0, 0, 0, 0.4],
2253 force_x => 0, 2535 force_x => 0,
2254 force_y => "max", 2536 force_y => "max",
2255 child => (my $LR = new DC::UI::VBox), 2537 child => (my $LL = new DC::UI::VBox),
2256 )->show; 2538 )->show;
2257 2539
2258 $LR->add ($STATUSBOX); 2540 $LL->add ($STATUSBOX);
2259 $LR->add ($MODBOX); 2541 $LL->add ($MODBOX);
2260 $LR->add (new DC::UI::Label 2542 $LL->add (new DC::UI::Label
2261 align => 0, 2543 align => 0,
2262 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2544 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2263 fontsize => 0.5, 2545 fontsize => 0.5,
2264 fg => [1, 1, 0, 0.7], 2546 fg => [1, 1, 0, 0.7],
2265 ); 2547 );
2266 2548
2267 DC::UI::Toplevel->new ( 2549 DC::UI::Toplevel->new (
2268 title => "Minimap", 2550 title => "Minimap",
2269 name => "mapmap", 2551 name => "mapmap",
2270 x => 0, 2552 x => 0,
2271 y => $FONTSIZE + 8, 2553 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2272 border_bg => [1, 1, 1, 192/255], 2554 border_bg => [1, 1, 1, 192/255],
2273 bg => [1, 1, 1, 0], 2555 bg => [1, 1, 1, 0],
2274 child => ($MAPMAP = new DC::MapWidget::MapMap 2556 child => ($MAPMAP = new DC::MapWidget::MapMap
2275 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.",
2276 ), 2558 ),
2277 )->show; 2559 )->show;
2278 2560
2279 $MAPWIDGET = new DC::MapWidget; 2561 $MAPWIDGET = new DC::MapWidget;
2280 $MAPWIDGET->connect (activate_console => sub { 2562 $MAPWIDGET->connect (activate_console => sub {
2305 $METASERVER = metaserver_dialog; 2587 $METASERVER = metaserver_dialog;
2306 # the name is changed to not conflict with the older name as users could have hidden it 2588 # the name is changed to not conflict with the older name as users could have hidden it
2307 $MESSAGE_WINDOW = new DC::UI::Dockbar 2589 $MESSAGE_WINDOW = new DC::UI::Dockbar
2308 name => "message_window2", 2590 name => "message_window2",
2309 title => 'Messages', 2591 title => 'Messages',
2592 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2310 force_w => $::WIDTH * 0.6, 2593 force_w => $::WIDTH * 0.6,
2311 force_h => $::HEIGHT * 0.25, 2594 force_h => $::HEIGHT * 0.25,
2312 ; 2595 ;
2313 2596
2314 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2597 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2334 . "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 "
2335 . "binding editor closes"); 2618 . "binding editor closes");
2336 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2619 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2337 "Some debuggin' options. Do not ask."); 2620 "Some debuggin' options. Do not ask.");
2338 2621
2339 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2622 make_help_window;
2623 make_menubar;
2340 2624
2341 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2342 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2343
2344# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2345# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2346
2347 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
2348
2349 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2350 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2351
2352 $BUTTONBAR->add (new DC::UI::Button
2353 text => "Save Config",
2354 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2355 on_activate => sub {
2356 $::CFG->{layout} = DC::UI::get_layout;
2357 DC::write_cfg;
2358 status "Configuration Saved";
2359 0
2360 },
2361 );
2362
2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2364 tooltip => "View Documentation");
2365
2366 $BUTTONBAR->add (new DC::UI::Button
2367 text => "Quit",
2368 tooltip => "Terminates the program",
2369 on_activate => sub {
2370 if ($CONN) {
2371 open_quit_dialog;
2372 } else {
2373 EV::unloop EV::UNLOOP_ALL;
2374 }
2375 0
2376 },
2377 );
2378
2379 $BUTTONBAR->show;
2380 $SETUP_DIALOG->show; 2625 $SETUP_DIALOG->show;
2381 $MESSAGE_WINDOW->show; 2626 $MESSAGE_WINDOW->show;
2382 } 2627 }
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;
2383 2637
2384 $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]);
2385} 2639}
2386 2640
2387sub video_shutdown { 2641sub video_shutdown {
2395my $animate_timer; 2649my $animate_timer;
2396 2650
2397my $fps = 9; 2651my $fps = 9;
2398 2652
2399sub force_refresh { 2653sub force_refresh {
2400 if ($ENV{CFPLUS_DEBUG} & 4) { 2654 if ($DELIANTRA_DEBUG & 4) {
2401 $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;
2402 debug sprintf "%3.2f", $fps; 2656 debug sprintf "%3.2f", $fps;
2403 } 2657 }
2404 2658
2405 undef $WANT_REFRESH; 2659 undef $WANT_REFRESH;
2413my $want_refresh = EV::prepare_ns \&force_refresh; 2667my $want_refresh = EV::prepare_ns \&force_refresh;
2414 2668
2415my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2669my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2416 $NOW = EV::now; 2670 $NOW = EV::now;
2417 2671
2418 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2672 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2419 for DC::poll_events; 2673 for DC::poll_events;
2420 2674
2421 if (%animate_object) { 2675 if (%animate_object) {
2422 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2676 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2423 $WANT_REFRESH = 1; 2677 $WANT_REFRESH = 1;
2435sub animation_stop { 2689sub animation_stop {
2436 my ($widget) = @_; 2690 my ($widget) = @_;
2437 delete $animate_object{$widget}; 2691 delete $animate_object{$widget};
2438} 2692}
2439 2693
2440%SDL_CB = (
2441 DC::SDL_QUIT => sub { 2694$SDL_CB[DC::SDL_QUIT] = sub {
2695 crash "SDL_QUIT";
2442 EV::unloop EV::UNLOOP_ALL; 2696 EV::unloop EV::UNLOOP_ALL;
2443 }, 2697};
2444 DC::SDL_VIDEORESIZE => sub { 2698$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2445 },
2446 DC::SDL_VIDEOEXPOSE => sub { 2699$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2447 DC::UI::full_refresh; 2700 DC::UI::full_refresh;
2448 }, 2701};
2449 DC::SDL_ACTIVEEVENT => sub { 2702$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2450# not useful, as APPACTIVE includes only iconified state, not unmapped 2703# not useful, as APPACTIVE includes only iconified state, not unmapped
2451# 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#
2452# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2705# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2453# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2706# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2454# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2707# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2455# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2708# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2456 }, 2709};
2457 DC::SDL_KEYDOWN => sub { 2710$SDL_CB[DC::SDL_KEYDOWN] = sub {
2458 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2711 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2459 # alt-enter 2712 # alt-enter
2460 video_shutdown; 2713 video_shutdown;
2461 $FULLSCREEN_ENABLE->toggle; 2714 $FULLSCREEN_ENABLE->toggle;
2462 video_init; 2715 video_init;
2463 } else { 2716 } else {
2464 &DC::UI::feed_sdl_key_down_event; 2717 &DC::UI::feed_sdl_key_down_event;
2465 } 2718 }
2466 update_modbox; 2719 update_modbox;
2467 }, 2720};
2468 DC::SDL_KEYUP => sub { 2721$SDL_CB[DC::SDL_KEYUP] = sub {
2469 &DC::UI::feed_sdl_key_up_event; 2722 &DC::UI::feed_sdl_key_up_event;
2470 update_modbox; 2723 update_modbox;
2471 }, 2724};
2472 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2725$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2473 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2726$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2474 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2475 DC::SDL_USEREVENT => sub { 2728$SDL_CB[DC::SDL_USEREVENT] = sub {
2476 if ($_[0]{code} == 1) { 2729 if ($_[0]{code} == 1) {
2477 audio_channel_finished $_[0]{data1}; 2730 audio_channel_finished $_[0]{data1};
2478 } elsif ($_[0]{code} == 0) { 2731 } elsif ($_[0]{code} == 0) {
2479 audio_music_finished; 2732 audio_music_finished;
2480 }
2481 }, 2733 }
2482); 2734};
2483 2735
2484############################################################################# 2736#############################################################################
2485 2737
2486$SIG{INT} = $SIG{TERM} = sub { 2738$SIG{INT} = $SIG{TERM} = sub {
2487 EV::unloop; 2739 EV::unloop;
2488 #d# TODO calling exit here hangs the process in some futex 2740 #d# TODO calling exit here hangs the process in some futex
2489}; 2741};
2490 2742
2491{ 2743# due to mac os x + sdl combined braindamage, we need this contortion
2744sub main {
2745 {
2492 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2746 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2493 2747
2494 if (-e "$Deliantra::VARDIR/client.cf") { 2748 if (-e "$Deliantra::VARDIR/client.cf") {
2495 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2749 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2496 } else { 2750 } else {
2497 #TODO: compatibility cruft 2751 #TODO: compatibility cruft
2498 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2752 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2499 print STDERR "INFO: used old configuration file\n"; 2753 print STDERR "INFO: used old configuration file\n";
2500 } 2754 }
2501 2755
2502 DC::DB::Server::run; 2756 DC::DB::Server::run;
2503 2757
2504 if ($CFG->{db_schema} < 1) { 2758 if ($CFG->{db_schema} < 1) {
2505 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2759 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2506 DC::DB::nuke_db; 2760 DC::DB::nuke_db;
2507 $CFG->{db_schema} = 1; 2761 $CFG->{db_schema} = 1;
2508 DC::write_cfg; 2762 DC::write_cfg;
2509 } 2763 }
2510 2764
2511 DC::DB::open_db; 2765 DC::DB::open_db;
2512 2766
2513 DC::UI::set_layout ($::CFG->{layout}); 2767 DC::UI::set_layout ($::CFG->{layout});
2514 2768
2515 my %DEF_CFG = ( 2769 my %DEF_CFG = (
2770 config_autosave => 1,
2516 sdl_mode => 0, 2771 sdl_mode => undef,
2517 fullscreen => 1, 2772 fullscreen => 1,
2518 fast => 0, 2773 fast => 0,
2519 force_opengl11 => undef, 2774 force_opengl11 => undef,
2520 disable_alpha => 0, 2775 disable_alpha => 0,
2776 smooth_movement => 1,
2777 smooth_transitions => 1,
2521 texture_compression => 1, 2778 texture_compression => 1,
2522 map_scale => 1, 2779 map_scale => 1,
2523 fow_enable => 1, 2780 fow_enable => 1,
2524 fow_intensity => 0, 2781 fow_intensity => 0,
2782 fow_texture => 0,
2525 map_smoothing => 1, 2783 map_smoothing => 1,
2526 gui_fontsize => 1, 2784 gui_fontsize => 1,
2527 log_fontsize => 0.7, 2785 log_fontsize => 0.7,
2528 gauge_fontsize => 1, 2786 gauge_fontsize => 1,
2529 gauge_size => 0.35, 2787 gauge_size => 0.35,
2530 stat_fontsize => 0.7, 2788 stat_fontsize => 0.7,
2531 mapsize => 100, 2789 mapsize => 100,
2532 audio_enable => 1, 2790 audio_enable => 1,
2533 audio_hw_channels => 0, 2791 audio_hw_channels => 0,
2534 audio_hw_frequency => 0, 2792 audio_hw_frequency => 0,
2535 audio_hw_chunksize => 0, 2793 audio_hw_chunksize => 0,
2536 audio_mix_channels => 8, 2794 audio_mix_channels => 8,
2537 effects_enable => 1, 2795 effects_enable => 1,
2538 effects_volume => 1, 2796 effects_volume => 1,
2539 bgm_enable => 1, 2797 bgm_enable => 1,
2540 bgm_volume => 0.5, 2798 bgm_volume => 0.5,
2541 output_rate => "", 2799 output_rate => "",
2542 pickup => 0, 2800 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2543 inv_sort => "mtime", 2801 inv_sort => "mtime",
2544 default => "profile", # default profile 2802 default => "profile", # default profile
2545 show_tips => 1, 2803 show_tips => 1,
2546 logview_max_par => 1000, 2804 logview_max_par => 1000,
2547 shift_fire_stop => 0, 2805 shift_fire_stop => 0,
2806 uitheme => "wood",
2807 map_shift_x => -24, # arbitrary
2808 map_shift_y => +24, # arbitrary
2548 ); 2809 );
2549 2810
2550 while (my ($k, $v) = each %DEF_CFG) { 2811 while (my ($k, $v) = each %DEF_CFG) {
2551 $CFG->{$k} = $v unless exists $CFG->{$k}; 2812 $CFG->{$k} = $v unless exists $CFG->{$k};
2552 } 2813 }
2553 2814
2554 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2815 my @args = @ARGV;
2555 $PROFILE = $CFG->{profile}{default};
2556 2816
2557 # convert old bindings (only default profile matters) 2817 my $profile = 'default';
2558 if (my $bindings = delete $PROFILE->{bindings}) { 2818
2559 while (my ($mod, $syms) = each %$bindings) { 2819 for (my $i = 0; $i < @args; $i++) {
2560 while (my ($sym, $cmds) = each %$syms) { 2820 if ($args[$i] =~ /^--?profile$/) {
2561 push @{ $PROFILE->{macro} }, { 2821 $profile = $args[$i + 1];
2562 accelkey => [$mod*1, $sym*1], 2822 splice @args, $i, 2, ();
2563 action => $cmds,
2564 }; 2823 $i = 0;
2824 } elsif ($args[$i] =~ /^--?h/) {
2825 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2826 exit 0;
2565 } 2827 }
2566 } 2828 }
2567 }
2568 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
2569 sdl_init; 2850 sdl_init;
2570 2851
2571 { 2852 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2853 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2854
2855 {
2572 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2856 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2573 DejaVuSans.ttf 2857 DejaVuSans.ttf
2574 DejaVuSansMono.ttf 2858 DejaVuSansMono.ttf
2575 DejaVuSans-Bold.ttf 2859 DejaVuSans-Bold.ttf
2576 DejaVuSansMono-Bold.ttf 2860 DejaVuSansMono-Bold.ttf
2577 DejaVuSans-Oblique.ttf 2861 DejaVuSans-Oblique.ttf
2578 DejaVuSansMono-Oblique.ttf 2862 DejaVuSansMono-Oblique.ttf
2579 DejaVuSans-BoldOblique.ttf 2863 DejaVuSans-BoldOblique.ttf
2580 DejaVuSansMono-BoldOblique.ttf 2864 DejaVuSansMono-BoldOblique.ttf
2865 mona.ttf
2581 ); 2866 );
2582 2867
2583 DC::add_font $_ for @fonts; 2868 DC::add_font $_ for @fonts;
2584 2869
2585 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2870 $FONT_PROP = new_from_file DC::Font $fonts[0];
2586 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2871 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2587 2872
2588 $FONT_PROP->make_default; 2873 $FONT_PROP->make_default;
2589 2874
2590 DC::pango_init; 2875 DC::pango_init;
2591 } 2876 }
2592 2877
2593# compare mono (ft) vs. rgba (cairo) 2878# compare mono (ft) vs. rgba (cairo)
2594# ft - 1.8s, cairo 3s, even in alpha-only mode 2879# ft - 1.8s, cairo 3s, even in alpha-only mode
2595# for my $rgba (0..1) { 2880# for my $rgba (0..1) {
2596# my $t1 = Time::HiRes::time; 2881# my $t1 = Time::HiRes::time;
2601# } 2886# }
2602# my $t2 = Time::HiRes::time; 2887# my $t2 = Time::HiRes::time;
2603# warn $t2-$t1; 2888# warn $t2-$t1;
2604# } 2889# }
2605 2890
2606 video_init; 2891 video_init;
2607 audio_init; 2892 audio_init;
2608} 2893 }
2609 2894
2610show_tip_of_the_day if $CFG->{show_tips}; 2895 show_tip_of_the_day if $CFG->{show_tips};
2611 2896
2612our $STARTUP_CANCEL = EV::idle sub { 2897 our $STARTUP_CANCEL = EV::idle sub {
2613 undef $::STARTUP_CANCEL; 2898 undef $::STARTUP_CANCEL;
2614 $startup_done->(); 2899 $startup_done->();
2615}; 2900 };
2616 2901
2902 debug_toggle 0;
2903
2617delete $SIG{__DIE__}; 2904 delete $SIG{__DIE__};
2618EV::loop; 2905 EV::loop;
2619 2906
2907 DC::write_cfg if $CFG->{config_autosave};
2908
2620#video_shutdown; 2909 #video_shutdown;
2621#audio_shutdown; 2910 #audio_shutdown;
2911
2622DC::OpenGL::quit; 2912 DC::OpenGL::quit;
2623DC::SDL_Quit; 2913 DC::SDL_Quit;
2624DC::DB::Server::stop; 2914 DC::DB::Server::stop;
2915}
2916
2917DC::SDL_braino; # see sub above
2625 2918
2626=head1 NAME 2919=head1 NAME
2627 2920
2628deliantra - A Deliantra MORPG game client 2921deliantra - A Deliantra MORPG game client
2629 2922
2630=head1 SYNOPSIS 2923=head1 SYNOPSIS
2631 2924
2632Just run it - no commandline arguments are supported. 2925 deliantra [--profile name] [host [user [password]]]
2926 deliantra --help
2633 2927
2634=head1 USAGE 2928=head1 USAGE
2635 2929
2636deliantra 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
2637be used in fullscreen mode and interactively. 2931is supposed to be used in fullscreen mode and interactively.
2638 2932
2639=head1 DEBUGGING 2933=head1 DEBUGGING
2640 2934
2641
2642CFPLUS_DEBUG - environment variable 2935DELIANTRA_DEBUG - environment variable
2643 2936
2644 1 draw borders around widgets 2937 1 draw borders around widgets
2645 2 add low-level widget info to tooltips 2938 2 add low-level widget info to tooltips
2646 4 show fps 2939 4 show fps
2647 8 suppress tooltips 2940 8 suppress tooltips
2941 16 show bandwidth downstream
2648 2942
2649=head1 AUTHOR 2943=head1 AUTHOR
2650 2944
2651Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2945Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2652 2946
2653 2947
2654 2948

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines