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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines