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.22 by root, Sat Dec 29 13:44:31 2007 UTC vs.
Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
86 last; 75 last;
87 } 76 }
88 } 77 }
… …
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::MessageWindow; 121use DC::UI::Dockbar;
114use DC::UI::ChatView; 122use DC::UI::ChatView;
123use DC::MessageDistributor;
115use DC::Pod; 124use DC::Pod;
116use DC::MapWidget; 125use DC::MapWidget;
117use DC::Macro; 126use DC::Macro;
118 127
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
121 130
122$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
123 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
124}; 134};
125 135
126my $MAX_FPS = 60; 136my $MAX_FPS = 60;
127 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
128our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
129 141
130our $LAST_REFRESH; 142our $LAST_REFRESH;
131our $NOW; 143our $NOW;
132 144
133our $CFG; 145our $CFG;
134our $CONN;
135our $PROFILE; # current profile 146our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 148
138our $WANT_REFRESH; 149our $WANT_REFRESH;
139 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
140our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
141our $WIDTH; 156our $WIDTH;
142our $HEIGHT; 157our $HEIGHT;
143our $FULLSCREEN; 158our $FULLSCREEN;
144our $FONTSIZE; 159our $FONTSIZE;
145 160
146our $FONT_PROP; 161our $FONT_PROP;
147our $FONT_FIXED; 162our $FONT_FIXED;
148 163
164our $CONN;
165
149our $MAP; 166our $MAP;
150our $MAPMAP; 167our $MAPMAP;
151our $MAPWIDGET; 168our $MAPWIDGET;
152our $COMPLETER; 169our $COMPLETER;
153our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
154our $METASERVER; 174our $METASERVER;
155our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
156our $QUIT_DIALOG; 176our $QUIT_DIALOG;
157our $HOST_ENTRY; 177our $HOST_ENTRY;
158our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
178our $SPELL_PAGE; 198our $SPELL_PAGE;
179our $SPELL_LIST; 199our $SPELL_LIST;
180 200
181our $HELP_WINDOW; 201our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 202our $MESSAGE_WINDOW;
203our $MESSAGE_DIST;
183our $FLOORBOX; 204our $FLOORBOX;
184our $GAUGES; 205our $GAUGES;
185our $STATWIDS; 206our $STATWIDS;
186 207
187our $SDL_ACTIVE; 208our $SDL_ACTIVE;
188our %SDL_CB; 209our @SDL_CB;
189 210
190our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 212our $STATUSBOX;
213our $MODBOX;
192our $DEBUG_STATUS; 214our $DEBUG_STATUS;
193 215
194our $INV; 216our $INV;
195our $INVR; 217our $INVR;
196our $INVR_HB; 218our $INVR_HB;
197 219
198############################################################################# 220#############################################################################
199 221
222# write a crash message blockingly to the socket, if possible
223# this is a bit too complicated for my tastes, but it was easy.
224*crash = sub($;$) {
225 my ($msg, $backtrace) = @_;
226
227 warn $msg;
228
229 return unless $CONN;
230
231 my $fh = $CONN->{fh}
232 or return;
233
234 my $buf = delete $CONN->{wbuf};
235
236 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
237
238 AnyEvent::Util::fh_nonblocking $fh, 0;
239 syswrite $fh, $buf;
240 AnyEvent::Util::fh_nonblocking $fh, 1;
241
242 $msg =~ s/\s+$//;
243
244 # backtrace as second step, in case it crashes, too
245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
246 if $backtrace;
247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
259
260#############################################################################
261
200sub status { 262sub status {
201 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
202} 264}
203 265
204sub debug { 266sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 267 $DEBUG_STATUS->set_text ($_[0]);
206} 268}
207 269
208sub message { 270sub message {
209 $MESSAGE_WINDOW->message (@_); 271 $MESSAGE_DIST->message (@_);
272}
273
274sub update_modbox {
275 my $mod = DC::SDL_GetModState;
276
277 my $markup;
278
279 $markup .= $mod & DC::KMOD_CTRL
280 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
281 : "[<span foreground='#888'> once </span>]";
282
283 $markup .= $mod & DC::KMOD_SHIFT
284 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
285 : "[<span foreground='#888'>move</span>]";
286
287 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
288 ? "[ALT]"
289 : "[<span foreground='#888'>alt</span>]";
290
291 $markup .= $mod & DC::KMOD_NUM
292 ? "[NUM]"
293 : "[<span foreground='#888'>num</span>]";
294
295 # <tt> around next statement works around some bug that keeps the
296 # "font =>" from being used on windows
297 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 298}
211 299
212############################################################################# 300#############################################################################
213#TODO: maybe move into own audio module... 301#TODO: maybe move into own audio module...
214 302
… …
257 or return; 345 or return;
258 346
259 $meta->{data} 347 $meta->{data}
260 or return; 348 or return;
261 349
262 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
263 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
264 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
265 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
266 &audio_music_push ($face); 354 &audio_music_push ($face);
267 } 355 }
268 } else { 356 } else {
269 # fetch from database 357 # fetch from database
270 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
271 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
272 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
273 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
274 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
275 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
276 364
277 audio_sound_push ($face); 365 audio_sound_push ($face);
278 }; 366 };
… …
325 413
326 audio_music_update_volume; 414 audio_music_update_volume;
327 415
328 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
329 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
330 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
331 ? new_from_file DC::RW $meta->{path} 422 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
332 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
333 424
334 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
335 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
336 427
337 my $NOW = time; 428 my $NOW = time;
338 429
339 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
340 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
449 sub audio_tab_update; 540 sub audio_tab_update;
450 audio_tab_update; 541 audio_tab_update;
451} 542}
452 543
453sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
454 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
455 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
456 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
457 553
458 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
634 # right: accept 730 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 731 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 732 text => "Accept",
637 on_activate => sub { 733 on_activate => sub {
638 $conn->send ("reply n"); 734 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 735 destroy_query_dialog $conn;
641 0 736 0
642 }, 737 },
643 ); 738 );
644 739
… …
696 791
697 $vbox->add (@dialog); 792 $vbox->add (@dialog);
698 $dialog->show; 793 $dialog->show;
699} 794}
700 795
701sub start_game { 796sub dc_connect {
702 status "logging in..."; 797 my ($host, $port) = @_;
703 798
704 $LOGIN_BUTTON->set_text ("Logout");
705 $SETUP_DIALOG->hide;
706
707 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 799 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
800 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
708 801
709 my ($host, $port) = split /:/, $PROFILE->{host};
710
711 $MAP = new DC::Map;
712
713 $CONN = eval { 802 $CONN =
714 new DC::Protocol 803 new DC::Protocol
715 host => $host, 804 host => $host,
716 port => $port || 13327, 805 port => $port,
717 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
718 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
719 mapw => $mapsize, 808 mapw => $mapw,
720 maph => $mapsize, 809 maph => $maph,
721 810
722 client => "cfplus $DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
723 812
724 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
725 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
726 map => $MAP, 815 map => $MAP,
727 mapmap => $MAPMAP, 816 mapmap => $MAPMAP,
728 query => \&server_query, 817 query => \&server_query,
729 818
730 setup_req => { 819 setup_req => {
731 smoothing => $CFG->{map_smoothing}*1, 820 smoothing => $CFG->{map_smoothing}*1,
732 }, 821 },
733 };
734 822
735 if ($CONN) { 823 on_connect => sub {
824 if ($_[0]) {
736 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
737 826
738 status "login successful"; 827 status "successfully connected to the server";
828 } else {
829 undef $CONN;
830 status "unable to connect: $!";
831 stop_game();
832 }
833 },
834 ;
835}
836
837sub start_game {
838 status "logging in...";
839
840 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
841 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
842 or return status "$server: unable to parse server address, try an empty field.";
843
844 $LOGIN_BUTTON->set_text ("Logout");
845 $SETUP_DIALOG->hide;
846
847 $MAP = new DC::Map;
848
849 # hack to make SURE we find the IP address all right
850 # can be removed once AnyEvent::DNS is proven stable.
851 if ($host eq "gameserver.deliantra.net") {
852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
853 if ($_[0] ne "80.101.114.108") { # Perl
854 status "dns failure, trying differently";
855 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
856 unless (defined $host) {
857 status "dns failure, using hardcoded address";
858 $host = "129.13.162.95";
859 }
860 }
861
862 dc_connect $host, $port;
863 };
739 } else { 864 } else {
740 status "unable to connect"; 865 dc_connect $host, $port;
741 stop_game();
742 } 866 }
743} 867}
744 868
745sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
746 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
747 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
748 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
749 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
750 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
… …
764} 890}
765 891
766sub graphics_setup { 892sub graphics_setup {
767 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
768 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
769 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 898 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
770 899
771 my $row = 0; 900 my $row = 0;
772 901
773 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
774 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 903 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
775 can_events => 1, 904 can_events => 1,
776 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
777 906
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
908 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
909 can_events => 1,
910 tooltip => "This field shows any known issues with your config or driver, such as "
911 . "a non-accelerated display format. You can try to work around these issues "
912 . "by selecting a different video mode, changing the settings below or "
913 . "by installing the right driver for your graphics card.");
914
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
916 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
917 value => $CFG->{uitheme},
918 options => [
919 [wood => "Wood (the default)"],
920 [plain => "Plain (very)"],
921 [blue => "Blue (dark)"],
922 [metal => "Metal (light)"],
923 ],
924 tooltip => "Choose the User Interface theme that you like most :)",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
926 );
927
778 my $vidmode_tooltip = 928 my $vidmode_tooltip =
779 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 929 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
780 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 930 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
781 931
782 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
783 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
784 934
785 $hbox->add (my $mode_slider = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
786 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 936 c_rescale => 1,
937 force_w => $WIDTH * 0.1, expand => 1,
938 range => [ ($CFG->{sdl_mode}) x 3 ],
787 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
788 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
789 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
790 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
791 943
792 $mode_slider->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
793 my ($self, $value) = @_; 945 my ($self, $value) = @_;
794 946
795 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
796 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 948 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
797 }); 949 });
798 $mode_slider->emit (changed => $mode_slider->{range}[0]); 950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
799 951
800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
801 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
802 state => $CFG->{fullscreen}, 954 state => $CFG->{fullscreen},
803 tooltip => "Bring the client into fullscreen mode.", 955 tooltip => "Bring the client into fullscreen mode.",
804 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
805 ); 957 );
806 958
807 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
808 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
809 state => $CFG->{force_opengl11}, 961 state => $CFG->{force_opengl11},
810 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 962 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
811 . "higher memory usage and slower performance. It will, however, help tremendously on " 963 . "higher memory usage and slower performance. It will, however, help tremendously on "
812 . "cards that claim to support a feature but fall back to software rendering. " 964 . "cards that claim to support a feature but fall back to software rendering. "
813 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 965 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
814 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 966 . "but cards and drivers from other vendors (ATI) are often just as bad. "
815 . "experience extremely low framerates and your card should do better, try this option.</b>", 967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
816 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
817 ); 969 );
818 970
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
972 $table->add_at (1, $row++, new DC::UI::CheckBox
973 state => $CFG->{disable_alpha},
974 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
975 . "by disabling a number of textures and transparency effects. Normally, these "
976 . "effects do not cost a lot of resources, but some graphics cards might fall "
977 . "back to extremely slow rendering if this is enabled. If disabling this option "
978 . "noticably improves the framerate of the client please report this! "
979 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
980 on_changed => sub {
981 my ($self, $value) = @_;
982 $CFG->{disable_alpha} = $value;
983 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
984 0
985 }
986 );
987
819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
820 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
821 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
822 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 991 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
823 . "will save a lot of memory and increase performance. The compression algorithm " 992 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
824 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 993 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
825 . "forced OpenGL 1.1 mode.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
826 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
827 ); 996 );
828 997
829 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 998 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
830 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
831 state => $CFG->{fast}, 1000 state => $CFG->{fast},
832 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
833 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
834 ); 1003 );
835 1004
836 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
837 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
838 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
839 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1008 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
840 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
841 ); 1010 );
842 1011
843 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
844 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
845 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
846 on_activate => sub { 1015 on_activate => sub {
847 video_shutdown (); 1016 video_shutdown ();
848 video_init (); 1017 video_init ();
1018 0
849 0 1019 }
850 } 1020 );
1021 }
1022
1023 {
1024 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1025
1026 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1027
1028 my $row = 0;
1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1030 $table->add_at (1, $row++, new DC::UI::CheckBox
1031 state => $CFG->{smooth_movement},
1032 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1033 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1034 . "then disable this option. Changes take effect immdiately.",
1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
851 ); 1036 );
852 1037
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{smooth_transitions},
1041 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1042 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1043 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1044 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1045 );
1046
1047
853 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
854 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
855 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
856 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
858 ); 1053 );
859 1054
860 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
861 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
862 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
863 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1058 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
864 . "This increases load on the graphics subsystem and works only with TRT servers. " 1059 . "This increases load on the graphics subsystem and works only with TRT servers. "
865 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
866 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
867 ); 1062 );
868 1063
869 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
870 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
871 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
872 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1067 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
873 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
874 ); 1069 );
875 1070
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1072 $table->add_at (1, $row++, new DC::UI::ImageButton
1073 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1074 bg => [0.3, 0.3, 0.2],
1075 force_w => 64,
1076 force_h => 64,
1077 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.",
1078 on_activate => sub {
1079 my ($self) = @_;
1080 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1081 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1082 $MAPWIDGET->update;
1083 }
1084 );
1085
876 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
877 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
878 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
879 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1089 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
880 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
881 ); 1091 );
882 1092
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
884 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
886 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1096 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
887 . "but you still need to press apply to correctly re-layout the widget.", 1097 . "but you still need to press apply to correctly re-layout the widget.",
888 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
889 ); 1099 );
890 1100
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1101 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
892 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
894 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1104 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
895 on_changed => sub { 1105 on_changed => sub {
896 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
897 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
898 0 1109 }
899 } 1110 );
900 );
901 1111
902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
903 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
904 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
905 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1115 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
906 on_changed => sub { 1116 on_changed => sub {
907 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
908 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
909 0 1120 }
910 } 1121 );
911 ); 1122 }
912 1123
913 $vbox 1124 $vbox
914} 1125}
915 1126
916our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
… …
929 1140
930 my $text = !$freq 1141 my $text = !$freq
931 ? "audio is off" 1142 ? "audio is off"
932 : "audio is enabled\n" 1143 : "audio is enabled\n"
933 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
934 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
935 1148
936 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
937} 1150}
938 1151
939sub audio_setup { 1152sub audio_setup {
… …
1079} 1292}
1080 1293
1081sub make_gauge_window { 1294sub make_gauge_window {
1082 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1083 1296
1084 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1085 force_x => 0, 1298 force_x => 0,
1086 force_y => "max", 1299 force_y => "max",
1087 force_w => $WIDTH, 1300 force_w => $WIDTH,
1088 force_h => $gh, 1301 force_h => $gh,
1089 ); 1302 );
… …
1105 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1106 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1107 ], 1320 ],
1108 ); 1321 );
1109 1322
1110 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1323 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1111 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1324 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1112 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1325 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1113 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1326 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1114
1115 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1116 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1117 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1119
1120 $GAUGES = {
1121 exp => $exp, prg => $prg, sklprg => $sklprg,
1122 win => $win, range => $rng,
1123 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1124 };
1125 1327
1126 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1127 1329
1128 $win 1330 $win
1129} 1331}
… …
1470 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1672 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1471 ); 1673 );
1472 1674
1473 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1474 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1475 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1476 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1477 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1478 ); 1680 );
1479 1681
1480 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1481 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1482 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1483 hidden => 1, 1685 hidden => 1,
1484 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1485 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1486 ); 1688 );
1487 1689
1488 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1489 expand => 1, 1691 expand => 1,
1490 text => "Login / Register", 1692 text => "Login / Register",
… …
1495 1 1697 1
1496 }, 1698 },
1497 ); 1699 );
1498 1700
1499 $vbox->add (new DC::UI::FancyFrame 1701 $vbox->add (new DC::UI::FancyFrame
1500 label => "Registering", 1702 label => "How to Play",
1501 min_h => 200, 1703 min_h => 240,
1502 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1704 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1503 markup => 1705 markup =>
1706 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1707 . "Then register a new account (or use an existing one if you have one). "
1504 "To register a new account, choose a username that hasn't been taken yet and " 1708 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1505 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1709 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1506 ), 1710 ),
1507 ); 1711 );
1508 1712
1509 $vbox 1713 $vbox
… …
1524 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1525 1729
1526 $vbox->add ( 1730 $vbox->add (
1527 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1528 expand => 1, 1732 expand => 1,
1529 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1530 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1734 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1531 on_changed => sub { 1735 on_changed => sub {
1532 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1533 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1534 1 1738 1
1535 } 1739 }
1536 ); 1740 );
1537 1741
1538 if (0) { #d# disabled 1742 if (0) { #d# disabled
1539 $vbox->add (new DC::UI::Button 1743 $vbox->add (new DC::UI::Button
1540 expand => 1, 1744 expand => 1,
1541 text => "Server List", 1745 text => "Server List",
1542 other => $METASERVER, 1746 other => $METASERVER,
1543 tooltip => "Show a list of available crossfire servers", 1747 tooltip => "Show a list of available Deliantra servers",
1544 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1748 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1545 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1749 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1546 ); 1750 );
1547 }#d# 1751 }#d#
1548 } 1752 }
… …
1581 1785
1582 my $row = 0; 1786 my $row = 0;
1583 1787
1584 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1788 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1585 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1586 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1587 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1792 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1588 on_changed => sub { 1793 on_changed => sub {
1589 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1590 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
1591 0 1796 0
1592 } 1797 }
1593 ); 1798 );
1594 1799
1595 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1596 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1801 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1802 c_colspan => 2,
1597 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1598 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1804 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1599 . "sends more messages than this number, older messages get removed to save memory and " 1805 . "sends more messages than this number, older messages get removed to save memory and "
1600 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1806 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1601 on_changed => sub { 1807 on_changed => sub {
1602 my ($self, $value) = @_; 1808 my ($self, $value) = @_;
1603 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1604 0 1810 0
1605 }, 1811 },
1812 );
1813
1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1815 $table->add_at (1, $row, new DC::UI::CheckBox
1816 state => $CFG->{config_autosave},
1817 tooltip => "Normally, configuration settings and the user interface layout "
1818 . "are saved on client exit. You can disable this behaviour by "
1819 . "unchecking this checkbox.",
1820 on_changed => sub {
1821 my ($self, $value) = @_;
1822 $CFG->{config_autosave} = $value;
1823 0
1824 }
1825 );
1826 $table->add_at (2, $row++, new DC::UI::Button
1827 text => "Save Now",
1828 tooltip => "Use this to manually save configuration and UI layout when "
1829 . "autosave is disabled.",
1830 on_activate => sub {
1831 DC::write_cfg;
1832 0
1833 }
1606 ); 1834 );
1607 1835
1608 $table 1836 $table
1609} 1837}
1610 1838
… …
1618 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1619 ); 1847 );
1620 1848
1621 for ( 1849 for (
1622 ["General", 0, 0, 1850 ["General", 0, 0,
1623 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1624 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1625 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1626 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1627 ], 1854 ],
1628 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1629 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
… …
1655 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1882 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1656 ["Ignore cursed" => PICKUP_NOT_CURSED], 1883 ["Ignore cursed" => PICKUP_NOT_CURSED],
1657 ["Jewelery" => PICKUP_JEWELS], 1884 ["Jewelery" => PICKUP_JEWELS],
1658 ["Flesh" => PICKUP_FLESH], 1885 ["Flesh" => PICKUP_FLESH],
1659 ], 1886 ],
1660 ["Weight/Value ratio", 2, 17] 1887 ["Value/Weight ratio", 2, 17]
1661 ) 1888 )
1662 { 1889 {
1663 my ($title, $x, $y, @bits) = @$_; 1890 my ($title, $x, $y, @bits) = @$_;
1664 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1891 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1665 1892
… …
1677 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1678 } else { 1905 } else {
1679 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1680 } 1907 }
1681 1908
1682 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1683 if defined $::CONN; 1910 if defined $::CONN;
1684 1911
1685 0 1912 0
1686 }); 1913 });
1687 1914
… …
1690 } 1917 }
1691 1918
1692 $table->add_at (2, 18, new DC::UI::ValSlider 1919 $table->add_at (2, 18, new DC::UI::ValSlider
1693 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1920 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1694 template => ">= 99", 1921 template => ">= 99",
1922 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1695 to_value => sub { ">= " . 5 * $_[0] }, 1923 to_value => sub { ">= " . 5 * $_[0] },
1696 on_changed => sub { 1924 on_changed => sub {
1697 my ($slider, $value) = @_; 1925 my ($slider, $value) = @_;
1698 1926
1699 $::CFG->{pickup} &= ~0xF; 1927 $::CFG->{pickup} &= ~0xF;
… …
1703 }); 1931 });
1704 1932
1705 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1706 text => "set", 1934 text => "set",
1707 on_activate => sub { 1935 on_activate => sub {
1708 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1709 if defined $::CONN; 1937 if defined $::CONN;
1710 0 1938 0
1711 }); 1939 });
1712 1940
1713 $r 1941 $r
1714} 1942}
1715 1943
1716my %SORT_ORDER = ( 1944my %SORT_ORDER = (
1717 type => undef, 1945 type => sub {
1946 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1947 },
1718 mtime => sub { 1948 mtime => sub {
1719 my $NOW = time; 1949 my $NOW = time;
1720 sort { 1950 sort {
1721 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1951 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1722 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1952 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1753 $::CFG->{inv_sort} = $_[1]; 1983 $::CFG->{inv_sort} = $_[1];
1754 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1984 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1755 }, 1985 },
1756 ); 1986 );
1757 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1987 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1758 #TODO# update to weigh/maxweight 1988 #TODO# update to weight/maxweight
1759 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1989 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1760 1990
1761 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1991 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1762 $sw1->add ($INV = new DC::UI::Inventory); 1992 $sw1->add ($INV = new DC::UI::Inventory);
1763 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1993 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1824 $PL_NOTEBOOK->set_current_page ($widget); 2054 $PL_NOTEBOOK->set_current_page ($widget);
1825 $PL_WINDOW->show; 2055 $PL_WINDOW->show;
1826 } 2056 }
1827} 2057}
1828 2058
1829sub player_window { 2059sub make_playerbook {
1830 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2060 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1831 x => "center", 2061 x => "center",
1832 y => "center", 2062 y => "center",
1833 force_w => $WIDTH * 9/10, 2063 force_w => $WIDTH * 9/10,
1834 force_h => $HEIGHT * 9/10, 2064 force_h => $HEIGHT * 9/10,
… …
1868 "License, Author and Source info for media sent by the server."); 2098 "License, Author and Source info for media sent by the server.");
1869 2099
1870 $ntb->set_current_page ($INVENTORY_PAGE); 2100 $ntb->set_current_page ($INVENTORY_PAGE);
1871 2101
1872 $plwin->add ($ntb); 2102 $plwin->add ($ntb);
1873 $plwin
1874} 2103}
1875 2104
1876sub keyboard_setup { 2105sub keyboard_setup {
1877 DC::Macro::keyboard_setup 2106 DC::Macro::keyboard_setup
1878} 2107}
1879 2108
1880sub help_window { 2109sub make_help_window {
1881 my $win = new DC::UI::Toplevel 2110 my $win = new DC::UI::Toplevel
1882 x => 'center', 2111 x => 'center',
1883 y => 'center', 2112 y => 'center',
1884 z => 4, 2113 z => 4,
1885 name => 'doc_browser', 2114 name => 'doc_browser',
… …
1944 my @path = DC::Pod::full_path_of $node; 2173 my @path = DC::Pod::full_path_of $node;
1945 pop @path; # drop current node 2174 pop @path; # drop current node
1946 2175
1947 for my $node (@path) { 2176 for my $node (@path) {
1948 $buttons->add (new DC::UI::Button 2177 $buttons->add (new DC::UI::Button
1949 text => $node->{kw}[0], 2178 text => $node->[DC::Pod::N_KW][0],
1950 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2179 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1951 on_activate => sub { 2180 on_activate => sub {
1952 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2181 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1953 $load_node->($node); 2182 $load_node->($node);
1954 }, 2183 },
1955 ); 2184 );
1956 $buttons->add (new DC::UI::Label text => "/"); 2185 $buttons->add (new DC::UI::Label text => "/");
1957 } 2186 }
1958 2187
1959 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2188 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1960 2189
1961 $curnode = $node; 2190 $curnode = $node;
1962 2191
1963 $viewer->clear; 2192 $viewer->clear;
1964 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2193 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
1974 2203
1975 $load_node->((DC::Pod::find @path)[0]); 2204 $load_node->((DC::Pod::find @path)[0]);
1976 $win->show; 2205 $win->show;
1977 }; 2206 };
1978 2207
1979 $win 2208 $HELP_WINDOW = $win;
1980}
1981
1982sub open_string_query {
1983 my ($title, $cb, $txt, $tooltip) = @_;
1984 my $dialog = new DC::UI::Toplevel
1985 x => "center",
1986 y => "center",
1987 z => 50,
1988 force_w => $WIDTH * 4/5,
1989 title => $title;
1990
1991 $dialog->add (
1992 my $e = new DC::UI::Entry
1993 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1994 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1995 tooltip => $tooltip
1996 );
1997
1998 $e->grab_focus;
1999 $e->set_text ($txt) if $txt;
2000 $dialog->show;
2001} 2209}
2002 2210
2003sub open_quit_dialog { 2211sub open_quit_dialog {
2004 unless ($QUIT_DIALOG) { 2212 unless ($QUIT_DIALOG) {
2005 $QUIT_DIALOG = new DC::UI::Toplevel 2213 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2027 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2235 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2028 ); 2236 );
2029 $hb->add (new DC::UI::Button 2237 $hb->add (new DC::UI::Button
2030 text => "Quit anyway", 2238 text => "Quit anyway",
2031 expand => 1, 2239 expand => 1,
2032 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2240 on_activate => sub {
2241 crash "Quit anyway";
2242 EV::unloop EV::UNLOOP_ALL;
2243 },
2033 ); 2244 );
2034 } 2245 }
2035 2246
2036 $QUIT_DIALOG->show; 2247 $QUIT_DIALOG->show;
2037 $QUIT_DIALOG->grab_focus; 2248 $QUIT_DIALOG->grab_focus;
2249}
2250
2251sub make_menubar {
2252 $MENUFRAME = new DC::UI::Toplevel
2253 border => 0,
2254 force_x => 0,
2255 force_y => 0,
2256 force_w => $::WIDTH,
2257 child => ($MENUBAR = new DC::UI::HBox),
2258 ;
2259
2260 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2261
2262 # 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
2263 make_gauge_window->show;
2264
2265# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2266# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2267
2268 make_playerbook;
2269
2270 $MENUPOPUP = DC::UI::Menu->new (items => [
2271 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2272 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2273 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2274 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2275 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2276 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2277 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2278 ["Quit…" , sub {
2279 if ($CONN) {
2280 open_quit_dialog;
2281 } else {
2282 EV::unloop EV::UNLOOP_ALL;
2283 }
2284 }],
2285 ]);
2286
2287 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2288 tooltip => "Shows the main menu",
2289 on_button_down => sub {
2290 my ($self, $ev) = @_;
2291 local $ev->{x} = 0;
2292 local $ev->{y} = 0;
2293 $MENUPOPUP->popup ($ev);
2294 },
2295 );
2296
2297 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2298 padding_x => 6,
2299 padding_y => 3,
2300 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2301 template => " Exp: 888,888,888,888 (lvl 188) ",
2302 );
2303
2304 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2305 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2306 . "will automatically pick up items as defined by your item pickup settings "
2307 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2308 . "disable autopickup by disabling this checkbox.",
2309 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2310 on_changed => sub {
2311 my ($self, $value) = @_;
2312 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2313 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2314 $CONN->send_pickup ($CFG->{pickup})
2315 if $CONN;
2316 },
2317 );
2318
2319 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2320 c_rescale => 1,
2321 padding_x => 6,
2322 padding_y => 3,
2323 force_w => $::WIDTH * 0.2,
2324 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2325 template => "two handed weapons 99%",
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2329 expand => 1,
2330 align => 1, can_hover => 1, can_events => 1,
2331 text => "Range and Combat Slots",
2332 tooltip => "#stat_ranged",
2333 );
2334
2335 $MENUFRAME->show;
2336}
2337
2338sub open_string_query {
2339 my ($title, $cb, $txt, $tooltip) = @_;
2340 my $dialog = new DC::UI::Toplevel
2341 x => "center",
2342 y => "center",
2343 z => 50,
2344 force_w => $WIDTH * 4/5,
2345 title => $title;
2346
2347 $dialog->add (
2348 my $e = new DC::UI::Entry
2349 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2350 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2351 tooltip => $tooltip
2352 );
2353
2354 $e->grab_focus;
2355 $e->set_text ($txt) if $txt;
2356 $dialog->show;
2038} 2357}
2039 2358
2040sub show_tip_of_the_day { 2359sub show_tip_of_the_day {
2041 # find all tips 2360 # find all tips
2042 my @tod = DC::Pod::find tip_of_the_day => "*"; 2361 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2090 $dialog->show; 2409 $dialog->show;
2091 }; 2410 };
2092} 2411}
2093 2412
2094sub sdl_init { 2413sub sdl_init {
2095 DC::SDL_Init 2414 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2096 and die "SDL::Init failed!\n"; 2415 and die "SDL::Init failed!\n";
2097} 2416}
2098 2417
2099sub video_init { 2418sub video_init {
2419 DC::set_theme $CFG->{uitheme};
2420
2421 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2422 $SDL_REINIT = 0;
2423
2424 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2425 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2426 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2427 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2428
2429 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2430
2100 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2431 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2432 $CFG->{sdl_mode} = 0; # lowest resolution by default
2433
2434 # now choose biggest mode <= 1024x768
2435 for (0 .. $#SDL_MODES) {
2436 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2437 $CFG->{sdl_mode} = $_;
2438 }
2439 }
2440 }
2101 2441
2102 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2442 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2103 2443
2104 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2444 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2105 $FULLSCREEN = $CFG->{fullscreen}; 2445 $FULLSCREEN = $CFG->{fullscreen};
2106 $FAST = $CFG->{fast}; 2446 $FAST = $CFG->{fast};
2107 2447
2448 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2108 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2449 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2450 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2109 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2451 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2110 2452
2111 $SDL_ACTIVE = 1; 2453 $SDL_ACTIVE = 1;
2112 $LAST_REFRESH = time - 0.01; 2454 $LAST_REFRESH = time - 0.01;
2113 2455
… …
2143 force_x => "max", 2485 force_x => "max",
2144 force_y => 0; 2486 force_y => 0;
2145 $DEBUG_STATUS->show; 2487 $DEBUG_STATUS->show;
2146 2488
2147 $STATUSBOX = new DC::UI::Statusbox; 2489 $STATUSBOX = new DC::UI::Statusbox;
2148 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2490
2491 $MODBOX = new DC::UI::Label
2492 can_events => 1,
2493 can_hover => 1,
2494 markup => "",
2495 align => 0,
2496 font => $FONT_FIXED,
2497 tooltip => "#modifier_box",
2498 tooltip_width => 0.67,
2499 ;
2500
2501 update_modbox;
2149 2502
2150 (new DC::UI::Frame 2503 (new DC::UI::Frame
2151 bg => [0, 0, 0, 0.4], 2504 bg => [0, 0, 0, 0.4],
2152 force_x => 0, 2505 force_x => 0,
2153 force_y => "max", 2506 force_y => "max",
2154 child => $STATUSBOX, 2507 child => (my $LL = new DC::UI::VBox),
2155 )->show; 2508 )->show;
2509
2510 $LL->add ($STATUSBOX);
2511 $LL->add ($MODBOX);
2512 $LL->add (new DC::UI::Label
2513 align => 0,
2514 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2515 fontsize => 0.5,
2516 fg => [1, 1, 0, 0.7],
2517 );
2156 2518
2157 DC::UI::Toplevel->new ( 2519 DC::UI::Toplevel->new (
2158 title => "Minimap", 2520 title => "Minimap",
2159 name => "mapmap", 2521 name => "mapmap",
2160 x => 0, 2522 x => 0,
2161 y => $FONTSIZE + 8, 2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2162 border_bg => [1, 1, 1, 192/255], 2524 border_bg => [1, 1, 1, 192/255],
2163 bg => [1, 1, 1, 0], 2525 bg => [1, 1, 1, 0],
2164 child => ($MAPMAP = new DC::MapWidget::MapMap 2526 child => ($MAPMAP = new DC::MapWidget::MapMap
2165 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2527 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2166 ), 2528 ),
2167 )->show; 2529 )->show;
2168 2530
2169 $MAPWIDGET = new DC::MapWidget; 2531 $MAPWIDGET = new DC::MapWidget;
2170 $MAPWIDGET->connect (activate_console => sub { 2532 $MAPWIDGET->connect (activate_console => sub {
2171 my ($mapwidget, $preset) = @_; 2533 my ($mapwidget, $preset) = @_;
2172 2534
2173 $MESSAGE_WINDOW->activate_console ($preset) 2535 $MESSAGE_DIST->activate_console ($preset)
2174 if $MESSAGE_WINDOW; 2536 if $MESSAGE_DIST;
2175 }); 2537 });
2176 $MAPWIDGET->show; 2538 $MAPWIDGET->show;
2177 $MAPWIDGET->grab_focus; 2539 $MAPWIDGET->grab_focus;
2178 2540
2179 $COMPLETER = new DC::MapWidget::Command:: 2541 $COMPLETER = new DC::MapWidget::Command::
… …
2191 force_h => $::HEIGHT * 0.6, 2553 force_h => $::HEIGHT * 0.6,
2192 has_close_button => 1, 2554 has_close_button => 1,
2193 ; 2555 ;
2194 2556
2195 $METASERVER = metaserver_dialog; 2557 $METASERVER = metaserver_dialog;
2558 # the name is changed to not conflict with the older name as users could have hidden it
2196 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2559 $MESSAGE_WINDOW = new DC::UI::Dockbar
2560 name => "message_window2",
2561 title => 'Messages',
2562 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2563 force_w => $::WIDTH * 0.6,
2564 force_h => $::HEIGHT * 0.25,
2565 ;
2197 2566
2567 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2568
2198 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2569 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2199 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2570 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2200 2571
2201 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2572 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2202 "Configure the server to play on, your username and password."); 2573 "Configure the server to play on, your username and password.");
2203 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2574 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2216 . "After pressing the combo the binding will be saved automatically and the " 2587 . "After pressing the combo the binding will be saved automatically and the "
2217 . "binding editor closes"); 2588 . "binding editor closes");
2218 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2589 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2219 "Some debuggin' options. Do not ask."); 2590 "Some debuggin' options. Do not ask.");
2220 2591
2221 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2592 make_help_window;
2593 make_menubar;
2222 2594
2223 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2224 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2225
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228
2229 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
2230
2231 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2232 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2233
2234 $BUTTONBAR->add (new DC::UI::Button
2235 text => "Save Config",
2236 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2237 on_activate => sub {
2238 $::CFG->{layout} = DC::UI::get_layout;
2239 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2240 status "Configuration Saved";
2241 0
2242 },
2243 );
2244
2245 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2246 tooltip => "View Documentation");
2247
2248
2249 $BUTTONBAR->add (new DC::UI::Button
2250 text => "Quit",
2251 tooltip => "Terminates the program",
2252 on_activate => sub {
2253 if ($CONN) {
2254 open_quit_dialog;
2255 } else {
2256 EV::unloop EV::UNLOOP_ALL;
2257 }
2258 0
2259 },
2260 );
2261
2262 $BUTTONBAR->show;
2263 $SETUP_DIALOG->show; 2595 $SETUP_DIALOG->show;
2264 $MESSAGE_WINDOW->show; 2596 $MESSAGE_WINDOW->show;
2265 } 2597 }
2266 2598
2599 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2600 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2601
2602 $CAVEAT_LABEL->set_text ("None :)");
2603 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2604 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2605 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2606 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2607
2267 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2268} 2609}
2269 2610
2270sub video_shutdown { 2611sub video_shutdown {
2271 DC::OpenGL::shutdown; 2612 DC::OpenGL::shutdown;
2613 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2272 2614
2273 undef $SDL_ACTIVE; 2615 undef $SDL_ACTIVE;
2274} 2616}
2275 2617
2276my %animate_object; 2618my %animate_object;
… …
2295my $want_refresh = EV::prepare_ns \&force_refresh; 2637my $want_refresh = EV::prepare_ns \&force_refresh;
2296 2638
2297my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2639my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2298 $NOW = EV::now; 2640 $NOW = EV::now;
2299 2641
2300 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2642 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2301 for DC::poll_events; 2643 for DC::poll_events;
2302 2644
2303 if (%animate_object) { 2645 if (%animate_object) {
2304 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2646 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2305 $WANT_REFRESH = 1; 2647 $WANT_REFRESH = 1;
… …
2317sub animation_stop { 2659sub animation_stop {
2318 my ($widget) = @_; 2660 my ($widget) = @_;
2319 delete $animate_object{$widget}; 2661 delete $animate_object{$widget};
2320} 2662}
2321 2663
2322%SDL_CB = (
2323 DC::SDL_QUIT => sub { 2664$SDL_CB[DC::SDL_QUIT] = sub {
2665 crash "SDL_QUIT";
2324 EV::unloop EV::UNLOOP_ALL; 2666 EV::unloop EV::UNLOOP_ALL;
2325 }, 2667};
2326 DC::SDL_VIDEORESIZE => sub { 2668$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2327 },
2328 DC::SDL_VIDEOEXPOSE => sub { 2669$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2329 DC::UI::full_refresh; 2670 DC::UI::full_refresh;
2330 }, 2671};
2331 DC::SDL_ACTIVEEVENT => sub { 2672$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2332# not useful, as APPACTIVE includes only iconified state, not unmapped 2673# not useful, as APPACTIVE includes only iconified state, not unmapped
2333# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2674# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2334# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2675# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2335# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2676# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2336# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2677# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2337# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2678# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2338 }, 2679};
2339 DC::SDL_KEYDOWN => sub { 2680$SDL_CB[DC::SDL_KEYDOWN] = sub {
2340 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2681 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2341 # alt-enter 2682 # alt-enter
2683 video_shutdown;
2342 $FULLSCREEN_ENABLE->toggle; 2684 $FULLSCREEN_ENABLE->toggle;
2343 video_shutdown;
2344 video_init; 2685 video_init;
2345 } else { 2686 } else {
2346 DC::UI::feed_sdl_key_down_event ($_[0]); 2687 &DC::UI::feed_sdl_key_down_event;
2347 }
2348 }, 2688 }
2349 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2689 update_modbox;
2690};
2691$SDL_CB[DC::SDL_KEYUP] = sub {
2692 &DC::UI::feed_sdl_key_up_event;
2693 update_modbox;
2694};
2350 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2695$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2351 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2696$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2352 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2353 DC::SDL_USEREVENT => sub { 2698$SDL_CB[DC::SDL_USEREVENT] = sub {
2354 if ($_[0]{code} == 1) { 2699 if ($_[0]{code} == 1) {
2355 audio_channel_finished $_[0]{data1}; 2700 audio_channel_finished $_[0]{data1};
2356 } elsif ($_[0]{code} == 0) { 2701 } elsif ($_[0]{code} == 0) {
2357 audio_music_finished; 2702 audio_music_finished;
2358 }
2359 }, 2703 }
2360); 2704};
2361 2705
2362############################################################################# 2706#############################################################################
2363 2707
2364$SIG{INT} = $SIG{TERM} = sub { 2708$SIG{INT} = $SIG{TERM} = sub {
2365 EV::unloop; 2709 EV::unloop;
2366 #d# TODO calling exit here hangs the process in some futex 2710 #d# TODO calling exit here hangs the process in some futex
2367}; 2711};
2368 2712
2369{ 2713# due to mac os x + sdl combined braindamage, we need this contortion
2714sub main {
2715 {
2716 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2717
2370 if (-e "$Deliantra::VARDIR/client.cf") { 2718 if (-e "$Deliantra::VARDIR/client.cf") {
2371 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2719 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2372 } else { 2720 } else {
2373 #TODO: compatibility cruft 2721 #TODO: compatibility cruft
2374 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2722 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2375 print STDERR "INFO: used old configuratrion file\n"; 2723 print STDERR "INFO: used old configuration file\n";
2376 } 2724 }
2377 2725
2378 DC::DB::Server::run; 2726 DC::DB::Server::run;
2379 2727
2728 if ($CFG->{db_schema} < 1) {
2729 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2730 DC::DB::nuke_db;
2731 $CFG->{db_schema} = 1;
2732 DC::write_cfg;
2733 }
2734
2735 DC::DB::open_db;
2736
2380 DC::UI::set_layout ($::CFG->{layout}); 2737 DC::UI::set_layout ($::CFG->{layout});
2381 2738
2382 my %DEF_CFG = ( 2739 my %DEF_CFG = (
2740 config_autosave => 1,
2383 sdl_mode => 0, 2741 sdl_mode => undef,
2384 fullscreen => 1, 2742 fullscreen => 1,
2385 fast => 0, 2743 fast => 0,
2386 force_opengl11 => undef, 2744 force_opengl11 => undef,
2745 disable_alpha => 0,
2746 smooth_movement => 1,
2747 smooth_transitions => 1,
2387 texture_compression => 1, 2748 texture_compression => 1,
2388 map_scale => 1, 2749 map_scale => 1,
2389 fow_enable => 1, 2750 fow_enable => 1,
2390 fow_intensity => 0, 2751 fow_intensity => 0,
2752 fow_texture => 0,
2391 map_smoothing => 1, 2753 map_smoothing => 1,
2392 gui_fontsize => 1, 2754 gui_fontsize => 1,
2393 log_fontsize => 0.7, 2755 log_fontsize => 0.7,
2394 gauge_fontsize => 1, 2756 gauge_fontsize => 1,
2395 gauge_size => 0.35, 2757 gauge_size => 0.35,
2396 stat_fontsize => 0.7, 2758 stat_fontsize => 0.7,
2397 mapsize => 100, 2759 mapsize => 100,
2398 audio_enable => 1, 2760 audio_enable => 1,
2399 audio_hw_channels => 0, 2761 audio_hw_channels => 0,
2400 audio_hw_frequency => 0, 2762 audio_hw_frequency => 0,
2401 audio_hw_chunksize => 0, 2763 audio_hw_chunksize => 0,
2402 audio_mix_channels => 8, 2764 audio_mix_channels => 8,
2403 effects_enable => 1, 2765 effects_enable => 1,
2404 effects_volume => 1, 2766 effects_volume => 1,
2405 bgm_enable => 1, 2767 bgm_enable => 1,
2406 bgm_volume => 0.5, 2768 bgm_volume => 0.5,
2407 output_rate => "", 2769 output_rate => "",
2408 pickup => 0, 2770 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2409 inv_sort => "mtime", 2771 inv_sort => "mtime",
2410 default => "profile", # default profile 2772 default => "profile", # default profile
2411 show_tips => 1, 2773 show_tips => 1,
2412 logview_max_par => 1000, 2774 logview_max_par => 1000,
2775 shift_fire_stop => 0,
2776 uitheme => "wood",
2777 map_shift_x => -24, # arbitrary
2778 map_shift_y => +24, # arbitrary
2413 ); 2779 );
2414 2780
2415 while (my ($k, $v) = each %DEF_CFG) { 2781 while (my ($k, $v) = each %DEF_CFG) {
2416 $CFG->{$k} = $v unless exists $CFG->{$k}; 2782 $CFG->{$k} = $v unless exists $CFG->{$k};
2417 } 2783 }
2418 2784
2419 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2785 my @args = @ARGV;
2420 $PROFILE = $CFG->{profile}{default};
2421 2786
2422 # convert old bindings (only default profile matters) 2787 my $profile = 'default';
2423 if (my $bindings = delete $PROFILE->{bindings}) { 2788
2424 while (my ($mod, $syms) = each %$bindings) { 2789 for (my $i = 0; $i < @args; $i++) {
2425 while (my ($sym, $cmds) = each %$syms) { 2790 if ($args[$i] =~ /^--?profile$/) {
2426 push @{ $PROFILE->{macro} }, { 2791 $profile = $args[$i + 1];
2427 accelkey => [$mod*1, $sym*1], 2792 splice @args, $i, 2, ();
2428 action => $cmds,
2429 }; 2793 $i = 0;
2794 } elsif ($args[$i] =~ /^--?h/) {
2795 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2796 exit 0;
2430 } 2797 }
2431 } 2798 }
2432 }
2433 2799
2800 $CFG->{profile}{$profile} ||= {};
2801 $PROFILE = $CFG->{profile}{$profile};
2802 $PROFILE->{host} ||= "gameserver.deliantra.net";
2803
2804 $PROFILE->{host} = $args[0] if @args > 0;
2805 $PROFILE->{user} = $args[1] if @args > 1;
2806 $PROFILE->{password} = $args[2] if @args > 2;
2807
2808 # convert old bindings (only default profile matters)
2809 if (my $bindings = delete $PROFILE->{bindings}) {
2810 while (my ($mod, $syms) = each %$bindings) {
2811 while (my ($sym, $cmds) = each %$syms) {
2812 push @{ $PROFILE->{macro} }, {
2813 accelkey => [$mod*1, $sym*1],
2814 action => $cmds,
2815 };
2816 }
2817 }
2818 }
2819
2434 sdl_init; 2820 sdl_init;
2435 2821
2436 @SDL_MODES = DC::SDL_ListModes 8, 8; 2822 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2437 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2823 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2438 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2439 2824
2440 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2825 {
2441
2442 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2443
2444 {
2445 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2826 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2446 DejaVuSans.ttf 2827 DejaVuSans.ttf
2447 DejaVuSansMono.ttf 2828 DejaVuSansMono.ttf
2448 DejaVuSans-Bold.ttf 2829 DejaVuSans-Bold.ttf
2449 DejaVuSansMono-Bold.ttf 2830 DejaVuSansMono-Bold.ttf
2450 DejaVuSans-Oblique.ttf 2831 DejaVuSans-Oblique.ttf
2451 DejaVuSansMono-Oblique.ttf 2832 DejaVuSansMono-Oblique.ttf
2452 DejaVuSans-BoldOblique.ttf 2833 DejaVuSans-BoldOblique.ttf
2453 DejaVuSansMono-BoldOblique.ttf 2834 DejaVuSansMono-BoldOblique.ttf
2835 mona.ttf
2454 ); 2836 );
2455 2837
2456 DC::add_font $_ for @fonts; 2838 DC::add_font $_ for @fonts;
2457
2458 DC::pango_init;
2459 2839
2460 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2840 $FONT_PROP = new_from_file DC::Font $fonts[0];
2461 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2841 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2462 2842
2463 $FONT_PROP->make_default; 2843 $FONT_PROP->make_default;
2464 } 2844
2845 DC::pango_init;
2846 }
2465 2847
2466# compare mono (ft) vs. rgba (cairo) 2848# compare mono (ft) vs. rgba (cairo)
2467# ft - 1.8s, cairo 3s, even in alpha-only mode 2849# ft - 1.8s, cairo 3s, even in alpha-only mode
2468# for my $rgba (0..1) { 2850# for my $rgba (0..1) {
2469# my $t1 = Time::HiRes::time; 2851# my $t1 = Time::HiRes::time;
… …
2474# } 2856# }
2475# my $t2 = Time::HiRes::time; 2857# my $t2 = Time::HiRes::time;
2476# warn $t2-$t1; 2858# warn $t2-$t1;
2477# } 2859# }
2478 2860
2479 video_init; 2861 video_init;
2480 audio_init; 2862 audio_init;
2481} 2863 }
2482 2864
2483show_tip_of_the_day if $CFG->{show_tips}; 2865 show_tip_of_the_day if $CFG->{show_tips};
2484 2866
2485our $STARTUP_CANCEL = EV::idle sub { 2867 our $STARTUP_CANCEL = EV::idle sub {
2486 undef $::STARTUP_CANCEL; 2868 undef $::STARTUP_CANCEL;
2487 $startup_done->(); 2869 $startup_done->();
2488}; 2870 };
2489 2871
2872 delete $SIG{__DIE__};
2490EV::loop; 2873 EV::loop;
2491 2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2492#video_shutdown; 2877 #video_shutdown;
2493#audio_shutdown; 2878 #audio_shutdown;
2879
2494DC::OpenGL::quit; 2880 DC::OpenGL::quit;
2495DC::SDL_Quit; 2881 DC::SDL_Quit;
2496DC::DB::Server::stop; 2882 DC::DB::Server::stop;
2883}
2884
2885DC::SDL_braino; # see sub above
2497 2886
2498=head1 NAME 2887=head1 NAME
2499 2888
2500deliantra - A Deliantra MORPG game client 2889deliantra - A Deliantra MORPG game client
2501 2890
2502=head1 SYNOPSIS 2891=head1 SYNOPSIS
2503 2892
2504Just run it - no commandline arguments are supported. 2893 deliantra [--profile name] [host [user [password]]]
2894 deliantra --help
2505 2895
2506=head1 USAGE 2896=head1 USAGE
2507 2897
2508deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2898The deliantra client utilises OpenGL for all UI elements and the game. It
2509be used in fullscreen mode and interactively. 2899is supposed to be used in fullscreen mode and interactively.
2510 2900
2511=head1 DEBUGGING 2901=head1 DEBUGGING
2512
2513 2902
2514CFPLUS_DEBUG - environment variable 2903CFPLUS_DEBUG - environment variable
2515 2904
2516 1 draw borders around widgets 2905 1 draw borders around widgets
2517 2 add low-level widget info to tooltips 2906 2 add low-level widget info to tooltips
2518 4 show fps 2907 4 show fps
2519 8 suppress tooltips 2908 8 suppress tooltips
2520 2909
2521=head1 AUTHOR 2910=head1 AUTHOR
2522 2911
2523Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2912Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2524 2913
2525 2914
2526 2915

Diff Legend

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