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.48 by root, Mon Jul 7 08:02:17 2008 UTC vs.
Revision 1.110 by root, Mon Apr 12 02:03:33 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines