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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.113 by root, Thu Apr 22 11:26:51 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines