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.46 by root, Tue Jun 24 21:44:50 2008 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

… …
21 21
22 Win32::GUI::SplashScreen::Show ( 22 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 24 );
25 25
26 # initialise the resolver now, as vista forces us back to the desktop
27 # when doing this later.
28 use AnyEvent::DNS ();
29 AnyEvent::DNS::resolver;
30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 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
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
102use AnyEvent::DNS; 94use AnyEvent::DNS ();
103 95
104use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
105 98
106use DC; 99use DC;
107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" 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
108use DC::OpenGL (); 113use DC::OpenGL ();
109use DC::Protocol; 114use DC::Protocol;
110use DC::DB; 115use DC::DB;
111use DC::UI; 116use DC::UI;
112use DC::UI::Canvas; 117use DC::UI::Canvas;
113use DC::UI::Inventory; 118use DC::UI::Inventory;
114use DC::UI::SpellList; 119use DC::UI::SpellList;
115use DC::UI::Dockable; 120use DC::UI::Dockable;
116use DC::UI::Dockbar; 121use DC::UI::Dockbar;
117use DC::UI::MessageWindow;
118use DC::UI::ChatView; 122use DC::UI::ChatView;
119use DC::MessageDistributor; 123use DC::MessageDistributor;
120use DC::Pod; 124use DC::Pod;
121use DC::MapWidget; 125use DC::MapWidget;
122use DC::Macro; 126use DC::Macro;
123 127
124$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
125$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
126 130
127$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
128 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
129}; 134};
130 135
131my $MAX_FPS = 60; 136my $MAX_FPS = 60;
132 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
133our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
134 141
135our $LAST_REFRESH; 142our $LAST_REFRESH;
136our $NOW; 143our $NOW;
137 144
138our $CFG; 145our $CFG;
139our $CONN;
140our $PROFILE; # current profile 146our $PROFILE; # current profile
141our $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;
142 149
143our $WANT_REFRESH; 150our $WANT_REFRESH;
144 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
145our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
146our $WIDTH; 157our $WIDTH;
147our $HEIGHT; 158our $HEIGHT;
148our $FULLSCREEN; 159our $FULLSCREEN;
149our $FONTSIZE; 160our $FONTSIZE;
150 161
151our $FONT_PROP; 162our $FONT_PROP;
152our $FONT_FIXED; 163our $FONT_FIXED;
153 164
165our $CONN;
166
154our $MAP; 167our $MAP;
155our $MAPMAP; 168our $MAPMAP;
156our $MAPWIDGET; 169our $MAPWIDGET;
157our $COMPLETER; 170our $COMPLETER;
158our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
159our $METASERVER; 175our $METASERVER;
160our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
161our $QUIT_DIALOG; 177our $QUIT_DIALOG;
162our $HOST_ENTRY; 178our $HOST_ENTRY;
163our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
189our $FLOORBOX; 205our $FLOORBOX;
190our $GAUGES; 206our $GAUGES;
191our $STATWIDS; 207our $STATWIDS;
192 208
193our $SDL_ACTIVE; 209our $SDL_ACTIVE;
194our %SDL_CB; 210our @SDL_CB;
195 211
196our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
197our $STATUSBOX; 213our $STATUSBOX;
198our $MODBOX; 214our $MODBOX;
199our $DEBUG_STATUS; 215our $DEBUG_STATUS;
200 216
201our $INV; 217our $INV;
202our $INVR; 218our $INVR;
203our $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}
204 260
205############################################################################# 261#############################################################################
206 262
207sub status { 263sub status {
208 $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]);
… …
290 or return; 346 or return;
291 347
292 $meta->{data} 348 $meta->{data}
293 or return; 349 or return;
294 350
295 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
296 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
297 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
298 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
299 &audio_music_push ($face); 355 &audio_music_push ($face);
300 } 356 }
301 } else { 357 } else {
302 # fetch from database 358 # fetch from database
303 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
304 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
305 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
306 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;
307 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
308 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
309 365
310 audio_sound_push ($face); 366 audio_sound_push ($face);
311 }; 367 };
… …
358 414
359 audio_music_update_volume; 415 audio_music_update_volume;
360 416
361 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
362 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
363 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
364 ? 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
365 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
366 425
367 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
368 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
369 428
370 my $NOW = time; 429 my $NOW = time;
371 430
372 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
373 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
482 sub audio_tab_update; 541 sub audio_tab_update;
483 audio_tab_update; 542 audio_tab_update;
484} 543}
485 544
486sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
487 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
488 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
489 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
490 554
491 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
731} 795}
732 796
733sub dc_connect { 797sub dc_connect {
734 my ($host, $port) = @_; 798 my ($host, $port) = @_;
735 799
736 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;
737 802
738 $CONN = 803 $CONN =
739 new DC::Protocol 804 new DC::Protocol
740 host => $host, 805 host => $host,
741 port => $port || 13327, 806 port => $port,
742 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
743 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
744 mapw => $mapsize, 809 mapw => $mapw,
745 maph => $mapsize, 810 maph => $maph,
746 811
812 c_version => {
813 client => "deliantra",
747 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
748 818
749 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
750 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
751 map => $MAP, 821 map => $MAP,
752 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
… …
758 828
759 on_connect => sub { 829 on_connect => sub {
760 if ($_[0]) { 830 if ($_[0]) {
761 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
762 832
763 status "login successful"; 833 status "successfully connected to the server";
764 } else { 834 } else {
765 undef $CONN; 835 undef $CONN;
766 status "unable to connect: $!"; 836 status "unable to connect: $!";
767 stop_game(); 837 stop_game();
768 } 838 }
… …
770 ; 840 ;
771} 841}
772 842
773sub start_game { 843sub start_game {
774 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.";
775 849
776 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
778
779 my ($host, $port) = split /:/, $PROFILE->{host};
780 852
781 $MAP = new DC::Map; 853 $MAP = new DC::Map;
782 854
783 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
785 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
786 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
787 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
788 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
789 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 }
790 } 866 }
791 867
792 dc_connect $host, $port; 868 dc_connect $host, $port;
793 }; 869 };
794 } else { 870 } else {
795 dc_connect $host, $port; 871 dc_connect $host, $port;
796 } 872 }
797} 873}
798 874
799sub stop_game { 875sub stop_game {
876 crash "stop_game";
877
800 $LOGIN_BUTTON->set_text ("Login / Register"); 878 $LOGIN_BUTTON->set_text ("Login / Register");
801 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 879 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
802 $SETUP_DIALOG->show; 880 $SETUP_DIALOG->show;
803 $PL_WINDOW->hide; 881 $PL_WINDOW->hide;
804 $SPELL_LIST->clear_spells; 882 $SPELL_LIST->clear_spells;
… …
818} 896}
819 897
820sub graphics_setup { 898sub graphics_setup {
821 my $vbox = new DC::UI::VBox; 899 my $vbox = new DC::UI::VBox;
822 900
901 {
902 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
903
823 $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]);
824 905
825 my $row = 0; 906 my $row = 0;
826 907
827 $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");
828 $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,
829 can_events => 1, 910 can_events => 1,
830 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 911 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
831 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
832 my $vidmode_tooltip = 934 my $vidmode_tooltip =
833 "<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). "
834 . "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>.";
835 937
836 $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");
837 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
838 940
839 $hbox->add (my $mode_slider = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
840 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 ],
841 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
842 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
843 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
844 can_events => 1, tooltip => $vidmode_tooltip); 948 can_events => 1, tooltip => $vidmode_tooltip);
845 949
846 $mode_slider->connect (changed => sub { 950 $MODE_SLIDER->connect (changed => sub {
847 my ($self, $value) = @_; 951 my ($self, $value) = @_;
848 952
849 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 953 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
850 $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]});
851 }); 955 });
852 $mode_slider->emit (changed => $mode_slider->{range}[0]); 956 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
853 957
854 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 958 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
855 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 959 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
856 state => $CFG->{fullscreen}, 960 state => $CFG->{fullscreen},
857 tooltip => "Bring the client into fullscreen mode.", 961 tooltip => "Bring the client into fullscreen mode.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 962 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
859 ); 963 );
860 964
861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 966 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{force_opengl11}, 967 state => $CFG->{force_opengl11},
864 tooltip => "Limit Deliantra 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 "
865 . "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 "
866 . "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. "
867 . "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, "
868 . "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. "
869 . "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>",
870 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
871 ); 975 );
872 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) = @_;
988 $CFG->{disable_alpha} = $value;
989 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
990 0
991 }
992 );
993
873 $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");
874 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
875 state => $CFG->{texture_compression}, 996 state => $CFG->{texture_compression},
876 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 "
877 . "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). "
878 . "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 "
879 . "forced OpenGL 1.1 mode.", 1000 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
880 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
881 ); 1002 );
882 1003
883 $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");
884 $table->add_at (1, $row++, new DC::UI::CheckBox 1005 $table->add_at (1, $row++, new DC::UI::CheckBox
885 state => $CFG->{fast}, 1006 state => $CFG->{fast},
886 tooltip => "Lower the visual quality considerably to speed up rendering.", 1007 tooltip => "Lower the visual quality considerably to speed up rendering.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
888 ); 1009 );
889 1010
890 $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");
891 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
892 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1013 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
893 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.",
894 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1015 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
895 ); 1016 );
896 1017
897 $table->add_at (1, $row++, new DC::UI::Button 1018 $table->add_at (1, $row++, new DC::UI::Button
898 expand => 1, text => "Apply", 1019 expand => 1, text => "Apply",
899 tooltip => "Apply the video settings above.", 1020 tooltip => "Apply the video settings above.",
900 on_activate => sub { 1021 on_activate => sub {
901 video_shutdown (); 1022 video_shutdown ();
902 video_init (); 1023 video_init ();
1024 0
903 0 1025 }
904 } 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 }
905 ); 1042 );
906 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
907 $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");
908 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
909 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
910 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
911 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 }
912 ); 1059 );
913 1060
914 $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");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1062 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{map_smoothing}, 1063 state => $CFG->{map_smoothing},
917 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. "
918 . "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. "
919 . "Changes take effect at next login only.", 1066 . "Changes take effect at next login only.",
920 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1067 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
921 ); 1068 );
922 1069
923 $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");
924 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
925 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
926 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.",
927 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
928 ); 1075 );
929 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
930 $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");
931 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
932 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
933 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.",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
935 ); 1097 );
936 1098
937 $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");
938 $table->add_at (1, $row++, new DC::UI::Slider 1100 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1101 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
940 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, "
941 . "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.",
942 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 },
943 ); 1105 );
944 1106
945 $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");
946 $table->add_at (1, $row++, new DC::UI::Slider 1108 $table->add_at (1, $row++, new DC::UI::Slider
947 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1109 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
948 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.",
949 on_changed => sub { 1111 on_changed => sub {
950 $CFG->{gauge_fontsize} = $_[1]; 1112 $CFG->{gauge_fontsize} = $_[1];
951 &set_gauge_window_fontsize; 1113 &set_gauge_window_fontsize;
1114 0
952 0 1115 }
953 } 1116 );
954 );
955 1117
956 $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");
957 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
958 range => [$CFG->{gauge_size}, 0.2, 0.8], 1120 range => [$CFG->{gauge_size}, 0.2, 0.8],
959 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.",
960 on_changed => sub { 1122 on_changed => sub {
961 $CFG->{gauge_size} = $_[1]; 1123 $CFG->{gauge_size} = $_[1];
962 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1124 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1125 0
963 0 1126 }
964 } 1127 );
965 ); 1128 }
966 1129
967 $vbox 1130 $vbox
968} 1131}
969 1132
970our $AUDIO_HW_CHUNKSIZE; 1133our $AUDIO_HW_CHUNKSIZE;
… …
982 ]); 1145 ]);
983 1146
984 my $text = !$freq 1147 my $text = !$freq
985 ? "audio is off" 1148 ? "audio is off"
986 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
987 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
988 . "channels: $chans"; 1152 . "channels: $chans\n"
1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
989 1155
990 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
991} 1157}
992 1158
993sub audio_setup { 1159sub audio_setup {
… …
1022 ); 1188 );
1023 1189
1024 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1190 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1025 $table->add_at (1, $row, new DC::UI::CheckBox 1191 $table->add_at (1, $row, new DC::UI::CheckBox
1026 expand => 1, state => $CFG->{bgm_enable}, 1192 expand => 1, state => $CFG->{bgm_enable},
1027 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1193 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1028 on_changed => sub { 1194 on_changed => sub {
1029 $CFG->{bgm_enable} = $_[1]; 1195 $CFG->{bgm_enable} = $_[1];
1030 $CONN->update_fx_want if $CONN; 1196 $CONN->update_fx_want if $CONN;
1031 audio_music_push; 1197 audio_music_push;
1032 1 1198 1
… …
1133} 1299}
1134 1300
1135sub make_gauge_window { 1301sub make_gauge_window {
1136 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1302 my $gh = int $HEIGHT * $CFG->{gauge_size};
1137 1303
1138 my $win = new DC::UI::Frame ( 1304 $GAUGES->{win} = my $win = new DC::UI::Frame (
1139 force_x => 0, 1305 force_x => 0,
1140 force_y => "max", 1306 force_y => "max",
1141 force_w => $WIDTH, 1307 force_w => $WIDTH,
1142 force_h => $gh, 1308 force_h => $gh,
1143 ); 1309 );
… …
1159 (new DC::UI::Empty expand => 1), 1325 (new DC::UI::Empty expand => 1),
1160 (my $hb = new DC::UI::HBox), 1326 (my $hb = new DC::UI::HBox),
1161 ], 1327 ],
1162 ); 1328 );
1163 1329
1164 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1330 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1165 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1331 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1166 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1332 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1167 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1333 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1168
1169 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1170 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1171 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1172 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1173
1174 $GAUGES = {
1175 exp => $exp, prg => $prg, sklprg => $sklprg,
1176 win => $win, range => $rng,
1177 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1178 };
1179 1334
1180 &set_gauge_window_fontsize; 1335 &set_gauge_window_fontsize;
1181 1336
1182 $win 1337 $win
1338}
1339
1340our $BW_WATCHER;
1341
1342sub debug_toggle($) {
1343 $DELIANTRA_DEBUG ^= $_[0];
1344
1345 if ($DELIANTRA_DEBUG & 16) {
1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1347 return unless $CONN;
1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1349 $CONN->{octets_in} = 0;
1350 };
1351 } else {
1352 undef $BW_WATCHER;
1353 }
1354
1183} 1355}
1184 1356
1185sub debug_setup { 1357sub debug_setup {
1186 my $table = new DC::UI::Table; 1358 my $table = new DC::UI::Table;
1187 1359
1188 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1360 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1189 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1361 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1190 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1362 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1191 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1363 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1192 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1364 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1193 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1365 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1194 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1366 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1195 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1367 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1368 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1369 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1370
1196 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1371 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1197
1198 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1372 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1199 1373
1200 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1374 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1201 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1375 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1202 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1376 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1203 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1377 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1524 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1698 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1525 ); 1699 );
1526 1700
1527 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1701 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1528 $table->add_at (1, 4, new DC::UI::Entry 1702 $table->add_at (1, 4, new DC::UI::Entry
1529 text => $CFG->{profile}{default}{user}, 1703 text => $PROFILE->{user},
1530 tooltip => "The name of your character on the server.", 1704 tooltip => "The name of your character on the server. The name is case-sensitive!",
1531 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1705 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1532 ); 1706 );
1533 1707
1534 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1708 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1535 $table->add_at (1, 5, new DC::UI::Entry 1709 $table->add_at (1, 5, new DC::UI::Entry
1536 text => $CFG->{profile}{default}{password}, 1710 text => $PROFILE->{password},
1537 hidden => 1, 1711 hidden => 1,
1538 tooltip => "The password for your character.", 1712 tooltip => "The password for your character.",
1539 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1713 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1540 ); 1714 );
1541 1715
1542 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1716 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1543 expand => 1, 1717 expand => 1,
1544 text => "Login / Register", 1718 text => "Login / Register",
… …
1549 1 1723 1
1550 }, 1724 },
1551 ); 1725 );
1552 1726
1553 $vbox->add (new DC::UI::FancyFrame 1727 $vbox->add (new DC::UI::FancyFrame
1554 label => "Registering", 1728 label => "How to Play",
1555 min_h => 200, 1729 min_h => 240,
1556 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1730 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1557 markup => 1731 markup =>
1732 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1733 . "Then register a new account (or use an existing one if you have one). "
1558 "To register a new account, choose a username that hasn't been taken yet and " 1734 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1559 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1735 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1560 ), 1736 ),
1561 ); 1737 );
1562 1738
1563 $vbox 1739 $vbox
… …
1578 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1754 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1579 1755
1580 $vbox->add ( 1756 $vbox->add (
1581 $HOST_ENTRY = new DC::UI::Entry 1757 $HOST_ENTRY = new DC::UI::Entry
1582 expand => 1, 1758 expand => 1,
1583 text => $CFG->{profile}{default}{host}, 1759 text => $PROFILE->{host},
1584 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1760 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1585 on_changed => sub { 1761 on_changed => sub {
1586 my ($self, $value) = @_; 1762 my ($self, $value) = @_;
1587 $CFG->{profile}{default}{host} = $value; 1763 $PROFILE->{host} = $value;
1588 1 1764 1
1589 } 1765 }
1590 ); 1766 );
1591 1767
1592 if (0) { #d# disabled 1768 if (0) { #d# disabled
… …
1635 1811
1636 my $row = 0; 1812 my $row = 0;
1637 1813
1638 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1639 $table->add_at (1, $row++, new DC::UI::CheckBox 1815 $table->add_at (1, $row++, new DC::UI::CheckBox
1816 c_colspan => 2,
1640 state => $CFG->{show_tips}, 1817 state => $CFG->{show_tips},
1641 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1818 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1642 on_changed => sub { 1819 on_changed => sub {
1643 my ($self, $value) = @_; 1820 my ($self, $value) = @_;
1644 $CFG->{show_tips} = $value; 1821 $CFG->{show_tips} = $value;
… …
1646 } 1823 }
1647 ); 1824 );
1648 1825
1649 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1826 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1650 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1827 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1828 c_colspan => 2,
1651 text => $CFG->{logview_max_par}, 1829 text => $CFG->{logview_max_par},
1652 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1830 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1653 . "sends more messages than this number, older messages get removed to save memory and " 1831 . "sends more messages than this number, older messages get removed to save memory and "
1654 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1832 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1655 on_changed => sub { 1833 on_changed => sub {
… …
1657 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1835 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1658 0 1836 0
1659 }, 1837 },
1660 ); 1838 );
1661 1839
1840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1841 $table->add_at (1, $row, new DC::UI::CheckBox
1842 state => $CFG->{config_autosave},
1843 tooltip => "Normally, configuration settings and the user interface layout "
1844 . "are saved on client exit. You can disable this behaviour by "
1845 . "unchecking this checkbox.",
1846 on_changed => sub {
1847 my ($self, $value) = @_;
1848 $CFG->{config_autosave} = $value;
1849 0
1850 }
1851 );
1852 $table->add_at (2, $row++, new DC::UI::Button
1853 text => "Save Now",
1854 tooltip => "Use this to manually save configuration and UI layout when "
1855 . "autosave is disabled.",
1856 on_activate => sub {
1857 DC::write_cfg;
1858 0
1859 }
1860 );
1861
1662 $table 1862 $table
1663} 1863}
1664 1864
1665sub autopickup_setup { 1865sub autopickup_setup {
1666 my $r = new DC::UI::ScrolledWindow ( 1866 my $r = new DC::UI::ScrolledWindow (
… …
1672 col_expand => [0, 1, 0, 1], 1872 col_expand => [0, 1, 0, 1],
1673 ); 1873 );
1674 1874
1675 for ( 1875 for (
1676 ["General", 0, 0, 1876 ["General", 0, 0,
1677 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1678 ["Inhibit autopickup" => PICKUP_INHIBIT], 1877# ["Inhibit autopickup" => PICKUP_INHIBIT],
1679 ["Stop before pickup" => PICKUP_STOP], 1878 ["Stop before pickup" => PICKUP_STOP],
1680 ["Debug autopickup" => PICKUP_DEBUG], 1879 ["Debug autopickup" => PICKUP_DEBUG],
1681 ], 1880 ],
1682 ["Weapons", 0, 6, 1881 ["Weapons", 0, 6,
1683 ["All weapons" => PICKUP_ALLWEAPON], 1882 ["All weapons" => PICKUP_ALLWEAPON],
… …
1709 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1908 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1710 ["Ignore cursed" => PICKUP_NOT_CURSED], 1909 ["Ignore cursed" => PICKUP_NOT_CURSED],
1711 ["Jewelery" => PICKUP_JEWELS], 1910 ["Jewelery" => PICKUP_JEWELS],
1712 ["Flesh" => PICKUP_FLESH], 1911 ["Flesh" => PICKUP_FLESH],
1713 ], 1912 ],
1714 ["Weight/Value ratio", 2, 17] 1913 ["Value/Weight ratio", 2, 17]
1715 ) 1914 )
1716 { 1915 {
1717 my ($title, $x, $y, @bits) = @$_; 1916 my ($title, $x, $y, @bits) = @$_;
1718 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1917 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1719 1918
… …
1731 $::CFG->{pickup} |= $mask; 1930 $::CFG->{pickup} |= $mask;
1732 } else { 1931 } else {
1733 $::CFG->{pickup} &= ~$mask; 1932 $::CFG->{pickup} &= ~$mask;
1734 } 1933 }
1735 1934
1736 $::CONN->send_command ("pickup $::CFG->{pickup}") 1935 $::CONN->send_pickup ($::CFG->{pickup})
1737 if defined $::CONN; 1936 if defined $::CONN;
1738 1937
1739 0 1938 0
1740 }); 1939 });
1741 1940
… …
1744 } 1943 }
1745 1944
1746 $table->add_at (2, 18, new DC::UI::ValSlider 1945 $table->add_at (2, 18, new DC::UI::ValSlider
1747 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1946 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1748 template => ">= 99", 1947 template => ">= 99",
1948 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1749 to_value => sub { ">= " . 5 * $_[0] }, 1949 to_value => sub { ">= " . 5 * $_[0] },
1750 on_changed => sub { 1950 on_changed => sub {
1751 my ($slider, $value) = @_; 1951 my ($slider, $value) = @_;
1752 1952
1753 $::CFG->{pickup} &= ~0xF; 1953 $::CFG->{pickup} &= ~0xF;
… …
1757 }); 1957 });
1758 1958
1759 $table->add_at (3, 18, new DC::UI::Button 1959 $table->add_at (3, 18, new DC::UI::Button
1760 text => "set", 1960 text => "set",
1761 on_activate => sub { 1961 on_activate => sub {
1762 $::CONN->send_command ("pickup $::CFG->{pickup}") 1962 $::CONN->send_pickup ($::CFG->{pickup})
1763 if defined $::CONN; 1963 if defined $::CONN;
1764 0 1964 0
1765 }); 1965 });
1766 1966
1767 $r 1967 $r
1768} 1968}
1769 1969
1770my %SORT_ORDER = ( 1970my %SORT_ORDER = (
1771 type => sub { 1971 type => sub {
1972 use sort 'stable';
1772 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1973 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1773 }, 1974 },
1774 mtime => sub { 1975 mtime => sub {
1976 use sort 'stable';
1775 my $NOW = time; 1977 my $NOW = time;
1776 sort { 1978 sort {
1777 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1979 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1778 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1980 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1779 1981
1780 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1982 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1781 or $btime <=> $atime 1983 or $btime <=> $atime
1782 or $a->{type} <=> $b->{type} 1984 or $a->{type} <=> $b->{type}
1783 } @_ 1985 } @_
1784 }, 1986 },
1785 weight => sub { sort { 1987 weight => sub {
1988 use sort 'stable';
1989 sort {
1786 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1990 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1787 or $a->{type} <=> $b->{type} 1991 or $a->{type} <=> $b->{type}
1788 } @_ }, 1992 } @_
1993 },
1789); 1994);
1790 1995
1791sub inventory_widget { 1996sub inventory_widget {
1792 my $hb = new DC::UI::HBox homogeneous => 1; 1997 my $hb = new DC::UI::HBox homogeneous => 1;
1793 1998
… …
1809 $::CFG->{inv_sort} = $_[1]; 2014 $::CFG->{inv_sort} = $_[1];
1810 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2015 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1811 }, 2016 },
1812 ); 2017 );
1813 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 2018 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1814 #TODO# update to weigh/maxweight 2019 #TODO# update to weight/maxweight
1815 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2020 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1816 2021
1817 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2022 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1818 $sw1->add ($INV = new DC::UI::Inventory); 2023 $sw1->add ($INV = new DC::UI::Inventory);
1819 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2024 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1880 $PL_NOTEBOOK->set_current_page ($widget); 2085 $PL_NOTEBOOK->set_current_page ($widget);
1881 $PL_WINDOW->show; 2086 $PL_WINDOW->show;
1882 } 2087 }
1883} 2088}
1884 2089
1885sub player_window { 2090sub make_playerbook {
1886 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2091 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1887 x => "center", 2092 x => "center",
1888 y => "center", 2093 y => "center",
1889 force_w => $WIDTH * 9/10, 2094 force_w => $WIDTH * 9/10,
1890 force_h => $HEIGHT * 9/10, 2095 force_h => $HEIGHT * 9/10,
… …
1924 "License, Author and Source info for media sent by the server."); 2129 "License, Author and Source info for media sent by the server.");
1925 2130
1926 $ntb->set_current_page ($INVENTORY_PAGE); 2131 $ntb->set_current_page ($INVENTORY_PAGE);
1927 2132
1928 $plwin->add ($ntb); 2133 $plwin->add ($ntb);
1929 $plwin
1930} 2134}
1931 2135
1932sub keyboard_setup { 2136sub keyboard_setup {
1933 DC::Macro::keyboard_setup 2137 DC::Macro::keyboard_setup
1934} 2138}
1935 2139
1936sub help_window { 2140sub make_help_window {
1937 my $win = new DC::UI::Toplevel 2141 my $win = new DC::UI::Toplevel
1938 x => 'center', 2142 x => 'center',
1939 y => 'center', 2143 y => 'center',
1940 z => 4, 2144 z => 4,
1941 name => 'doc_browser', 2145 name => 'doc_browser',
… …
2030 2234
2031 $load_node->((DC::Pod::find @path)[0]); 2235 $load_node->((DC::Pod::find @path)[0]);
2032 $win->show; 2236 $win->show;
2033 }; 2237 };
2034 2238
2035 $win 2239 $HELP_WINDOW = $win;
2036}
2037
2038sub open_string_query {
2039 my ($title, $cb, $txt, $tooltip) = @_;
2040 my $dialog = new DC::UI::Toplevel
2041 x => "center",
2042 y => "center",
2043 z => 50,
2044 force_w => $WIDTH * 4/5,
2045 title => $title;
2046
2047 $dialog->add (
2048 my $e = new DC::UI::Entry
2049 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2050 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2051 tooltip => $tooltip
2052 );
2053
2054 $e->grab_focus;
2055 $e->set_text ($txt) if $txt;
2056 $dialog->show;
2057} 2240}
2058 2241
2059sub open_quit_dialog { 2242sub open_quit_dialog {
2060 unless ($QUIT_DIALOG) { 2243 unless ($QUIT_DIALOG) {
2061 $QUIT_DIALOG = new DC::UI::Toplevel 2244 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2083 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2266 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2084 ); 2267 );
2085 $hb->add (new DC::UI::Button 2268 $hb->add (new DC::UI::Button
2086 text => "Quit anyway", 2269 text => "Quit anyway",
2087 expand => 1, 2270 expand => 1,
2088 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2271 on_activate => sub {
2272 crash "Quit anyway";
2273 EV::unloop EV::UNLOOP_ALL;
2274 },
2089 ); 2275 );
2090 } 2276 }
2091 2277
2092 $QUIT_DIALOG->show; 2278 $QUIT_DIALOG->show;
2093 $QUIT_DIALOG->grab_focus; 2279 $QUIT_DIALOG->grab_focus;
2280}
2281
2282sub make_menubar {
2283 $MENUFRAME = new DC::UI::Toplevel
2284 border => 0,
2285 force_x => 0,
2286 force_y => 0,
2287 force_w => $::WIDTH,
2288 child => ($MENUBAR = new DC::UI::HBox),
2289 ;
2290
2291 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2292
2293 # 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
2294 make_gauge_window->show;
2295
2296# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2297# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2298
2299 make_playerbook;
2300
2301 $MENUPOPUP = DC::UI::Menu->new (items => [
2302 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2303 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2304 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2305 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2306 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2307 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2308 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2309 ["Quit…" , sub {
2310 if ($CONN) {
2311 open_quit_dialog;
2312 } else {
2313 EV::unloop EV::UNLOOP_ALL;
2314 }
2315 }],
2316 ]);
2317
2318 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2319 tooltip => "Shows the main menu",
2320 on_button_down => sub {
2321 my ($self, $ev) = @_;
2322 local $ev->{x} = 0;
2323 local $ev->{y} = 0;
2324 $MENUPOPUP->popup ($ev);
2325 },
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2329 padding_x => 6,
2330 padding_y => 3,
2331 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2332 template => " Exp: 888,888,888,888 (lvl 188) ",
2333 );
2334
2335 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2336 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2337 . "will automatically pick up items as defined by your item pickup settings "
2338 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2339 . "disable autopickup by disabling this checkbox.",
2340 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2341 on_changed => sub {
2342 my ($self, $value) = @_;
2343 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2344 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2345 $CONN->send_pickup ($CFG->{pickup})
2346 if $CONN;
2347 },
2348 );
2349
2350 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2351 c_rescale => 1,
2352 padding_x => 6,
2353 padding_y => 3,
2354 force_w => $::WIDTH * 0.2,
2355 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2356 template => "two handed weapons 99%",
2357 );
2358
2359 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2360 expand => 1,
2361 align => 1, can_hover => 1, can_events => 1,
2362 text => "Range and Combat Slots",
2363 tooltip => "#stat_ranged",
2364 );
2365
2366 $MENUFRAME->show;
2367}
2368
2369sub open_string_query {
2370 my ($title, $cb, $txt, $tooltip) = @_;
2371 my $dialog = new DC::UI::Toplevel
2372 x => "center",
2373 y => "center",
2374 z => 50,
2375 force_w => $WIDTH * 4/5,
2376 title => $title;
2377
2378 $dialog->add (
2379 my $e = new DC::UI::Entry
2380 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2381 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2382 tooltip => $tooltip
2383 );
2384
2385 $e->grab_focus;
2386 $e->set_text ($txt) if $txt;
2387 $dialog->show;
2094} 2388}
2095 2389
2096sub show_tip_of_the_day { 2390sub show_tip_of_the_day {
2097 # find all tips 2391 # find all tips
2098 my @tod = DC::Pod::find tip_of_the_day => "*"; 2392 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2146 $dialog->show; 2440 $dialog->show;
2147 }; 2441 };
2148} 2442}
2149 2443
2150sub sdl_init { 2444sub sdl_init {
2151 DC::SDL_Init 2445 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2152 and die "SDL::Init failed!\n"; 2446 and die "SDL::Init failed!\n";
2153} 2447}
2154 2448
2155sub video_init { 2449sub video_init {
2450 DC::set_theme $CFG->{uitheme};
2451
2452 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2453 $SDL_REINIT = 0;
2454
2455 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2456 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2457 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2458 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2459
2460 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2461
2156 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2462 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2463 $CFG->{sdl_mode} = 0; # lowest resolution by default
2464
2465 # now choose biggest mode <= 1024x768
2466 for (0 .. $#SDL_MODES) {
2467 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2468 $CFG->{sdl_mode} = $_;
2469 }
2470 }
2471 }
2157 2472
2158 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2473 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2159 2474
2160 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2475 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2161 $FULLSCREEN = $CFG->{fullscreen}; 2476 $FULLSCREEN = $CFG->{fullscreen};
2162 $FAST = $CFG->{fast}; 2477 $FAST = $CFG->{fast};
2163 2478
2479 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2164 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2480 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2481 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2165 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2482 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2166 2483
2167 $SDL_ACTIVE = 1; 2484 $SDL_ACTIVE = 1;
2168 $LAST_REFRESH = time - 0.01; 2485 $LAST_REFRESH = time - 0.01;
2169 2486
… …
2195 2512
2196 $DEBUG_STATUS = new DC::UI::Label 2513 $DEBUG_STATUS = new DC::UI::Label
2197 padding => 0, 2514 padding => 0,
2198 z => 100, 2515 z => 100,
2199 force_x => "max", 2516 force_x => "max",
2200 force_y => 0; 2517 force_y => 20;
2201 $DEBUG_STATUS->show; 2518 $DEBUG_STATUS->show;
2202 2519
2203 $STATUSBOX = new DC::UI::Statusbox; 2520 $STATUSBOX = new DC::UI::Statusbox;
2204 2521
2205 $MODBOX = new DC::UI::Label 2522 $MODBOX = new DC::UI::Label
… …
2216 2533
2217 (new DC::UI::Frame 2534 (new DC::UI::Frame
2218 bg => [0, 0, 0, 0.4], 2535 bg => [0, 0, 0, 0.4],
2219 force_x => 0, 2536 force_x => 0,
2220 force_y => "max", 2537 force_y => "max",
2221 child => (my $LR = new DC::UI::VBox), 2538 child => (my $LL = new DC::UI::VBox),
2222 )->show; 2539 )->show;
2223 2540
2224 $LR->add ($STATUSBOX); 2541 $LL->add ($STATUSBOX);
2225 $LR->add ($MODBOX); 2542 $LL->add ($MODBOX);
2226 $LR->add (new DC::UI::Label 2543 $LL->add (new DC::UI::Label
2227 align => 0, 2544 align => 0,
2228 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2545 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2229 fontsize => 0.5, 2546 fontsize => 0.5,
2230 fg => [1, 1, 0, 0.7], 2547 fg => [1, 1, 0, 0.7],
2231 ); 2548 );
2232 2549
2233 DC::UI::Toplevel->new ( 2550 DC::UI::Toplevel->new (
2234 title => "Minimap", 2551 title => "Minimap",
2235 name => "mapmap", 2552 name => "mapmap",
2236 x => 0, 2553 x => 0,
2237 y => $FONTSIZE + 8, 2554 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2238 border_bg => [1, 1, 1, 192/255], 2555 border_bg => [1, 1, 1, 192/255],
2239 bg => [1, 1, 1, 0], 2556 bg => [1, 1, 1, 0],
2240 child => ($MAPMAP = new DC::MapWidget::MapMap 2557 child => ($MAPMAP = new DC::MapWidget::MapMap
2241 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2558 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2242 ), 2559 ),
2243 )->show; 2560 )->show;
2244 2561
2245 $MAPWIDGET = new DC::MapWidget; 2562 $MAPWIDGET = new DC::MapWidget;
2246 $MAPWIDGET->connect (activate_console => sub { 2563 $MAPWIDGET->connect (activate_console => sub {
… …
2271 $METASERVER = metaserver_dialog; 2588 $METASERVER = metaserver_dialog;
2272 # the name is changed to not conflict with the older name as users could have hidden it 2589 # the name is changed to not conflict with the older name as users could have hidden it
2273 $MESSAGE_WINDOW = new DC::UI::Dockbar 2590 $MESSAGE_WINDOW = new DC::UI::Dockbar
2274 name => "message_window2", 2591 name => "message_window2",
2275 title => 'Messages', 2592 title => 'Messages',
2593 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2276 force_w => $::WIDTH * 0.6, 2594 force_w => $::WIDTH * 0.6,
2277 force_h => $::HEIGHT * 0.25, 2595 force_h => $::HEIGHT * 0.25,
2278 ; 2596 ;
2279 2597
2280 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2598 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2300 . "After pressing the combo the binding will be saved automatically and the " 2618 . "After pressing the combo the binding will be saved automatically and the "
2301 . "binding editor closes"); 2619 . "binding editor closes");
2302 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2620 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2303 "Some debuggin' options. Do not ask."); 2621 "Some debuggin' options. Do not ask.");
2304 2622
2305 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2623 make_help_window;
2624 make_menubar;
2306 2625
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2308 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2309
2310# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2311# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2312
2313 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
2314
2315 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2316 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2317
2318 $BUTTONBAR->add (new DC::UI::Button
2319 text => "Save Config",
2320 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2321 on_activate => sub {
2322 $::CFG->{layout} = DC::UI::get_layout;
2323 DC::write_cfg;
2324 status "Configuration Saved";
2325 0
2326 },
2327 );
2328
2329 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2330 tooltip => "View Documentation");
2331
2332 $BUTTONBAR->add (new DC::UI::Button
2333 text => "Quit",
2334 tooltip => "Terminates the program",
2335 on_activate => sub {
2336 if ($CONN) {
2337 open_quit_dialog;
2338 } else {
2339 EV::unloop EV::UNLOOP_ALL;
2340 }
2341 0
2342 },
2343 );
2344
2345 $BUTTONBAR->show;
2346 $SETUP_DIALOG->show; 2626 $SETUP_DIALOG->show;
2347 $MESSAGE_WINDOW->show; 2627 $MESSAGE_WINDOW->show;
2348 } 2628 }
2349 2629
2630 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2631 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2632
2633 $CAVEAT_LABEL->set_text ("None :)");
2634 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2635 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2636 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2637 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2638
2350 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2639 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2351} 2640}
2352 2641
2353sub video_shutdown { 2642sub video_shutdown {
2354 DC::OpenGL::shutdown; 2643 DC::OpenGL::shutdown;
2644 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2355 2645
2356 undef $SDL_ACTIVE; 2646 undef $SDL_ACTIVE;
2357} 2647}
2358 2648
2359my %animate_object; 2649my %animate_object;
2360my $animate_timer; 2650my $animate_timer;
2361 2651
2362my $fps = 9; 2652my $fps = 9;
2363 2653
2364sub force_refresh { 2654sub force_refresh {
2365 if ($ENV{CFPLUS_DEBUG} & 4) { 2655 if ($DELIANTRA_DEBUG & 4) {
2366 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2656 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2367 debug sprintf "%3.2f", $fps; 2657 debug sprintf "%3.2f", $fps;
2368 } 2658 }
2369 2659
2370 undef $WANT_REFRESH; 2660 undef $WANT_REFRESH;
… …
2378my $want_refresh = EV::prepare_ns \&force_refresh; 2668my $want_refresh = EV::prepare_ns \&force_refresh;
2379 2669
2380my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2670my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2381 $NOW = EV::now; 2671 $NOW = EV::now;
2382 2672
2383 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2673 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2384 for DC::poll_events; 2674 for DC::poll_events;
2385 2675
2386 if (%animate_object) { 2676 if (%animate_object) {
2387 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2677 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2388 $WANT_REFRESH = 1; 2678 $WANT_REFRESH = 1;
… …
2400sub animation_stop { 2690sub animation_stop {
2401 my ($widget) = @_; 2691 my ($widget) = @_;
2402 delete $animate_object{$widget}; 2692 delete $animate_object{$widget};
2403} 2693}
2404 2694
2405%SDL_CB = (
2406 DC::SDL_QUIT => sub { 2695$SDL_CB[DC::SDL_QUIT] = sub {
2696 crash "SDL_QUIT";
2407 EV::unloop EV::UNLOOP_ALL; 2697 EV::unloop EV::UNLOOP_ALL;
2408 }, 2698};
2409 DC::SDL_VIDEORESIZE => sub { 2699$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2410 },
2411 DC::SDL_VIDEOEXPOSE => sub { 2700$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2412 DC::UI::full_refresh; 2701 DC::UI::full_refresh;
2413 }, 2702};
2414 DC::SDL_ACTIVEEVENT => sub { 2703$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2415# not useful, as APPACTIVE includes only iconified state, not unmapped 2704# not useful, as APPACTIVE includes only iconified state, not unmapped
2416# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2705# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2417# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2706# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2418# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2707# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2419# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2708# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2420# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2709# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2421 }, 2710};
2422 DC::SDL_KEYDOWN => sub { 2711$SDL_CB[DC::SDL_KEYDOWN] = sub {
2423 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2712 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2424 # alt-enter 2713 # alt-enter
2714 video_shutdown;
2425 $FULLSCREEN_ENABLE->toggle; 2715 $FULLSCREEN_ENABLE->toggle;
2426 video_shutdown;
2427 video_init; 2716 video_init;
2428 } else { 2717 } else {
2429 &DC::UI::feed_sdl_key_down_event; 2718 &DC::UI::feed_sdl_key_down_event;
2430 } 2719 }
2431 update_modbox; 2720 update_modbox;
2432 }, 2721};
2433 DC::SDL_KEYUP => sub { 2722$SDL_CB[DC::SDL_KEYUP] = sub {
2434 &DC::UI::feed_sdl_key_up_event; 2723 &DC::UI::feed_sdl_key_up_event;
2435 update_modbox; 2724 update_modbox;
2436 }, 2725};
2437 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2726$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2438 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2439 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2728$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2440 DC::SDL_USEREVENT => sub { 2729$SDL_CB[DC::SDL_USEREVENT] = sub {
2441 if ($_[0]{code} == 1) { 2730 if ($_[0]{code} == 1) {
2442 audio_channel_finished $_[0]{data1}; 2731 audio_channel_finished $_[0]{data1};
2443 } elsif ($_[0]{code} == 0) { 2732 } elsif ($_[0]{code} == 0) {
2444 audio_music_finished; 2733 audio_music_finished;
2445 }
2446 }, 2734 }
2447); 2735};
2448 2736
2449############################################################################# 2737#############################################################################
2450 2738
2451$SIG{INT} = $SIG{TERM} = sub { 2739$SIG{INT} = $SIG{TERM} = sub {
2452 EV::unloop; 2740 EV::unloop;
2453 #d# TODO calling exit here hangs the process in some futex 2741 #d# TODO calling exit here hangs the process in some futex
2454}; 2742};
2455 2743
2456{ 2744# due to mac os x + sdl combined braindamage, we need this contortion
2745sub main {
2746 {
2457 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2747 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2458 2748
2459 if (-e "$Deliantra::VARDIR/client.cf") { 2749 if (-e "$Deliantra::VARDIR/client.cf") {
2460 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2750 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2461 } else { 2751 } else {
2462 #TODO: compatibility cruft 2752 #TODO: compatibility cruft
2463 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2753 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2464 print STDERR "INFO: used old configuration file\n"; 2754 print STDERR "INFO: used old configuration file\n";
2465 } 2755 }
2466 2756
2467 DC::DB::Server::run; 2757 DC::DB::Server::run;
2468 2758
2469 if ($CFG->{db_schema} < 1) { 2759 if ($CFG->{db_schema} < 1) {
2470 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2760 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2471 DC::DB::nuke_db; 2761 DC::DB::nuke_db;
2472 $CFG->{db_schema} = 1; 2762 $CFG->{db_schema} = 1;
2473 DC::write_cfg; 2763 DC::write_cfg;
2474 } 2764 }
2475 2765
2476 DC::DB::open_db; 2766 DC::DB::open_db;
2477 2767
2478 DC::UI::set_layout ($::CFG->{layout}); 2768 DC::UI::set_layout ($::CFG->{layout});
2479 2769
2480 my %DEF_CFG = ( 2770 my %DEF_CFG = (
2771 config_autosave => 1,
2481 sdl_mode => 0, 2772 sdl_mode => undef,
2482 fullscreen => 1, 2773 fullscreen => 1,
2483 fast => 0, 2774 fast => 0,
2484 force_opengl11 => undef, 2775 force_opengl11 => undef,
2776 disable_alpha => 0,
2777 smooth_movement => 1,
2778 smooth_transitions => 1,
2485 texture_compression => 1, 2779 texture_compression => 1,
2486 map_scale => 1, 2780 map_scale => 1,
2487 fow_enable => 1, 2781 fow_enable => 1,
2488 fow_intensity => 0, 2782 fow_intensity => 0,
2783 fow_texture => 0,
2489 map_smoothing => 1, 2784 map_smoothing => 1,
2490 gui_fontsize => 1, 2785 gui_fontsize => 1,
2491 log_fontsize => 0.7, 2786 log_fontsize => 0.7,
2492 gauge_fontsize => 1, 2787 gauge_fontsize => 1,
2493 gauge_size => 0.35, 2788 gauge_size => 0.35,
2494 stat_fontsize => 0.7, 2789 stat_fontsize => 0.7,
2495 mapsize => 100, 2790 mapsize => 100,
2496 audio_enable => 1, 2791 audio_enable => 1,
2497 audio_hw_channels => 0, 2792 audio_hw_channels => 0,
2498 audio_hw_frequency => 0, 2793 audio_hw_frequency => 0,
2499 audio_hw_chunksize => 0, 2794 audio_hw_chunksize => 0,
2500 audio_mix_channels => 8, 2795 audio_mix_channels => 8,
2501 effects_enable => 1, 2796 effects_enable => 1,
2502 effects_volume => 1, 2797 effects_volume => 1,
2503 bgm_enable => 1, 2798 bgm_enable => 1,
2504 bgm_volume => 0.5, 2799 bgm_volume => 0.5,
2505 output_rate => "", 2800 output_rate => "",
2506 pickup => 0, 2801 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2507 inv_sort => "mtime", 2802 inv_sort => "mtime",
2508 default => "profile", # default profile 2803 default => "profile", # default profile
2509 show_tips => 1, 2804 show_tips => 1,
2510 logview_max_par => 1000, 2805 logview_max_par => 1000,
2511 shift_fire_stop => 0, 2806 shift_fire_stop => 0,
2807 uitheme => "wood",
2808 map_shift_x => -24, # arbitrary
2809 map_shift_y => +24, # arbitrary
2512 ); 2810 );
2513 2811
2514 while (my ($k, $v) = each %DEF_CFG) { 2812 while (my ($k, $v) = each %DEF_CFG) {
2515 $CFG->{$k} = $v unless exists $CFG->{$k}; 2813 $CFG->{$k} = $v unless exists $CFG->{$k};
2516 } 2814 }
2517 2815
2518 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2816 my @args = @ARGV;
2519 $PROFILE = $CFG->{profile}{default};
2520 2817
2521 # convert old bindings (only default profile matters) 2818 my $profile = 'default';
2522 if (my $bindings = delete $PROFILE->{bindings}) { 2819
2523 while (my ($mod, $syms) = each %$bindings) { 2820 for (my $i = 0; $i < @args; $i++) {
2524 while (my ($sym, $cmds) = each %$syms) { 2821 if ($args[$i] =~ /^--?profile$/) {
2525 push @{ $PROFILE->{macro} }, { 2822 $profile = $args[$i + 1];
2526 accelkey => [$mod*1, $sym*1], 2823 splice @args, $i, 2, ();
2527 action => $cmds,
2528 }; 2824 $i = 0;
2825 } elsif ($args[$i] =~ /^--?h/) {
2826 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2827 exit 0;
2529 } 2828 }
2530 } 2829 }
2531 }
2532 2830
2831 $CFG->{profile}{$profile} ||= {};
2832 $PROFILE = $CFG->{profile}{$profile};
2833 $PROFILE->{host} ||= "gameserver.deliantra.net";
2834
2835 $PROFILE->{host} = $args[0] if @args > 0;
2836 $PROFILE->{user} = $args[1] if @args > 1;
2837 $PROFILE->{password} = $args[2] if @args > 2;
2838
2839 # convert old bindings (only default profile matters)
2840 if (my $bindings = delete $PROFILE->{bindings}) {
2841 while (my ($mod, $syms) = each %$bindings) {
2842 while (my ($sym, $cmds) = each %$syms) {
2843 push @{ $PROFILE->{macro} }, {
2844 accelkey => [$mod*1, $sym*1],
2845 action => $cmds,
2846 };
2847 }
2848 }
2849 }
2850
2533 sdl_init; 2851 sdl_init;
2534 2852
2535 @SDL_MODES = DC::SDL_ListModes 8, 8; 2853 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2536 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2854 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2537 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2538 2855
2539 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2856 {
2540
2541 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2542
2543 {
2544 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2857 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2545 DejaVuSans.ttf 2858 DejaVuSans.ttf
2546 DejaVuSansMono.ttf 2859 DejaVuSansMono.ttf
2547 DejaVuSans-Bold.ttf 2860 DejaVuSans-Bold.ttf
2548 DejaVuSansMono-Bold.ttf 2861 DejaVuSansMono-Bold.ttf
2549 DejaVuSans-Oblique.ttf 2862 DejaVuSans-Oblique.ttf
2550 DejaVuSansMono-Oblique.ttf 2863 DejaVuSansMono-Oblique.ttf
2551 DejaVuSans-BoldOblique.ttf 2864 DejaVuSans-BoldOblique.ttf
2552 DejaVuSansMono-BoldOblique.ttf 2865 DejaVuSansMono-BoldOblique.ttf
2866 mona.ttf
2553 ); 2867 );
2554 2868
2555 DC::add_font $_ for @fonts; 2869 DC::add_font $_ for @fonts;
2556 2870
2557 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2871 $FONT_PROP = new_from_file DC::Font $fonts[0];
2558 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2872 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2559 2873
2560 $FONT_PROP->make_default; 2874 $FONT_PROP->make_default;
2561 2875
2562 DC::pango_init; 2876 DC::pango_init;
2563 } 2877 }
2564 2878
2565# compare mono (ft) vs. rgba (cairo) 2879# compare mono (ft) vs. rgba (cairo)
2566# ft - 1.8s, cairo 3s, even in alpha-only mode 2880# ft - 1.8s, cairo 3s, even in alpha-only mode
2567# for my $rgba (0..1) { 2881# for my $rgba (0..1) {
2568# my $t1 = Time::HiRes::time; 2882# my $t1 = Time::HiRes::time;
… …
2573# } 2887# }
2574# my $t2 = Time::HiRes::time; 2888# my $t2 = Time::HiRes::time;
2575# warn $t2-$t1; 2889# warn $t2-$t1;
2576# } 2890# }
2577 2891
2578 video_init; 2892 video_init;
2579 audio_init; 2893 audio_init;
2580} 2894 }
2581 2895
2582show_tip_of_the_day if $CFG->{show_tips}; 2896 show_tip_of_the_day if $CFG->{show_tips};
2583 2897
2584our $STARTUP_CANCEL = EV::idle sub { 2898 our $STARTUP_CANCEL = EV::idle sub {
2585 undef $::STARTUP_CANCEL; 2899 undef $::STARTUP_CANCEL;
2586 $startup_done->(); 2900 $startup_done->();
2587}; 2901 };
2588 2902
2903 debug_toggle 0;
2904
2589delete $SIG{__DIE__}; 2905 delete $SIG{__DIE__};
2590EV::loop; 2906 EV::loop;
2591 2907
2908 DC::write_cfg if $CFG->{config_autosave};
2909
2592#video_shutdown; 2910 #video_shutdown;
2593#audio_shutdown; 2911 #audio_shutdown;
2912
2594DC::OpenGL::quit; 2913 DC::OpenGL::quit;
2595DC::SDL_Quit; 2914 DC::SDL_Quit;
2596DC::DB::Server::stop; 2915 DC::DB::Server::stop;
2916}
2917
2918DC::SDL_braino; # see sub above
2597 2919
2598=head1 NAME 2920=head1 NAME
2599 2921
2600deliantra - A Deliantra MORPG game client 2922deliantra - A Deliantra MORPG game client
2601 2923
2602=head1 SYNOPSIS 2924=head1 SYNOPSIS
2603 2925
2604Just run it - no commandline arguments are supported. 2926 deliantra [--profile name] [host [user [password]]]
2927 deliantra --help
2605 2928
2606=head1 USAGE 2929=head1 USAGE
2607 2930
2608deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2931The deliantra client utilises OpenGL for all UI elements and the game. It
2609be used in fullscreen mode and interactively. 2932is supposed to be used in fullscreen mode and interactively.
2610 2933
2611=head1 DEBUGGING 2934=head1 DEBUGGING
2612 2935
2613
2614CFPLUS_DEBUG - environment variable 2936DELIANTRA_DEBUG - environment variable
2615 2937
2616 1 draw borders around widgets 2938 1 draw borders around widgets
2617 2 add low-level widget info to tooltips 2939 2 add low-level widget info to tooltips
2618 4 show fps 2940 4 show fps
2619 8 suppress tooltips 2941 8 suppress tooltips
2942 16 show bandwidth downstream
2620 2943
2621=head1 AUTHOR 2944=head1 AUTHOR
2622 2945
2623Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2946Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2624 2947
2625 2948
2626 2949

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines