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.51 by root, Thu Jul 17 15:23:43 2008 UTC vs.
Revision 1.110 by root, Mon Apr 12 02:03:33 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines