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.43 by root, Wed May 21 23:35:55 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
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
95
102use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
103 98
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 99use DC;
100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
110use DC::UI::Inventory; 118use DC::UI::Inventory;
111use DC::UI::SpellList; 119use DC::UI::SpellList;
112use DC::UI::Dockable; 120use DC::UI::Dockable;
113use DC::UI::Dockbar; 121use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 122use DC::UI::ChatView;
116use DC::MessageDistributor; 123use DC::MessageDistributor;
117use DC::Pod; 124use DC::Pod;
118use DC::MapWidget; 125use DC::MapWidget;
119use DC::Macro; 126use DC::Macro;
120 127
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
123 130
124$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
126}; 134};
127 135
128my $MAX_FPS = 60; 136my $MAX_FPS = 60;
129 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 141
132our $LAST_REFRESH; 142our $LAST_REFRESH;
133our $NOW; 143our $NOW;
134 144
135our $CFG; 145our $CFG;
136our $CONN;
137our $PROFILE; # current profile 146our $PROFILE; # current profile
138our $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;
139 149
140our $WANT_REFRESH; 150our $WANT_REFRESH;
141 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
142our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
143our $WIDTH; 157our $WIDTH;
144our $HEIGHT; 158our $HEIGHT;
145our $FULLSCREEN; 159our $FULLSCREEN;
146our $FONTSIZE; 160our $FONTSIZE;
147 161
148our $FONT_PROP; 162our $FONT_PROP;
149our $FONT_FIXED; 163our $FONT_FIXED;
150 164
165our $CONN;
166
151our $MAP; 167our $MAP;
152our $MAPMAP; 168our $MAPMAP;
153our $MAPWIDGET; 169our $MAPWIDGET;
154our $COMPLETER; 170our $COMPLETER;
155our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
156our $METASERVER; 175our $METASERVER;
157our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 177our $QUIT_DIALOG;
159our $HOST_ENTRY; 178our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
186our $FLOORBOX; 205our $FLOORBOX;
187our $GAUGES; 206our $GAUGES;
188our $STATWIDS; 207our $STATWIDS;
189 208
190our $SDL_ACTIVE; 209our $SDL_ACTIVE;
191our %SDL_CB; 210our @SDL_CB;
192 211
193our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 213our $STATUSBOX;
195our $MODBOX; 214our $MODBOX;
196our $DEBUG_STATUS; 215our $DEBUG_STATUS;
197 216
198our $INV; 217our $INV;
199our $INVR; 218our $INVR;
200our $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}
201 260
202############################################################################# 261#############################################################################
203 262
204sub status { 263sub status {
205 $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]);
… …
287 or return; 346 or return;
288 347
289 $meta->{data} 348 $meta->{data}
290 or return; 349 or return;
291 350
292 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
294 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
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 355 &audio_music_push ($face);
297 } 356 }
298 } else { 357 } else {
299 # fetch from database 358 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
303 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;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
306 365
307 audio_sound_push ($face); 366 audio_sound_push ($face);
308 }; 367 };
… …
355 414
356 audio_music_update_volume; 415 audio_music_update_volume;
357 416
358 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
359 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
360 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
361 ? 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
362 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
363 425
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 428
367 my $NOW = time; 429 my $NOW = time;
368 430
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
479 sub audio_tab_update; 541 sub audio_tab_update;
480 audio_tab_update; 542 audio_tab_update;
481} 543}
482 544
483sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
484 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
485 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
486 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
487 554
488 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
725 792
726 $vbox->add (@dialog); 793 $vbox->add (@dialog);
727 $dialog->show; 794 $dialog->show;
728} 795}
729 796
730sub start_game { 797sub dc_connect {
731 status "logging in..."; 798 my ($host, $port) = @_;
732 799
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
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 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 803 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 804 new DC::Protocol
746 host => $host, 805 host => $host,
747 port => $port || 13327, 806 port => $port,
748 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
750 mapw => $mapsize, 809 mapw => $mapw,
751 maph => $mapsize, 810 maph => $maph,
752 811
812 c_version => {
813 client => "deliantra",
753 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
754 818
755 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
756 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
757 map => $MAP, 821 map => $MAP,
758 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
759 query => \&server_query, 823 query => \&server_query,
760 824
761 setup_req => { 825 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 826 smoothing => $CFG->{map_smoothing}*1,
763 }, 827 },
764 };
765 828
766 if ($CONN) { 829 on_connect => sub {
830 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
768 832
769 status "login successful"; 833 status "successfully connected to the server";
834 } else {
835 undef $CONN;
836 status "unable to connect: $!";
837 stop_game();
838 }
839 },
840 ;
841}
842
843sub start_game {
844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
849
850 $LOGIN_BUTTON->set_text ("Logout");
851 $SETUP_DIALOG->hide;
852
853 $MAP = new DC::Map;
854
855 # hack to make SURE we find the IP address all right
856 # can be removed once AnyEvent::DNS is proven stable.
857 if ($host eq "gameserver.deliantra.net") {
858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
859 if ($_[0] ne "80.101.114.108") { # Perl
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
863 status "dns failure, using hardcoded address";
864 $host = "129.13.162.95";
865 }
866 }
867
868 dc_connect $host, $port;
869 };
770 } else { 870 } else {
771 warn $@; 871 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 872 }
775} 873}
776 874
777sub stop_game { 875sub stop_game {
876 crash "stop_game";
877
778 $LOGIN_BUTTON->set_text ("Login / Register"); 878 $LOGIN_BUTTON->set_text ("Login / Register");
779 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 879 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
780 $SETUP_DIALOG->show; 880 $SETUP_DIALOG->show;
781 $PL_WINDOW->hide; 881 $PL_WINDOW->hide;
782 $SPELL_LIST->clear_spells; 882 $SPELL_LIST->clear_spells;
… …
796} 896}
797 897
798sub graphics_setup { 898sub graphics_setup {
799 my $vbox = new DC::UI::VBox; 899 my $vbox = new DC::UI::VBox;
800 900
901 {
902 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
903
801 $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]);
802 905
803 my $row = 0; 906 my $row = 0;
804 907
805 $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");
806 $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,
807 can_events => 1, 910 can_events => 1,
808 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 911 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
809 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
810 my $vidmode_tooltip = 934 my $vidmode_tooltip =
811 "<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). "
812 . "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>.";
813 937
814 $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");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 940
817 $hbox->add (my $mode_slider = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 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 ],
819 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 948 can_events => 1, tooltip => $vidmode_tooltip);
823 949
824 $mode_slider->connect (changed => sub { 950 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 951 my ($self, $value) = @_;
826 952
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 953 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $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]});
829 }); 955 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 956 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 957
832 $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");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 959 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 960 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 961 tooltip => "Bring the client into fullscreen mode.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 962 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
837 ); 963 );
838 964
839 $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");
840 $table->add_at (1, $row++, new DC::UI::CheckBox 966 $table->add_at (1, $row++, new DC::UI::CheckBox
841 state => $CFG->{force_opengl11}, 967 state => $CFG->{force_opengl11},
842 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 "
843 . "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 "
844 . "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. "
845 . "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, "
846 . "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. "
847 . "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>",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 974 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
849 ); 975 );
850 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
851 $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");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 995 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 996 state => $CFG->{texture_compression},
854 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 "
855 . "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). "
856 . "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 "
857 . "forced OpenGL 1.1 mode.", 1000 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1001 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
859 ); 1002 );
860 1003
861 $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");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1005 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{fast}, 1006 state => $CFG->{fast},
864 tooltip => "Lower the visual quality considerably to speed up rendering.", 1007 tooltip => "Lower the visual quality considerably to speed up rendering.",
865 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
866 ); 1009 );
867 1010
868 $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");
869 $table->add_at (1, $row++, new DC::UI::Slider 1012 $table->add_at (1, $row++, new DC::UI::Slider
870 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1013 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
871 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.",
872 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1015 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
873 ); 1016 );
874 1017
875 $table->add_at (1, $row++, new DC::UI::Button 1018 $table->add_at (1, $row++, new DC::UI::Button
876 expand => 1, text => "Apply", 1019 expand => 1, text => "Apply",
877 tooltip => "Apply the video settings above.", 1020 tooltip => "Apply the video settings above.",
878 on_activate => sub { 1021 on_activate => sub {
879 video_shutdown (); 1022 video_shutdown ();
880 video_init (); 1023 video_init ();
1024 0
881 0 1025 }
882 } 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 }
883 ); 1042 );
884 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
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
888 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
889 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 }
890 ); 1059 );
891 1060
892 $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");
893 $table->add_at (1, $row++, new DC::UI::CheckBox 1062 $table->add_at (1, $row++, new DC::UI::CheckBox
894 state => $CFG->{map_smoothing}, 1063 state => $CFG->{map_smoothing},
895 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. "
896 . "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. "
897 . "Changes take effect at next login only.", 1066 . "Changes take effect at next login only.",
898 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1067 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
899 ); 1068 );
900 1069
901 $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");
902 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
903 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
904 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.",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
906 ); 1075 );
907 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
908 $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");
909 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
911 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.",
912 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
913 ); 1097 );
914 1098
915 $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");
916 $table->add_at (1, $row++, new DC::UI::Slider 1100 $table->add_at (1, $row++, new DC::UI::Slider
917 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1101 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
918 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, "
919 . "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.",
920 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 },
921 ); 1105 );
922 1106
923 $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");
924 $table->add_at (1, $row++, new DC::UI::Slider 1108 $table->add_at (1, $row++, new DC::UI::Slider
925 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1109 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
926 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.",
927 on_changed => sub { 1111 on_changed => sub {
928 $CFG->{gauge_fontsize} = $_[1]; 1112 $CFG->{gauge_fontsize} = $_[1];
929 &set_gauge_window_fontsize; 1113 &set_gauge_window_fontsize;
1114 0
930 0 1115 }
931 } 1116 );
932 );
933 1117
934 $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");
935 $table->add_at (1, $row++, new DC::UI::Slider 1119 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{gauge_size}, 0.2, 0.8], 1120 range => [$CFG->{gauge_size}, 0.2, 0.8],
937 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.",
938 on_changed => sub { 1122 on_changed => sub {
939 $CFG->{gauge_size} = $_[1]; 1123 $CFG->{gauge_size} = $_[1];
940 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1124 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1125 0
941 0 1126 }
942 } 1127 );
943 ); 1128 }
944 1129
945 $vbox 1130 $vbox
946} 1131}
947 1132
948our $AUDIO_HW_CHUNKSIZE; 1133our $AUDIO_HW_CHUNKSIZE;
… …
961 1146
962 my $text = !$freq 1147 my $text = !$freq
963 ? "audio is off" 1148 ? "audio is off"
964 : "audio is enabled\n" 1149 : "audio is enabled\n"
965 . "frequency (Hz): $freq\n" 1150 . "frequency (Hz): $freq\n"
966 . "channels: $chans"; 1151 . "channels: $chans\n"
1152 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1153 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
967 1154
968 $AUDIO_INFO->set_text ($text); 1155 $AUDIO_INFO->set_text ($text);
969} 1156}
970 1157
971sub audio_setup { 1158sub audio_setup {
… …
1000 ); 1187 );
1001 1188
1002 $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");
1003 $table->add_at (1, $row, new DC::UI::CheckBox 1190 $table->add_at (1, $row, new DC::UI::CheckBox
1004 expand => 1, state => $CFG->{bgm_enable}, 1191 expand => 1, state => $CFG->{bgm_enable},
1005 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.",
1006 on_changed => sub { 1193 on_changed => sub {
1007 $CFG->{bgm_enable} = $_[1]; 1194 $CFG->{bgm_enable} = $_[1];
1008 $CONN->update_fx_want if $CONN; 1195 $CONN->update_fx_want if $CONN;
1009 audio_music_push; 1196 audio_music_push;
1010 1 1197 1
… …
1111} 1298}
1112 1299
1113sub make_gauge_window { 1300sub make_gauge_window {
1114 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1301 my $gh = int $HEIGHT * $CFG->{gauge_size};
1115 1302
1116 my $win = new DC::UI::Frame ( 1303 $GAUGES->{win} = my $win = new DC::UI::Frame (
1117 force_x => 0, 1304 force_x => 0,
1118 force_y => "max", 1305 force_y => "max",
1119 force_w => $WIDTH, 1306 force_w => $WIDTH,
1120 force_h => $gh, 1307 force_h => $gh,
1121 ); 1308 );
… …
1137 (new DC::UI::Empty expand => 1), 1324 (new DC::UI::Empty expand => 1),
1138 (my $hb = new DC::UI::HBox), 1325 (my $hb = new DC::UI::HBox),
1139 ], 1326 ],
1140 ); 1327 );
1141 1328
1142 $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");
1143 $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");
1144 $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");
1145 $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");
1146
1147 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1148 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1149 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1150 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1151
1152 $GAUGES = {
1153 exp => $exp, prg => $prg, sklprg => $sklprg,
1154 win => $win, range => $rng,
1155 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1156 };
1157 1333
1158 &set_gauge_window_fontsize; 1334 &set_gauge_window_fontsize;
1159 1335
1160 $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
1161} 1354}
1162 1355
1163sub debug_setup { 1356sub debug_setup {
1164 my $table = new DC::UI::Table; 1357 my $table = new DC::UI::Table;
1165 1358
1166 $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");
1167 $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 });
1168 $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");
1169 $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 });
1170 $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");
1171 $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 });
1172 $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");
1173 $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
1174 $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() } );
1175
1176 $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#
1177 1372
1178 $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);
1179 $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);
1180 $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 );
1181 $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);
… …
1502 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]),
1503 ); 1698 );
1504 1699
1505 $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");
1506 $table->add_at (1, 4, new DC::UI::Entry 1701 $table->add_at (1, 4, new DC::UI::Entry
1507 text => $CFG->{profile}{default}{user}, 1702 text => $PROFILE->{user},
1508 tooltip => "The name of your character on the server.", 1703 tooltip => "The name of your character on the server. The name is case-sensitive!",
1509 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1704 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1510 ); 1705 );
1511 1706
1512 $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");
1513 $table->add_at (1, 5, new DC::UI::Entry 1708 $table->add_at (1, 5, new DC::UI::Entry
1514 text => $CFG->{profile}{default}{password}, 1709 text => $PROFILE->{password},
1515 hidden => 1, 1710 hidden => 1,
1516 tooltip => "The password for your character.", 1711 tooltip => "The password for your character.",
1517 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1712 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1518 ); 1713 );
1519 1714
1520 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1715 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1521 expand => 1, 1716 expand => 1,
1522 text => "Login / Register", 1717 text => "Login / Register",
… …
1527 1 1722 1
1528 }, 1723 },
1529 ); 1724 );
1530 1725
1531 $vbox->add (new DC::UI::FancyFrame 1726 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1727 label => "How to Play",
1533 min_h => 200, 1728 min_h => 240,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1729 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 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). "
1536 "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 "
1537 . "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.",
1538 ), 1735 ),
1539 ); 1736 );
1540 1737
1541 $vbox 1738 $vbox
… …
1556 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1753 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1557 1754
1558 $vbox->add ( 1755 $vbox->add (
1559 $HOST_ENTRY = new DC::UI::Entry 1756 $HOST_ENTRY = new DC::UI::Entry
1560 expand => 1, 1757 expand => 1,
1561 text => $CFG->{profile}{default}{host}, 1758 text => $PROFILE->{host},
1562 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>)",
1563 on_changed => sub { 1760 on_changed => sub {
1564 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1565 $CFG->{profile}{default}{host} = $value; 1762 $PROFILE->{host} = $value;
1566 1 1763 1
1567 } 1764 }
1568 ); 1765 );
1569 1766
1570 if (0) { #d# disabled 1767 if (0) { #d# disabled
… …
1613 1810
1614 my $row = 0; 1811 my $row = 0;
1615 1812
1616 $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");
1617 $table->add_at (1, $row++, new DC::UI::CheckBox 1814 $table->add_at (1, $row++, new DC::UI::CheckBox
1815 c_colspan => 2,
1618 state => $CFG->{show_tips}, 1816 state => $CFG->{show_tips},
1619 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?",
1620 on_changed => sub { 1818 on_changed => sub {
1621 my ($self, $value) = @_; 1819 my ($self, $value) = @_;
1622 $CFG->{show_tips} = $value; 1820 $CFG->{show_tips} = $value;
… …
1624 } 1822 }
1625 ); 1823 );
1626 1824
1627 $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");
1628 $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,
1629 text => $CFG->{logview_max_par}, 1828 text => $CFG->{logview_max_par},
1630 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 "
1631 . "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 "
1632 . "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.",
1633 on_changed => sub { 1832 on_changed => sub {
… …
1635 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1834 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1636 0 1835 0
1637 }, 1836 },
1638 ); 1837 );
1639 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
1640 $table 1861 $table
1641} 1862}
1642 1863
1643sub autopickup_setup { 1864sub autopickup_setup {
1644 my $r = new DC::UI::ScrolledWindow ( 1865 my $r = new DC::UI::ScrolledWindow (
… …
1650 col_expand => [0, 1, 0, 1], 1871 col_expand => [0, 1, 0, 1],
1651 ); 1872 );
1652 1873
1653 for ( 1874 for (
1654 ["General", 0, 0, 1875 ["General", 0, 0,
1655 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1656 ["Inhibit autopickup" => PICKUP_INHIBIT], 1876# ["Inhibit autopickup" => PICKUP_INHIBIT],
1657 ["Stop before pickup" => PICKUP_STOP], 1877 ["Stop before pickup" => PICKUP_STOP],
1658 ["Debug autopickup" => PICKUP_DEBUG], 1878 ["Debug autopickup" => PICKUP_DEBUG],
1659 ], 1879 ],
1660 ["Weapons", 0, 6, 1880 ["Weapons", 0, 6,
1661 ["All weapons" => PICKUP_ALLWEAPON], 1881 ["All weapons" => PICKUP_ALLWEAPON],
… …
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1907 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1908 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1909 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1910 ["Flesh" => PICKUP_FLESH],
1691 ], 1911 ],
1692 ["Weight/Value ratio", 2, 17] 1912 ["Value/Weight ratio", 2, 17]
1693 ) 1913 )
1694 { 1914 {
1695 my ($title, $x, $y, @bits) = @$_; 1915 my ($title, $x, $y, @bits) = @$_;
1696 $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]);
1697 1917
… …
1709 $::CFG->{pickup} |= $mask; 1929 $::CFG->{pickup} |= $mask;
1710 } else { 1930 } else {
1711 $::CFG->{pickup} &= ~$mask; 1931 $::CFG->{pickup} &= ~$mask;
1712 } 1932 }
1713 1933
1714 $::CONN->send_command ("pickup $::CFG->{pickup}") 1934 $::CONN->send_pickup ($::CFG->{pickup})
1715 if defined $::CONN; 1935 if defined $::CONN;
1716 1936
1717 0 1937 0
1718 }); 1938 });
1719 1939
… …
1722 } 1942 }
1723 1943
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1944 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1945 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 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).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1948 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1949 on_changed => sub {
1729 my ($slider, $value) = @_; 1950 my ($slider, $value) = @_;
1730 1951
1731 $::CFG->{pickup} &= ~0xF; 1952 $::CFG->{pickup} &= ~0xF;
… …
1735 }); 1956 });
1736 1957
1737 $table->add_at (3, 18, new DC::UI::Button 1958 $table->add_at (3, 18, new DC::UI::Button
1738 text => "set", 1959 text => "set",
1739 on_activate => sub { 1960 on_activate => sub {
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1961 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1962 if defined $::CONN;
1742 0 1963 0
1743 }); 1964 });
1744 1965
1745 $r 1966 $r
1746} 1967}
1747 1968
1748my %SORT_ORDER = ( 1969my %SORT_ORDER = (
1749 type => sub { 1970 type => sub {
1971 use sort 'stable';
1750 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1972 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1751 }, 1973 },
1752 mtime => sub { 1974 mtime => sub {
1975 use sort 'stable';
1753 my $NOW = time; 1976 my $NOW = time;
1754 sort { 1977 sort {
1755 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;
1756 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;
1757 1980
1758 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1981 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1759 or $btime <=> $atime 1982 or $btime <=> $atime
1760 or $a->{type} <=> $b->{type} 1983 or $a->{type} <=> $b->{type}
1761 } @_ 1984 } @_
1762 }, 1985 },
1763 weight => sub { sort { 1986 weight => sub {
1987 use sort 'stable';
1988 sort {
1764 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1989 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1765 or $a->{type} <=> $b->{type} 1990 or $a->{type} <=> $b->{type}
1766 } @_ }, 1991 } @_
1992 },
1767); 1993);
1768 1994
1769sub inventory_widget { 1995sub inventory_widget {
1770 my $hb = new DC::UI::HBox homogeneous => 1; 1996 my $hb = new DC::UI::HBox homogeneous => 1;
1771 1997
… …
1787 $::CFG->{inv_sort} = $_[1]; 2013 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 2014 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 2015 },
1790 ); 2016 );
1791 $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);
1792 #TODO# update to weigh/maxweight 2018 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 2019 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 2020
1795 $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);
1796 $sw1->add ($INV = new DC::UI::Inventory); 2022 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2023 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1858 $PL_NOTEBOOK->set_current_page ($widget); 2084 $PL_NOTEBOOK->set_current_page ($widget);
1859 $PL_WINDOW->show; 2085 $PL_WINDOW->show;
1860 } 2086 }
1861} 2087}
1862 2088
1863sub player_window { 2089sub make_playerbook {
1864 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2090 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1865 x => "center", 2091 x => "center",
1866 y => "center", 2092 y => "center",
1867 force_w => $WIDTH * 9/10, 2093 force_w => $WIDTH * 9/10,
1868 force_h => $HEIGHT * 9/10, 2094 force_h => $HEIGHT * 9/10,
… …
1902 "License, Author and Source info for media sent by the server."); 2128 "License, Author and Source info for media sent by the server.");
1903 2129
1904 $ntb->set_current_page ($INVENTORY_PAGE); 2130 $ntb->set_current_page ($INVENTORY_PAGE);
1905 2131
1906 $plwin->add ($ntb); 2132 $plwin->add ($ntb);
1907 $plwin
1908} 2133}
1909 2134
1910sub keyboard_setup { 2135sub keyboard_setup {
1911 DC::Macro::keyboard_setup 2136 DC::Macro::keyboard_setup
1912} 2137}
1913 2138
1914sub help_window { 2139sub make_help_window {
1915 my $win = new DC::UI::Toplevel 2140 my $win = new DC::UI::Toplevel
1916 x => 'center', 2141 x => 'center',
1917 y => 'center', 2142 y => 'center',
1918 z => 4, 2143 z => 4,
1919 name => 'doc_browser', 2144 name => 'doc_browser',
… …
2008 2233
2009 $load_node->((DC::Pod::find @path)[0]); 2234 $load_node->((DC::Pod::find @path)[0]);
2010 $win->show; 2235 $win->show;
2011 }; 2236 };
2012 2237
2013 $win 2238 $HELP_WINDOW = $win;
2014}
2015
2016sub open_string_query {
2017 my ($title, $cb, $txt, $tooltip) = @_;
2018 my $dialog = new DC::UI::Toplevel
2019 x => "center",
2020 y => "center",
2021 z => 50,
2022 force_w => $WIDTH * 4/5,
2023 title => $title;
2024
2025 $dialog->add (
2026 my $e = new DC::UI::Entry
2027 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2028 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2029 tooltip => $tooltip
2030 );
2031
2032 $e->grab_focus;
2033 $e->set_text ($txt) if $txt;
2034 $dialog->show;
2035} 2239}
2036 2240
2037sub open_quit_dialog { 2241sub open_quit_dialog {
2038 unless ($QUIT_DIALOG) { 2242 unless ($QUIT_DIALOG) {
2039 $QUIT_DIALOG = new DC::UI::Toplevel 2243 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2061 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2265 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2062 ); 2266 );
2063 $hb->add (new DC::UI::Button 2267 $hb->add (new DC::UI::Button
2064 text => "Quit anyway", 2268 text => "Quit anyway",
2065 expand => 1, 2269 expand => 1,
2066 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2270 on_activate => sub {
2271 crash "Quit anyway";
2272 EV::unloop EV::UNLOOP_ALL;
2273 },
2067 ); 2274 );
2068 } 2275 }
2069 2276
2070 $QUIT_DIALOG->show; 2277 $QUIT_DIALOG->show;
2071 $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;
2072} 2387}
2073 2388
2074sub show_tip_of_the_day { 2389sub show_tip_of_the_day {
2075 # find all tips 2390 # find all tips
2076 my @tod = DC::Pod::find tip_of_the_day => "*"; 2391 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2124 $dialog->show; 2439 $dialog->show;
2125 }; 2440 };
2126} 2441}
2127 2442
2128sub sdl_init { 2443sub sdl_init {
2129 DC::SDL_Init 2444 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2130 and die "SDL::Init failed!\n"; 2445 and die "SDL::Init failed!\n";
2131} 2446}
2132 2447
2133sub video_init { 2448sub video_init {
2449 DC::set_theme $CFG->{uitheme};
2450
2451 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2452 $SDL_REINIT = 0;
2453
2454 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2455 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2456 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2457 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2458
2459 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2460
2134 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2461 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2462 $CFG->{sdl_mode} = 0; # lowest resolution by default
2463
2464 # now choose biggest mode <= 1024x768
2465 for (0 .. $#SDL_MODES) {
2466 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2467 $CFG->{sdl_mode} = $_;
2468 }
2469 }
2470 }
2135 2471
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2472 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2473
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2474 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2475 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2476 $FAST = $CFG->{fast};
2141 2477
2478 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 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
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2481 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2482
2145 $SDL_ACTIVE = 1; 2483 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2484 $LAST_REFRESH = time - 0.01;
2147 2485
… …
2173 2511
2174 $DEBUG_STATUS = new DC::UI::Label 2512 $DEBUG_STATUS = new DC::UI::Label
2175 padding => 0, 2513 padding => 0,
2176 z => 100, 2514 z => 100,
2177 force_x => "max", 2515 force_x => "max",
2178 force_y => 0; 2516 force_y => 20;
2179 $DEBUG_STATUS->show; 2517 $DEBUG_STATUS->show;
2180 2518
2181 $STATUSBOX = new DC::UI::Statusbox; 2519 $STATUSBOX = new DC::UI::Statusbox;
2182 2520
2183 $MODBOX = new DC::UI::Label 2521 $MODBOX = new DC::UI::Label
… …
2194 2532
2195 (new DC::UI::Frame 2533 (new DC::UI::Frame
2196 bg => [0, 0, 0, 0.4], 2534 bg => [0, 0, 0, 0.4],
2197 force_x => 0, 2535 force_x => 0,
2198 force_y => "max", 2536 force_y => "max",
2199 child => (my $LR = new DC::UI::VBox), 2537 child => (my $LL = new DC::UI::VBox),
2200 )->show; 2538 )->show;
2201 2539
2202 $LR->add ($STATUSBOX); 2540 $LL->add ($STATUSBOX);
2203 $LR->add ($MODBOX); 2541 $LL->add ($MODBOX);
2204 $LR->add (new DC::UI::Label 2542 $LL->add (new DC::UI::Label
2205 align => 0, 2543 align => 0,
2206 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2544 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2207 fontsize => 0.5, 2545 fontsize => 0.5,
2208 fg => [1, 1, 0, 0.7], 2546 fg => [1, 1, 0, 0.7],
2209 ); 2547 );
2210 2548
2211 DC::UI::Toplevel->new ( 2549 DC::UI::Toplevel->new (
2212 title => "Minimap", 2550 title => "Minimap",
2213 name => "mapmap", 2551 name => "mapmap",
2214 x => 0, 2552 x => 0,
2215 y => $FONTSIZE + 8, 2553 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2216 border_bg => [1, 1, 1, 192/255], 2554 border_bg => [1, 1, 1, 192/255],
2217 bg => [1, 1, 1, 0], 2555 bg => [1, 1, 1, 0],
2218 child => ($MAPMAP = new DC::MapWidget::MapMap 2556 child => ($MAPMAP = new DC::MapWidget::MapMap
2219 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.",
2220 ), 2558 ),
2221 )->show; 2559 )->show;
2222 2560
2223 $MAPWIDGET = new DC::MapWidget; 2561 $MAPWIDGET = new DC::MapWidget;
2224 $MAPWIDGET->connect (activate_console => sub { 2562 $MAPWIDGET->connect (activate_console => sub {
… …
2249 $METASERVER = metaserver_dialog; 2587 $METASERVER = metaserver_dialog;
2250 # 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
2251 $MESSAGE_WINDOW = new DC::UI::Dockbar 2589 $MESSAGE_WINDOW = new DC::UI::Dockbar
2252 name => "message_window2", 2590 name => "message_window2",
2253 title => 'Messages', 2591 title => 'Messages',
2592 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2254 force_w => $::WIDTH * 0.6, 2593 force_w => $::WIDTH * 0.6,
2255 force_h => $::HEIGHT * 0.25, 2594 force_h => $::HEIGHT * 0.25,
2256 ; 2595 ;
2257 2596
2258 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2597 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2278 . "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 "
2279 . "binding editor closes"); 2618 . "binding editor closes");
2280 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2619 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2281 "Some debuggin' options. Do not ask."); 2620 "Some debuggin' options. Do not ask.");
2282 2621
2283 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2622 make_help_window;
2623 make_menubar;
2284 2624
2285 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2286 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2287
2288# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2289# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2290
2291 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
2292
2293 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2294 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2295
2296 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Save Config",
2298 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2299 on_activate => sub {
2300 $::CFG->{layout} = DC::UI::get_layout;
2301 DC::write_cfg;
2302 status "Configuration Saved";
2303 0
2304 },
2305 );
2306
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2308 tooltip => "View Documentation");
2309
2310 $BUTTONBAR->add (new DC::UI::Button
2311 text => "Quit",
2312 tooltip => "Terminates the program",
2313 on_activate => sub {
2314 if ($CONN) {
2315 open_quit_dialog;
2316 } else {
2317 EV::unloop EV::UNLOOP_ALL;
2318 }
2319 0
2320 },
2321 );
2322
2323 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2625 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2626 $MESSAGE_WINDOW->show;
2326 } 2627 }
2327 2628
2629 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2630 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2631
2632 $CAVEAT_LABEL->set_text ("None :)");
2633 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2634 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2635 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2636 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2637
2328 $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]);
2329} 2639}
2330 2640
2331sub video_shutdown { 2641sub video_shutdown {
2332 DC::OpenGL::shutdown; 2642 DC::OpenGL::shutdown;
2643 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2644
2334 undef $SDL_ACTIVE; 2645 undef $SDL_ACTIVE;
2335} 2646}
2336 2647
2337my %animate_object; 2648my %animate_object;
2338my $animate_timer; 2649my $animate_timer;
2339 2650
2340my $fps = 9; 2651my $fps = 9;
2341 2652
2342sub force_refresh { 2653sub force_refresh {
2343 if ($ENV{CFPLUS_DEBUG} & 4) { 2654 if ($DELIANTRA_DEBUG & 4) {
2344 $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;
2345 debug sprintf "%3.2f", $fps; 2656 debug sprintf "%3.2f", $fps;
2346 } 2657 }
2347 2658
2348 undef $WANT_REFRESH; 2659 undef $WANT_REFRESH;
… …
2356my $want_refresh = EV::prepare_ns \&force_refresh; 2667my $want_refresh = EV::prepare_ns \&force_refresh;
2357 2668
2358my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2669my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2359 $NOW = EV::now; 2670 $NOW = EV::now;
2360 2671
2361 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2672 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2362 for DC::poll_events; 2673 for DC::poll_events;
2363 2674
2364 if (%animate_object) { 2675 if (%animate_object) {
2365 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2676 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2366 $WANT_REFRESH = 1; 2677 $WANT_REFRESH = 1;
… …
2378sub animation_stop { 2689sub animation_stop {
2379 my ($widget) = @_; 2690 my ($widget) = @_;
2380 delete $animate_object{$widget}; 2691 delete $animate_object{$widget};
2381} 2692}
2382 2693
2383%SDL_CB = (
2384 DC::SDL_QUIT => sub { 2694$SDL_CB[DC::SDL_QUIT] = sub {
2695 crash "SDL_QUIT";
2385 EV::unloop EV::UNLOOP_ALL; 2696 EV::unloop EV::UNLOOP_ALL;
2386 }, 2697};
2387 DC::SDL_VIDEORESIZE => sub { 2698$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2388 },
2389 DC::SDL_VIDEOEXPOSE => sub { 2699$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2390 DC::UI::full_refresh; 2700 DC::UI::full_refresh;
2391 }, 2701};
2392 DC::SDL_ACTIVEEVENT => sub { 2702$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2393# not useful, as APPACTIVE includes only iconified state, not unmapped 2703# not useful, as APPACTIVE includes only iconified state, not unmapped
2394# 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#
2395# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2705# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2396# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2706# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2397# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2707# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2708# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2709};
2400 DC::SDL_KEYDOWN => sub { 2710$SDL_CB[DC::SDL_KEYDOWN] = sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2711 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2712 # alt-enter
2713 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2714 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2715 video_init;
2406 } else { 2716 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2717 &DC::UI::feed_sdl_key_down_event;
2408 } 2718 }
2409 update_modbox; 2719 update_modbox;
2410 }, 2720};
2411 DC::SDL_KEYUP => sub { 2721$SDL_CB[DC::SDL_KEYUP] = sub {
2412 &DC::UI::feed_sdl_key_up_event; 2722 &DC::UI::feed_sdl_key_up_event;
2413 update_modbox; 2723 update_modbox;
2414 }, 2724};
2415 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2725$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2416 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2726$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2417 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2418 DC::SDL_USEREVENT => sub { 2728$SDL_CB[DC::SDL_USEREVENT] = sub {
2419 if ($_[0]{code} == 1) { 2729 if ($_[0]{code} == 1) {
2420 audio_channel_finished $_[0]{data1}; 2730 audio_channel_finished $_[0]{data1};
2421 } elsif ($_[0]{code} == 0) { 2731 } elsif ($_[0]{code} == 0) {
2422 audio_music_finished; 2732 audio_music_finished;
2423 }
2424 }, 2733 }
2425); 2734};
2426 2735
2427############################################################################# 2736#############################################################################
2428 2737
2429$SIG{INT} = $SIG{TERM} = sub { 2738$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2739 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2740 #d# TODO calling exit here hangs the process in some futex
2432}; 2741};
2433 2742
2434{ 2743# due to mac os x + sdl combined braindamage, we need this contortion
2744sub main {
2745 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2746 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2747
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2748 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2749 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2750 } else {
2440 #TODO: compatibility cruft 2751 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2752 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2753 print STDERR "INFO: used old configuration file\n";
2443 } 2754 }
2444 2755
2445 DC::DB::Server::run; 2756 DC::DB::Server::run;
2446 2757
2447 if ($CFG->{db_schema} < 1) { 2758 if ($CFG->{db_schema} < 1) {
2448 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";
2449 DC::DB::nuke_db; 2760 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2761 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2762 DC::write_cfg;
2452 } 2763 }
2453 2764
2454 DC::DB::open_db; 2765 DC::DB::open_db;
2455 2766
2456 DC::UI::set_layout ($::CFG->{layout}); 2767 DC::UI::set_layout ($::CFG->{layout});
2457 2768
2458 my %DEF_CFG = ( 2769 my %DEF_CFG = (
2770 config_autosave => 1,
2459 sdl_mode => 0, 2771 sdl_mode => undef,
2460 fullscreen => 1, 2772 fullscreen => 1,
2461 fast => 0, 2773 fast => 0,
2462 force_opengl11 => undef, 2774 force_opengl11 => undef,
2775 disable_alpha => 0,
2776 smooth_movement => 1,
2777 smooth_transitions => 1,
2463 texture_compression => 1, 2778 texture_compression => 1,
2464 map_scale => 1, 2779 map_scale => 1,
2465 fow_enable => 1, 2780 fow_enable => 1,
2466 fow_intensity => 0, 2781 fow_intensity => 0,
2782 fow_texture => 0,
2467 map_smoothing => 1, 2783 map_smoothing => 1,
2468 gui_fontsize => 1, 2784 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2785 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2786 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2787 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2788 stat_fontsize => 0.7,
2473 mapsize => 100, 2789 mapsize => 100,
2474 audio_enable => 1, 2790 audio_enable => 1,
2475 audio_hw_channels => 0, 2791 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2792 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2793 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2794 audio_mix_channels => 8,
2479 effects_enable => 1, 2795 effects_enable => 1,
2480 effects_volume => 1, 2796 effects_volume => 1,
2481 bgm_enable => 1, 2797 bgm_enable => 1,
2482 bgm_volume => 0.5, 2798 bgm_volume => 0.5,
2483 output_rate => "", 2799 output_rate => "",
2484 pickup => 0, 2800 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2485 inv_sort => "mtime", 2801 inv_sort => "mtime",
2486 default => "profile", # default profile 2802 default => "profile", # default profile
2487 show_tips => 1, 2803 show_tips => 1,
2488 logview_max_par => 1000, 2804 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2805 shift_fire_stop => 0,
2806 uitheme => "wood",
2807 map_shift_x => -24, # arbitrary
2808 map_shift_y => +24, # arbitrary
2490 ); 2809 );
2491 2810
2492 while (my ($k, $v) = each %DEF_CFG) { 2811 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2812 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2813 }
2495 2814
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2815 my @args = @ARGV;
2497 $PROFILE = $CFG->{profile}{default};
2498 2816
2499 # convert old bindings (only default profile matters) 2817 my $profile = 'default';
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2818
2501 while (my ($mod, $syms) = each %$bindings) { 2819 for (my $i = 0; $i < @args; $i++) {
2502 while (my ($sym, $cmds) = each %$syms) { 2820 if ($args[$i] =~ /^--?profile$/) {
2503 push @{ $PROFILE->{macro} }, { 2821 $profile = $args[$i + 1];
2504 accelkey => [$mod*1, $sym*1], 2822 splice @args, $i, 2, ();
2505 action => $cmds,
2506 }; 2823 $i = 0;
2824 } elsif ($args[$i] =~ /^--?h/) {
2825 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2826 exit 0;
2507 } 2827 }
2508 } 2828 }
2509 }
2510 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
2511 sdl_init; 2850 sdl_init;
2512 2851
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2852 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2853 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2516 2854
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2855 {
2518
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2520
2521 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2856 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2857 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2858 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2859 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2860 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2861 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2862 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2863 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2864 DejaVuSansMono-BoldOblique.ttf
2865 mona.ttf
2531 ); 2866 );
2532 2867
2533 DC::add_font $_ for @fonts; 2868 DC::add_font $_ for @fonts;
2534 2869
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2870 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2871 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2872
2538 $FONT_PROP->make_default; 2873 $FONT_PROP->make_default;
2539 2874
2540 DC::pango_init; 2875 DC::pango_init;
2541 } 2876 }
2542 2877
2543# compare mono (ft) vs. rgba (cairo) 2878# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2879# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2880# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2881# my $t1 = Time::HiRes::time;
… …
2551# } 2886# }
2552# my $t2 = Time::HiRes::time; 2887# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2888# warn $t2-$t1;
2554# } 2889# }
2555 2890
2556 video_init; 2891 video_init;
2557 audio_init; 2892 audio_init;
2558} 2893 }
2559 2894
2560show_tip_of_the_day if $CFG->{show_tips}; 2895 show_tip_of_the_day if $CFG->{show_tips};
2561 2896
2562our $STARTUP_CANCEL = EV::idle sub { 2897 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2898 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2899 $startup_done->();
2565}; 2900 };
2566 2901
2902 debug_toggle 0;
2903
2567delete $SIG{__DIE__}; 2904 delete $SIG{__DIE__};
2568EV::loop; 2905 EV::loop;
2569 2906
2907 DC::write_cfg if $CFG->{config_autosave};
2908
2570#video_shutdown; 2909 #video_shutdown;
2571#audio_shutdown; 2910 #audio_shutdown;
2911
2572DC::OpenGL::quit; 2912 DC::OpenGL::quit;
2573DC::SDL_Quit; 2913 DC::SDL_Quit;
2574DC::DB::Server::stop; 2914 DC::DB::Server::stop;
2915}
2916
2917DC::SDL_braino; # see sub above
2575 2918
2576=head1 NAME 2919=head1 NAME
2577 2920
2578deliantra - A Deliantra MORPG game client 2921deliantra - A Deliantra MORPG game client
2579 2922
2580=head1 SYNOPSIS 2923=head1 SYNOPSIS
2581 2924
2582Just run it - no commandline arguments are supported. 2925 deliantra [--profile name] [host [user [password]]]
2926 deliantra --help
2583 2927
2584=head1 USAGE 2928=head1 USAGE
2585 2929
2586deliantra 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
2587be used in fullscreen mode and interactively. 2931is supposed to be used in fullscreen mode and interactively.
2588 2932
2589=head1 DEBUGGING 2933=head1 DEBUGGING
2590 2934
2591
2592CFPLUS_DEBUG - environment variable 2935DELIANTRA_DEBUG - environment variable
2593 2936
2594 1 draw borders around widgets 2937 1 draw borders around widgets
2595 2 add low-level widget info to tooltips 2938 2 add low-level widget info to tooltips
2596 4 show fps 2939 4 show fps
2597 8 suppress tooltips 2940 8 suppress tooltips
2941 16 show bandwidth downstream
2598 2942
2599=head1 AUTHOR 2943=head1 AUTHOR
2600 2944
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2945Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2946
2603 2947
2604 2948

Diff Legend

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