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.24 by root, Sun Jan 6 17:31:24 2008 UTC vs.
Revision 1.106 by root, Sat Apr 3 03:02:28 2010 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
… …
90 79
91# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 82 if %PAR::LibCache;
94 83
95use Time::HiRes 'time';
96use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
97use List::Util qw(max min); 87use List::Util qw(max min);
98 88
99use Deliantra; 89use Deliantra;
100use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
101 91
92use AnyEvent::Util ();
93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
95
102use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
103 98
104use DC; 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
139 148
140our $WANT_REFRESH; 149our $WANT_REFRESH;
141 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
142our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
143our $WIDTH; 156our $WIDTH;
144our $HEIGHT; 157our $HEIGHT;
145our $FULLSCREEN; 158our $FULLSCREEN;
146our $FONTSIZE; 159our $FONTSIZE;
147 160
148our $FONT_PROP; 161our $FONT_PROP;
149our $FONT_FIXED; 162our $FONT_FIXED;
150 163
164our $CONN;
165
151our $MAP; 166our $MAP;
152our $MAPMAP; 167our $MAPMAP;
153our $MAPWIDGET; 168our $MAPWIDGET;
154our $COMPLETER; 169our $COMPLETER;
155our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
156our $METASERVER; 174our $METASERVER;
157our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 176our $QUIT_DIALOG;
159our $HOST_ENTRY; 177our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
186our $FLOORBOX; 204our $FLOORBOX;
187our $GAUGES; 205our $GAUGES;
188our $STATWIDS; 206our $STATWIDS;
189 207
190our $SDL_ACTIVE; 208our $SDL_ACTIVE;
191our %SDL_CB; 209our @SDL_CB;
192 210
193our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 212our $STATUSBOX;
213our $MODBOX;
195our $DEBUG_STATUS; 214our $DEBUG_STATUS;
196 215
197our $INV; 216our $INV;
198our $INVR; 217our $INVR;
199our $INVR_HB; 218our $INVR_HB;
200 219
201############################################################################# 220#############################################################################
202 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
203sub status { 262sub status {
204 $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]);
205} 264}
206 265
207sub debug { 266sub debug {
208 $DEBUG_STATUS->set_text ($_[0]); 267 $DEBUG_STATUS->set_text ($_[0]);
209} 268}
210 269
211sub message { 270sub message {
212 $MESSAGE_DIST->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>");
213} 298}
214 299
215############################################################################# 300#############################################################################
216#TODO: maybe move into own audio module... 301#TODO: maybe move into own audio module...
217 302
… …
260 or return; 345 or return;
261 346
262 $meta->{data} 347 $meta->{data}
263 or return; 348 or return;
264 349
265 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
266 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
267 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
268 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
269 &audio_music_push ($face); 354 &audio_music_push ($face);
270 } 355 }
271 } else { 356 } else {
272 # fetch from database 357 # fetch from database
273 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
274 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
275 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
276 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;
277 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
278 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
279 364
280 audio_sound_push ($face); 365 audio_sound_push ($face);
281 }; 366 };
… …
328 413
329 audio_music_update_volume; 414 audio_music_update_volume;
330 415
331 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
332 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
333 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
334 ? 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
335 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
336 424
337 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
338 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
339 427
340 my $NOW = time; 428 my $NOW = time;
341 429
342 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
343 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
452 sub audio_tab_update; 540 sub audio_tab_update;
453 audio_tab_update; 541 audio_tab_update;
454} 542}
455 543
456sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
457 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
458 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
459 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
460 553
461 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
637 # right: accept 730 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 731 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 732 text => "Accept",
640 on_activate => sub { 733 on_activate => sub {
641 $conn->send ("reply n"); 734 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 735 destroy_query_dialog $conn;
644 0 736 0
645 }, 737 },
646 ); 738 );
647 739
… …
699 791
700 $vbox->add (@dialog); 792 $vbox->add (@dialog);
701 $dialog->show; 793 $dialog->show;
702} 794}
703 795
704sub start_game { 796sub dc_connect {
705 status "logging in..."; 797 my ($host, $port) = @_;
706 798
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709
710 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;
711 801
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 802 $CONN =
717 new DC::Protocol 803 new DC::Protocol
718 host => $host, 804 host => $host,
719 port => $port || 13327, 805 port => $port,
720 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
722 mapw => $mapsize, 808 mapw => $mapw,
723 maph => $mapsize, 809 maph => $maph,
724 810
725 client => "cfplus $DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
726 812
727 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
729 map => $MAP, 815 map => $MAP,
730 mapmap => $MAPMAP, 816 mapmap => $MAPMAP,
731 query => \&server_query, 817 query => \&server_query,
732 818
733 setup_req => { 819 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 820 smoothing => $CFG->{map_smoothing}*1,
735 }, 821 },
736 };
737 822
738 if ($CONN) { 823 on_connect => sub {
824 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
740 826
741 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 };
742 } else { 864 } else {
743 status "unable to connect"; 865 dc_connect $host, $port;
744 stop_game();
745 } 866 }
746} 867}
747 868
748sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
749 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
750 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
751 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
752 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
753 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
… …
767} 890}
768 891
769sub graphics_setup { 892sub graphics_setup {
770 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
771 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
772 $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]);
773 899
774 my $row = 0; 900 my $row = 0;
775 901
776 $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");
777 $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,
778 can_events => 1, 904 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 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
781 my $vidmode_tooltip = 928 my $vidmode_tooltip =
782 "<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). "
783 . "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>.";
784 931
785 $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");
786 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 934
788 $hbox->add (my $mode_slider = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
789 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 ],
790 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
794 943
795 $mode_slider->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 945 my ($self, $value) = @_;
797 946
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $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]});
800 }); 949 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 951
803 $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");
804 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 954 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 955 tooltip => "Bring the client into fullscreen mode.",
807 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
808 ); 957 );
809 958
810 $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");
811 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{force_opengl11}, 961 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra 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 "
814 . "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 "
815 . "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. "
816 . "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, "
817 . "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. "
818 . "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>",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
820 ); 969 );
821 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
822 $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");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
825 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 "
826 . "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). "
827 . "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 "
828 . "forced OpenGL 1.1 mode.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 996 );
831 997
832 $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");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
834 state => $CFG->{fast}, 1000 state => $CFG->{fast},
835 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
837 ); 1003 );
838 1004
839 $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");
840 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
842 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.",
843 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
844 ); 1010 );
845 1011
846 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
847 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
848 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
849 on_activate => sub { 1015 on_activate => sub {
850 video_shutdown (); 1016 video_shutdown ();
851 video_init (); 1017 video_init ();
1018 0
852 0 1019 }
853 } 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 }
854 ); 1036 );
855 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
856 $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");
857 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
859 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
860 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 }
861 ); 1053 );
862 1054
863 $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");
864 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
866 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. "
867 . "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. "
868 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
869 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
870 ); 1062 );
871 1063
872 $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");
873 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
874 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
875 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.",
876 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
877 ); 1069 );
878 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
879 $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");
880 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
881 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
882 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.",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
884 ); 1091 );
885 1092
886 $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");
887 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
889 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, "
890 . "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.",
891 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
892 ); 1099 );
893 1100
894 $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");
895 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
897 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.",
898 on_changed => sub { 1105 on_changed => sub {
899 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
900 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
901 0 1109 }
902 } 1110 );
903 );
904 1111
905 $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");
906 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
907 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
908 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.",
909 on_changed => sub { 1116 on_changed => sub {
910 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
911 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
912 0 1120 }
913 } 1121 );
914 ); 1122 }
915 1123
916 $vbox 1124 $vbox
917} 1125}
918 1126
919our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
… …
932 1140
933 my $text = !$freq 1141 my $text = !$freq
934 ? "audio is off" 1142 ? "audio is off"
935 : "audio is enabled\n" 1143 : "audio is enabled\n"
936 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
937 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
938 1148
939 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
940} 1150}
941 1151
942sub audio_setup { 1152sub audio_setup {
… …
1082} 1292}
1083 1293
1084sub make_gauge_window { 1294sub make_gauge_window {
1085 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1086 1296
1087 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1088 force_x => 0, 1298 force_x => 0,
1089 force_y => "max", 1299 force_y => "max",
1090 force_w => $WIDTH, 1300 force_w => $WIDTH,
1091 force_h => $gh, 1301 force_h => $gh,
1092 ); 1302 );
… …
1108 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1109 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1110 ], 1320 ],
1111 ); 1321 );
1112 1322
1113 $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");
1114 $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");
1115 $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");
1116 $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");
1117
1118 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1119 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1121 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1122
1123 $GAUGES = {
1124 exp => $exp, prg => $prg, sklprg => $sklprg,
1125 win => $win, range => $rng,
1126 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1127 };
1128 1327
1129 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1130 1329
1131 $win 1330 $win
1132} 1331}
… …
1473 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]),
1474 ); 1673 );
1475 1674
1476 $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");
1477 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1479 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1481 ); 1680 );
1482 1681
1483 $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");
1484 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1486 hidden => 1, 1685 hidden => 1,
1487 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1489 ); 1688 );
1490 1689
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1691 expand => 1,
1493 text => "Login / Register", 1692 text => "Login / Register",
… …
1498 1 1697 1
1499 }, 1698 },
1500 ); 1699 );
1501 1700
1502 $vbox->add (new DC::UI::FancyFrame 1701 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1702 label => "How to Play",
1504 min_h => 200, 1703 min_h => 240,
1505 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1704 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 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). "
1507 "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 "
1508 . "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.",
1509 ), 1710 ),
1510 ); 1711 );
1511 1712
1512 $vbox 1713 $vbox
… …
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1729
1529 $vbox->add ( 1730 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1732 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1533 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>)",
1534 on_changed => sub { 1735 on_changed => sub {
1535 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1537 1 1738 1
1538 } 1739 }
1539 ); 1740 );
1540 1741
1541 if (0) { #d# disabled 1742 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1743 $vbox->add (new DC::UI::Button
1543 expand => 1, 1744 expand => 1,
1544 text => "Server List", 1745 text => "Server List",
1545 other => $METASERVER, 1746 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1747 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1748 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1749 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1750 );
1550 }#d# 1751 }#d#
1551 } 1752 }
… …
1584 1785
1585 my $row = 0; 1786 my $row = 0;
1586 1787
1587 $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");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1589 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1590 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?",
1591 on_changed => sub { 1793 on_changed => sub {
1592 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
1594 0 1796 0
1595 } 1797 }
1596 ); 1798 );
1597 1799
1598 $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");
1599 $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,
1600 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1601 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 "
1602 . "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 "
1603 . "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.",
1604 on_changed => sub { 1807 on_changed => sub {
1605 my ($self, $value) = @_; 1808 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1810 0
1608 }, 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 }
1609 ); 1834 );
1610 1835
1611 $table 1836 $table
1612} 1837}
1613 1838
… …
1621 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1622 ); 1847 );
1623 1848
1624 for ( 1849 for (
1625 ["General", 0, 0, 1850 ["General", 0, 0,
1626 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1627 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1628 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1629 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1630 ], 1854 ],
1631 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1632 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1882 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1883 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1884 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1885 ["Flesh" => PICKUP_FLESH],
1662 ], 1886 ],
1663 ["Weight/Value ratio", 2, 17] 1887 ["Value/Weight ratio", 2, 17]
1664 ) 1888 )
1665 { 1889 {
1666 my ($title, $x, $y, @bits) = @$_; 1890 my ($title, $x, $y, @bits) = @$_;
1667 $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]);
1668 1892
… …
1680 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1681 } else { 1905 } else {
1682 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1683 } 1907 }
1684 1908
1685 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1686 if defined $::CONN; 1910 if defined $::CONN;
1687 1911
1688 0 1912 0
1689 }); 1913 });
1690 1914
… …
1693 } 1917 }
1694 1918
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1919 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1920 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 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).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1923 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1924 on_changed => sub {
1700 my ($slider, $value) = @_; 1925 my ($slider, $value) = @_;
1701 1926
1702 $::CFG->{pickup} &= ~0xF; 1927 $::CFG->{pickup} &= ~0xF;
… …
1706 }); 1931 });
1707 1932
1708 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1709 text => "set", 1934 text => "set",
1710 on_activate => sub { 1935 on_activate => sub {
1711 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1712 if defined $::CONN; 1937 if defined $::CONN;
1713 0 1938 0
1714 }); 1939 });
1715 1940
1716 $r 1941 $r
1717} 1942}
1718 1943
1719my %SORT_ORDER = ( 1944my %SORT_ORDER = (
1720 type => undef, 1945 type => sub {
1946 use sort 'stable';
1947 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1948 },
1721 mtime => sub { 1949 mtime => sub {
1950 use sort 'stable';
1722 my $NOW = time; 1951 my $NOW = time;
1723 sort { 1952 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1953 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1954 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1726 1955
1727 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1956 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1728 or $btime <=> $atime 1957 or $btime <=> $atime
1729 or $a->{type} <=> $b->{type} 1958 or $a->{type} <=> $b->{type}
1730 } @_ 1959 } @_
1731 }, 1960 },
1732 weight => sub { sort { 1961 weight => sub {
1962 use sort 'stable';
1963 sort {
1733 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1964 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1734 or $a->{type} <=> $b->{type} 1965 or $a->{type} <=> $b->{type}
1735 } @_ }, 1966 } @_
1967 },
1736); 1968);
1737 1969
1738sub inventory_widget { 1970sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1971 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1972
… …
1756 $::CFG->{inv_sort} = $_[1]; 1988 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1989 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1990 },
1759 ); 1991 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1992 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1993 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1994 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1995
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1996 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1997 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1998 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1827 $PL_NOTEBOOK->set_current_page ($widget); 2059 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2060 $PL_WINDOW->show;
1829 } 2061 }
1830} 2062}
1831 2063
1832sub player_window { 2064sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2065 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2066 x => "center",
1835 y => "center", 2067 y => "center",
1836 force_w => $WIDTH * 9/10, 2068 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2069 force_h => $HEIGHT * 9/10,
… …
1871 "License, Author and Source info for media sent by the server."); 2103 "License, Author and Source info for media sent by the server.");
1872 2104
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2105 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2106
1875 $plwin->add ($ntb); 2107 $plwin->add ($ntb);
1876 $plwin
1877} 2108}
1878 2109
1879sub keyboard_setup { 2110sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2111 DC::Macro::keyboard_setup
1881} 2112}
1882 2113
1883sub help_window { 2114sub make_help_window {
1884 my $win = new DC::UI::Toplevel 2115 my $win = new DC::UI::Toplevel
1885 x => 'center', 2116 x => 'center',
1886 y => 'center', 2117 y => 'center',
1887 z => 4, 2118 z => 4,
1888 name => 'doc_browser', 2119 name => 'doc_browser',
… …
1947 my @path = DC::Pod::full_path_of $node; 2178 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2179 pop @path; # drop current node
1949 2180
1950 for my $node (@path) { 2181 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2182 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2183 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2184 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2185 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2186 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2187 $load_node->($node);
1957 }, 2188 },
1958 ); 2189 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2190 $buttons->add (new DC::UI::Label text => "/");
1960 } 2191 }
1961 2192
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2193 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2194
1964 $curnode = $node; 2195 $curnode = $node;
1965 2196
1966 $viewer->clear; 2197 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2198 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
1977 2208
1978 $load_node->((DC::Pod::find @path)[0]); 2209 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2210 $win->show;
1980 }; 2211 };
1981 2212
1982 $win 2213 $HELP_WINDOW = $win;
1983}
1984
1985sub open_string_query {
1986 my ($title, $cb, $txt, $tooltip) = @_;
1987 my $dialog = new DC::UI::Toplevel
1988 x => "center",
1989 y => "center",
1990 z => 50,
1991 force_w => $WIDTH * 4/5,
1992 title => $title;
1993
1994 $dialog->add (
1995 my $e = new DC::UI::Entry
1996 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1997 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1998 tooltip => $tooltip
1999 );
2000
2001 $e->grab_focus;
2002 $e->set_text ($txt) if $txt;
2003 $dialog->show;
2004} 2214}
2005 2215
2006sub open_quit_dialog { 2216sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2217 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2218 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2240 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2241 );
2032 $hb->add (new DC::UI::Button 2242 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2243 text => "Quit anyway",
2034 expand => 1, 2244 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2245 on_activate => sub {
2246 crash "Quit anyway";
2247 EV::unloop EV::UNLOOP_ALL;
2248 },
2036 ); 2249 );
2037 } 2250 }
2038 2251
2039 $QUIT_DIALOG->show; 2252 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2253 $QUIT_DIALOG->grab_focus;
2254}
2255
2256sub make_menubar {
2257 $MENUFRAME = new DC::UI::Toplevel
2258 border => 0,
2259 force_x => 0,
2260 force_y => 0,
2261 force_w => $::WIDTH,
2262 child => ($MENUBAR = new DC::UI::HBox),
2263 ;
2264
2265 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2266
2267 # 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
2268 make_gauge_window->show;
2269
2270# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2271# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2272
2273 make_playerbook;
2274
2275 $MENUPOPUP = DC::UI::Menu->new (items => [
2276 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2277 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2278 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2279 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2280 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2281 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2282 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2283 ["Quit…" , sub {
2284 if ($CONN) {
2285 open_quit_dialog;
2286 } else {
2287 EV::unloop EV::UNLOOP_ALL;
2288 }
2289 }],
2290 ]);
2291
2292 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2293 tooltip => "Shows the main menu",
2294 on_button_down => sub {
2295 my ($self, $ev) = @_;
2296 local $ev->{x} = 0;
2297 local $ev->{y} = 0;
2298 $MENUPOPUP->popup ($ev);
2299 },
2300 );
2301
2302 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2303 padding_x => 6,
2304 padding_y => 3,
2305 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2306 template => " Exp: 888,888,888,888 (lvl 188) ",
2307 );
2308
2309 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2310 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2311 . "will automatically pick up items as defined by your item pickup settings "
2312 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2313 . "disable autopickup by disabling this checkbox.",
2314 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2315 on_changed => sub {
2316 my ($self, $value) = @_;
2317 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2318 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2319 $CONN->send_pickup ($CFG->{pickup})
2320 if $CONN;
2321 },
2322 );
2323
2324 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2325 c_rescale => 1,
2326 padding_x => 6,
2327 padding_y => 3,
2328 force_w => $::WIDTH * 0.2,
2329 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2330 template => "two handed weapons 99%",
2331 );
2332
2333 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2334 expand => 1,
2335 align => 1, can_hover => 1, can_events => 1,
2336 text => "Range and Combat Slots",
2337 tooltip => "#stat_ranged",
2338 );
2339
2340 $MENUFRAME->show;
2341}
2342
2343sub open_string_query {
2344 my ($title, $cb, $txt, $tooltip) = @_;
2345 my $dialog = new DC::UI::Toplevel
2346 x => "center",
2347 y => "center",
2348 z => 50,
2349 force_w => $WIDTH * 4/5,
2350 title => $title;
2351
2352 $dialog->add (
2353 my $e = new DC::UI::Entry
2354 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2355 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2356 tooltip => $tooltip
2357 );
2358
2359 $e->grab_focus;
2360 $e->set_text ($txt) if $txt;
2361 $dialog->show;
2041} 2362}
2042 2363
2043sub show_tip_of_the_day { 2364sub show_tip_of_the_day {
2044 # find all tips 2365 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2366 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2093 $dialog->show; 2414 $dialog->show;
2094 }; 2415 };
2095} 2416}
2096 2417
2097sub sdl_init { 2418sub sdl_init {
2098 DC::SDL_Init 2419 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2420 and die "SDL::Init failed!\n";
2100} 2421}
2101 2422
2102sub video_init { 2423sub video_init {
2424 DC::set_theme $CFG->{uitheme};
2425
2426 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2427 $SDL_REINIT = 0;
2428
2429 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2430 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2431 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2432 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2433
2434 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2435
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2436 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2437 $CFG->{sdl_mode} = 0; # lowest resolution by default
2438
2439 # now choose biggest mode <= 1024x768
2440 for (0 .. $#SDL_MODES) {
2441 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2442 $CFG->{sdl_mode} = $_;
2443 }
2444 }
2445 }
2104 2446
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2447 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2448
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2449 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2450 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2451 $FAST = $CFG->{fast};
2110 2452
2453 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2454 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2455 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2456 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2457
2114 $SDL_ACTIVE = 1; 2458 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2459 $LAST_REFRESH = time - 0.01;
2116 2460
… …
2146 force_x => "max", 2490 force_x => "max",
2147 force_y => 0; 2491 force_y => 0;
2148 $DEBUG_STATUS->show; 2492 $DEBUG_STATUS->show;
2149 2493
2150 $STATUSBOX = new DC::UI::Statusbox; 2494 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2495
2496 $MODBOX = new DC::UI::Label
2497 can_events => 1,
2498 can_hover => 1,
2499 markup => "",
2500 align => 0,
2501 font => $FONT_FIXED,
2502 tooltip => "#modifier_box",
2503 tooltip_width => 0.67,
2504 ;
2505
2506 update_modbox;
2152 2507
2153 (new DC::UI::Frame 2508 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2509 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2510 force_x => 0,
2156 force_y => "max", 2511 force_y => "max",
2157 child => $STATUSBOX, 2512 child => (my $LL = new DC::UI::VBox),
2158 )->show; 2513 )->show;
2514
2515 $LL->add ($STATUSBOX);
2516 $LL->add ($MODBOX);
2517 $LL->add (new DC::UI::Label
2518 align => 0,
2519 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2520 fontsize => 0.5,
2521 fg => [1, 1, 0, 0.7],
2522 );
2159 2523
2160 DC::UI::Toplevel->new ( 2524 DC::UI::Toplevel->new (
2161 title => "Minimap", 2525 title => "Minimap",
2162 name => "mapmap", 2526 name => "mapmap",
2163 x => 0, 2527 x => 0,
2164 y => $FONTSIZE + 8, 2528 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2165 border_bg => [1, 1, 1, 192/255], 2529 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2530 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2531 child => ($MAPMAP = new DC::MapWidget::MapMap
2168 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2532 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2533 ),
2170 )->show; 2534 )->show;
2171 2535
2172 $MAPWIDGET = new DC::MapWidget; 2536 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2537 $MAPWIDGET->connect (activate_console => sub {
… …
2194 force_h => $::HEIGHT * 0.6, 2558 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2559 has_close_button => 1,
2196 ; 2560 ;
2197 2561
2198 $METASERVER = metaserver_dialog; 2562 $METASERVER = metaserver_dialog;
2563 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar; 2564 $MESSAGE_WINDOW = new DC::UI::Dockbar
2565 name => "message_window2",
2566 title => 'Messages',
2567 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2568 force_w => $::WIDTH * 0.6,
2569 force_h => $::HEIGHT * 0.25,
2570 ;
2571
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2572 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2573
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2574 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2575 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2576
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2577 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2578 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2579 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2220 . "After pressing the combo the binding will be saved automatically and the " 2592 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2593 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2594 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2595 "Some debuggin' options. Do not ask.");
2224 2596
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2597 make_help_window;
2598 make_menubar;
2226 2599
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 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
2234
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237
2238 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2244 status "Configuration Saved";
2245 0
2246 },
2247 );
2248
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation");
2251
2252
2253 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit",
2255 tooltip => "Terminates the program",
2256 on_activate => sub {
2257 if ($CONN) {
2258 open_quit_dialog;
2259 } else {
2260 EV::unloop EV::UNLOOP_ALL;
2261 }
2262 0
2263 },
2264 );
2265
2266 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2600 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2601 $MESSAGE_WINDOW->show;
2269 } 2602 }
2270 2603
2604 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2605 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2606
2607 $CAVEAT_LABEL->set_text ("None :)");
2608 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2609 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2610 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2611 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2612
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2613 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2614}
2273 2615
2274sub video_shutdown { 2616sub video_shutdown {
2275 DC::OpenGL::shutdown; 2617 DC::OpenGL::shutdown;
2618 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2619
2277 undef $SDL_ACTIVE; 2620 undef $SDL_ACTIVE;
2278} 2621}
2279 2622
2280my %animate_object; 2623my %animate_object;
… …
2299my $want_refresh = EV::prepare_ns \&force_refresh; 2642my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2643
2301my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2644my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = EV::now; 2645 $NOW = EV::now;
2303 2646
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2647 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2648 for DC::poll_events;
2306 2649
2307 if (%animate_object) { 2650 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2651 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2652 $WANT_REFRESH = 1;
… …
2321sub animation_stop { 2664sub animation_stop {
2322 my ($widget) = @_; 2665 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2666 delete $animate_object{$widget};
2324} 2667}
2325 2668
2326%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2669$SDL_CB[DC::SDL_QUIT] = sub {
2670 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2671 EV::unloop EV::UNLOOP_ALL;
2329 }, 2672};
2330 DC::SDL_VIDEORESIZE => sub { 2673$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2331 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2674$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2333 DC::UI::full_refresh; 2675 DC::UI::full_refresh;
2334 }, 2676};
2335 DC::SDL_ACTIVEEVENT => sub { 2677$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2678# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2679# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2680# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2681# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2682# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2683# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2684};
2343 DC::SDL_KEYDOWN => sub { 2685$SDL_CB[DC::SDL_KEYDOWN] = sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2686 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2687 # alt-enter
2688 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2689 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2690 video_init;
2349 } else { 2691 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2692 &DC::UI::feed_sdl_key_down_event;
2351 }
2352 }, 2693 }
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2694 update_modbox;
2695};
2696$SDL_CB[DC::SDL_KEYUP] = sub {
2697 &DC::UI::feed_sdl_key_up_event;
2698 update_modbox;
2699};
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2700$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2701$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2703$SDL_CB[DC::SDL_USEREVENT] = sub {
2358 if ($_[0]{code} == 1) { 2704 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2705 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2706 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2707 audio_music_finished;
2362 }
2363 }, 2708 }
2364); 2709};
2365 2710
2366############################################################################# 2711#############################################################################
2367 2712
2368$SIG{INT} = $SIG{TERM} = sub { 2713$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2714 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2715 #d# TODO calling exit here hangs the process in some futex
2371}; 2716};
2372 2717
2373{ 2718# due to mac os x + sdl combined braindamage, we need this contortion
2719sub main {
2720 {
2721 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2722
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2723 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2724 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2725 } else {
2377 #TODO: compatibility cruft 2726 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2727 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2728 print STDERR "INFO: used old configuration file\n";
2380 } 2729 }
2381 2730
2382 DC::DB::Server::run; 2731 DC::DB::Server::run;
2383 2732
2733 if ($CFG->{db_schema} < 1) {
2734 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2735 DC::DB::nuke_db;
2736 $CFG->{db_schema} = 1;
2737 DC::write_cfg;
2738 }
2739
2740 DC::DB::open_db;
2741
2384 DC::UI::set_layout ($::CFG->{layout}); 2742 DC::UI::set_layout ($::CFG->{layout});
2385 2743
2386 my %DEF_CFG = ( 2744 my %DEF_CFG = (
2745 config_autosave => 1,
2387 sdl_mode => 0, 2746 sdl_mode => undef,
2388 fullscreen => 1, 2747 fullscreen => 1,
2389 fast => 0, 2748 fast => 0,
2390 force_opengl11 => undef, 2749 force_opengl11 => undef,
2750 disable_alpha => 0,
2751 smooth_movement => 1,
2752 smooth_transitions => 1,
2391 texture_compression => 1, 2753 texture_compression => 1,
2392 map_scale => 1, 2754 map_scale => 1,
2393 fow_enable => 1, 2755 fow_enable => 1,
2394 fow_intensity => 0, 2756 fow_intensity => 0,
2757 fow_texture => 0,
2395 map_smoothing => 1, 2758 map_smoothing => 1,
2396 gui_fontsize => 1, 2759 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2760 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2761 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2762 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2763 stat_fontsize => 0.7,
2401 mapsize => 100, 2764 mapsize => 100,
2402 audio_enable => 1, 2765 audio_enable => 1,
2403 audio_hw_channels => 0, 2766 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2767 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2768 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2769 audio_mix_channels => 8,
2407 effects_enable => 1, 2770 effects_enable => 1,
2408 effects_volume => 1, 2771 effects_volume => 1,
2409 bgm_enable => 1, 2772 bgm_enable => 1,
2410 bgm_volume => 0.5, 2773 bgm_volume => 0.5,
2411 output_rate => "", 2774 output_rate => "",
2412 pickup => 0, 2775 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2413 inv_sort => "mtime", 2776 inv_sort => "mtime",
2414 default => "profile", # default profile 2777 default => "profile", # default profile
2415 show_tips => 1, 2778 show_tips => 1,
2416 logview_max_par => 1000, 2779 logview_max_par => 1000,
2780 shift_fire_stop => 0,
2781 uitheme => "wood",
2782 map_shift_x => -24, # arbitrary
2783 map_shift_y => +24, # arbitrary
2417 ); 2784 );
2418 2785
2419 while (my ($k, $v) = each %DEF_CFG) { 2786 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2787 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2788 }
2422 2789
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2790 my @args = @ARGV;
2424 $PROFILE = $CFG->{profile}{default};
2425 2791
2426 # convert old bindings (only default profile matters) 2792 my $profile = 'default';
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2793
2428 while (my ($mod, $syms) = each %$bindings) { 2794 for (my $i = 0; $i < @args; $i++) {
2429 while (my ($sym, $cmds) = each %$syms) { 2795 if ($args[$i] =~ /^--?profile$/) {
2430 push @{ $PROFILE->{macro} }, { 2796 $profile = $args[$i + 1];
2431 accelkey => [$mod*1, $sym*1], 2797 splice @args, $i, 2, ();
2432 action => $cmds,
2433 }; 2798 $i = 0;
2799 } elsif ($args[$i] =~ /^--?h/) {
2800 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2801 exit 0;
2434 } 2802 }
2435 } 2803 }
2436 }
2437 2804
2805 $CFG->{profile}{$profile} ||= {};
2806 $PROFILE = $CFG->{profile}{$profile};
2807 $PROFILE->{host} ||= "gameserver.deliantra.net";
2808
2809 $PROFILE->{host} = $args[0] if @args > 0;
2810 $PROFILE->{user} = $args[1] if @args > 1;
2811 $PROFILE->{password} = $args[2] if @args > 2;
2812
2813 # convert old bindings (only default profile matters)
2814 if (my $bindings = delete $PROFILE->{bindings}) {
2815 while (my ($mod, $syms) = each %$bindings) {
2816 while (my ($sym, $cmds) = each %$syms) {
2817 push @{ $PROFILE->{macro} }, {
2818 accelkey => [$mod*1, $sym*1],
2819 action => $cmds,
2820 };
2821 }
2822 }
2823 }
2824
2438 sdl_init; 2825 sdl_init;
2439 2826
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2827 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2828 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443 2829
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2830 {
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2831 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2832 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2833 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2834 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2835 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2836 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2837 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2838 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2839 DejaVuSansMono-BoldOblique.ttf
2840 mona.ttf
2458 ); 2841 );
2459 2842
2460 DC::add_font $_ for @fonts; 2843 DC::add_font $_ for @fonts;
2461
2462 DC::pango_init;
2463 2844
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2845 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2846 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2847
2467 $FONT_PROP->make_default; 2848 $FONT_PROP->make_default;
2468 } 2849
2850 DC::pango_init;
2851 }
2469 2852
2470# compare mono (ft) vs. rgba (cairo) 2853# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2854# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2855# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2856# my $t1 = Time::HiRes::time;
… …
2478# } 2861# }
2479# my $t2 = Time::HiRes::time; 2862# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2863# warn $t2-$t1;
2481# } 2864# }
2482 2865
2483 video_init; 2866 video_init;
2484 audio_init; 2867 audio_init;
2485} 2868 }
2486 2869
2487show_tip_of_the_day if $CFG->{show_tips}; 2870 show_tip_of_the_day if $CFG->{show_tips};
2488 2871
2489our $STARTUP_CANCEL = EV::idle sub { 2872 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2873 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2874 $startup_done->();
2492}; 2875 };
2493 2876
2877 delete $SIG{__DIE__};
2494EV::loop; 2878 EV::loop;
2495 2879
2880 DC::write_cfg if $CFG->{config_autosave};
2881
2496#video_shutdown; 2882 #video_shutdown;
2497#audio_shutdown; 2883 #audio_shutdown;
2884
2498DC::OpenGL::quit; 2885 DC::OpenGL::quit;
2499DC::SDL_Quit; 2886 DC::SDL_Quit;
2500DC::DB::Server::stop; 2887 DC::DB::Server::stop;
2888}
2889
2890DC::SDL_braino; # see sub above
2501 2891
2502=head1 NAME 2892=head1 NAME
2503 2893
2504deliantra - A Deliantra MORPG game client 2894deliantra - A Deliantra MORPG game client
2505 2895
2506=head1 SYNOPSIS 2896=head1 SYNOPSIS
2507 2897
2508Just run it - no commandline arguments are supported. 2898 deliantra [--profile name] [host [user [password]]]
2899 deliantra --help
2509 2900
2510=head1 USAGE 2901=head1 USAGE
2511 2902
2512deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2903The deliantra client utilises OpenGL for all UI elements and the game. It
2513be used in fullscreen mode and interactively. 2904is supposed to be used in fullscreen mode and interactively.
2514 2905
2515=head1 DEBUGGING 2906=head1 DEBUGGING
2516
2517 2907
2518CFPLUS_DEBUG - environment variable 2908CFPLUS_DEBUG - environment variable
2519 2909
2520 1 draw borders around widgets 2910 1 draw borders around widgets
2521 2 add low-level widget info to tooltips 2911 2 add low-level widget info to tooltips
2522 4 show fps 2912 4 show fps
2523 8 suppress tooltips 2913 8 suppress tooltips
2524 2914
2525=head1 AUTHOR 2915=head1 AUTHOR
2526 2916
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2917Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2918
2529 2919
2530 2920

Diff Legend

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