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.20 by root, Fri Dec 28 11:44:02 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
653 [Cha => CS_STAT_CHA], 748 [Cha => CS_STAT_CHA],
654 ) { 749 ) {
655 my ($name, $id) = @$_; 750 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 751 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 752 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 753 expand => 1,
660 can_events => 1, 754 can_events => 1,
661 can_hover => 1, 755 can_hover => 1,
662 tooltip => "#stat_$name", 756 tooltip => "#stat_$name",
663 ); 757 );
697 791
698 $vbox->add (@dialog); 792 $vbox->add (@dialog);
699 $dialog->show; 793 $dialog->show;
700} 794}
701 795
702sub start_game { 796sub dc_connect {
703 status "logging in..."; 797 my ($host, $port) = @_;
704 798
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707
708 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;
709 801
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 802 $CONN =
715 new DC::Protocol 803 new DC::Protocol
716 host => $host, 804 host => $host,
717 port => $port || 13327, 805 port => $port,
718 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
720 mapw => $mapsize, 808 mapw => $mapw,
721 maph => $mapsize, 809 maph => $maph,
722 810
723 client => "cfplus $DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
724 812
725 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
727 map => $MAP, 815 map => $MAP,
728 mapmap => $MAPMAP, 816 mapmap => $MAPMAP,
729 query => \&server_query, 817 query => \&server_query,
730 818
731 setup_req => { 819 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 820 smoothing => $CFG->{map_smoothing}*1,
733 }, 821 },
734 };
735 822
736 if ($CONN) { 823 on_connect => sub {
824 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
738 826
739 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 };
740 } else { 864 } else {
741 status "unable to connect"; 865 dc_connect $host, $port;
742 stop_game();
743 } 866 }
744} 867}
745 868
746sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
747 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
749 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
750 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
751 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
765} 890}
766 891
767sub graphics_setup { 892sub graphics_setup {
768 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
769 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
770 $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]);
771 899
772 my $row = 0; 900 my $row = 0;
773 901
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, 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,
776 can_events => 1, 904 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 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
779 my $vidmode_tooltip = 928 my $vidmode_tooltip =
780 "<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). "
781 . "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>.";
782 931
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 934
786 $hbox->add (my $mode_slider = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 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 ],
788 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
792 943
793 $mode_slider->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 945 my ($self, $value) = @_;
795 946
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $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]});
798 }); 949 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 951
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 954 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 955 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 957 );
807 958
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 961 state => $CFG->{force_opengl11},
811 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 "
812 . "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 "
813 . "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. "
814 . "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, "
815 . "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. "
816 . "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>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 969 );
819 970
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 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
988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
989 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
823 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 "
824 . "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). "
825 . "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 "
826 . "forced OpenGL 1.1 mode.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 996 );
829 997
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 998 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 1000 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 1003 );
836 1004
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 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.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 1010 );
843 1011
844 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 1013 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
847 on_activate => sub { 1015 on_activate => sub {
848 video_shutdown (); 1016 video_shutdown ();
849 video_init (); 1017 video_init ();
1018 0
850 0 1019 }
851 } 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 }
852 ); 1036 );
853 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
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 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 }
859 ); 1053 );
860 1054
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
864 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. "
865 . "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. "
866 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 1062 );
869 1063
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
873 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.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 1069 );
876 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
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 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.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 1091 );
883 1092
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 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, "
888 . "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.",
889 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 },
890 ); 1099 );
891 1100
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1101 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 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.",
896 on_changed => sub { 1105 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
899 0 1109 }
900 } 1110 );
901 );
902 1111
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 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.",
907 on_changed => sub { 1116 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
909 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
910 0 1120 }
911 } 1121 );
912 ); 1122 }
913 1123
914 $vbox 1124 $vbox
915} 1125}
916 1126
917our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
930 1140
931 my $text = !$freq 1141 my $text = !$freq
932 ? "audio is off" 1142 ? "audio is off"
933 : "audio is enabled\n" 1143 : "audio is enabled\n"
934 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
935 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
936 1148
937 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
938} 1150}
939 1151
940sub audio_setup { 1152sub audio_setup {
942 1154
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1155 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1156
945 my $row = 0; 1157 my $row = 0;
946 1158
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1159 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1160 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1161 state => $CFG->{audio_enable},
950 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1162 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1163 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1164 );
953 1165
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1166 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1167 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1168 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1169 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1170 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1171 $CFG->{effects_enable} = $_[1];
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1178 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1179 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1180 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1181 );
970 1182
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1183 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1184 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1185 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1186 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1187 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1188 $CFG->{bgm_enable} = $_[1];
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1195 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1196 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1197 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1198 );
987 1199
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1200 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1201 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1202 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1203 value => $CFG->{audio_hw_frequency},
992 options => [ 1204 options => [
993 [ 0, "default" , "Use System Default"], 1205 [ 0, "default" , "Use System Default"],
1002 audio_tab_update; 1214 audio_tab_update;
1003 1 1215 1
1004 } 1216 }
1005 ); 1217 );
1006 1218
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1219 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1220 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1221 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1222 value => $CFG->{audio_hw_channels},
1011 options => [ 1223 options => [
1012 [0, "default" , "Use System Default"], 1224 [0, "default" , "Use System Default"],
1021 audio_tab_update; 1233 audio_tab_update;
1022 1 1234 1
1023 } 1235 }
1024 ); 1236 );
1025 1237
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1238 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1239 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1240 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1241 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1242 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1243 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1035 1 1247 1
1036 } 1248 }
1037 ); 1249 );
1038 1250
1039 # should really be a slider 1251 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1252 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1253 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1254 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1255 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1256 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1257 template => ">= 99",
1051 1; 1263 1;
1052 } 1264 }
1053 ); 1265 );
1054 1266
1055 $table->add_at (1, $row++, new DC::UI::Button 1267 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1268 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1269 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1270 on_activate => sub {
1059 audio_shutdown (); 1271 audio_shutdown ();
1060 audio_init (); 1272 audio_init ();
1061 0 1273 0
1080} 1292}
1081 1293
1082sub make_gauge_window { 1294sub make_gauge_window {
1083 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1084 1296
1085 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1086 force_x => 0, 1298 force_x => 0,
1087 force_y => "max", 1299 force_y => "max",
1088 force_w => $WIDTH, 1300 force_w => $WIDTH,
1089 force_h => $gh, 1301 force_h => $gh,
1090 ); 1302 );
1106 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1107 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1108 ], 1320 ],
1109 ); 1321 );
1110 1322
1111 $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");
1112 $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");
1113 $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");
1114 $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");
1115
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120
1121 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1125 };
1126 1327
1127 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1128 1329
1129 $win 1330 $win
1130} 1331}
1140 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1341 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1141 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1342 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1142 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1343 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1143 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1344 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1144 1345
1145 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1346 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1146 1347
1147 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1348 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1148 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1349 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1149 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1350 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1150 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1351 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1190 $vb->add (new DC::UI::FancyFrame 1391 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1392 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1393 child => (my $pi = new DC::UI::VBox),
1193 ); 1394 );
1194 1395
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1396 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1397 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1398 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1399 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1400 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1401 tooltip => "The map you are currently on (if supported by the server).");
1201 1402
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1403 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1404 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1405 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1406 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1407 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1408 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1409 tooltip => "The weight limit: you cannot carry more than this.");
1209 1410
1210 $vb->add (new DC::UI::FancyFrame 1411 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1412 label => "Primary/Secondary Statistics",
1232 [2, 5, st_wspd => "WSp", 10.54], 1433 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1434 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1435 my ($col, $row, $id, $label, $template) = @$_;
1235 1436
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1437 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1438 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1439 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1440 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1441 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1442 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1443 }
1243 1444
1244 $vb->add (new DC::UI::FancyFrame 1445 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1446 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1447 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1448 );
1248 1449
1249 my $row = 0; 1450 my $row = 0;
1250 my $col = 0; 1451 my $col = 0;
1251 1452
1290 1491
1291 for (qw/slow holyw conf fire depl magic 1492 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1493 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1494 blind fear tund elec cold ghit/)
1294 { 1495 {
1295 $tbl2->add_at ($col, $row, 1496 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1497 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1498 new DC::UI::Label
1298 font => $FONT_FIXED, 1499 font => $FONT_FIXED,
1299 template => "-100%", 1500 template => "-100%",
1300 align => +1, 1501 align => 1,
1301 valign => 0,
1302 can_events => 1, 1502 can_events => 1,
1303 can_hover => 1, 1503 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1504 tooltip => $resist_names{$_}->[1],
1305 ); 1505 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1506 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 can_hover => 1, 1508 can_hover => 1,
1309 can_events => 1, 1509 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1510 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1511 tooltip => $resist_names{$_}->[1],
1312 ); 1512 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1513 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1514 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1515 font => $FONT_FIXED,
1516 align => 1,
1316 can_hover => 1, 1517 can_hover => 1,
1317 can_events => 1, 1518 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1519 tooltip => $resist_names{$_}->[1],
1319 ); 1520 );
1320 1521
1321 $row++; 1522 $row++;
1322 if ($row % 6 == 0) { 1523 if ($row % 6 == 0) {
1323 $col += 3; 1524 $col += 4;
1324 $row = 0; 1525 $row = 0;
1325 } 1526 }
1326 } 1527 }
1327 1528
1328 #update_stats_window ({}); 1529 #update_stats_window ({});
1374 "The time this server has been running without being restarted.", 1575 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1576 "Short information about this server provided by its admins.",
1376 ); 1577 );
1377 my @col = qw(#Users Host Uptime Version Description); 1578 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1579 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1580 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1581 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1582 for 0 .. $#col;
1383 1583
1384 my @align = qw(1 0 1 1 -1); 1584 my @align = qw(1 0.5 1 1 0);
1385 1585
1386 my $y = 0; 1586 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1587 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1588 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1589 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1470 $vbox->add (new DC::UI::FancyFrame 1670 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1671 label => "Login Settings",
1472 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]),
1473 ); 1673 );
1474 1674
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1478 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1480 ); 1680 );
1481 1681
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1485 hidden => 1, 1685 hidden => 1,
1486 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1488 ); 1688 );
1489 1689
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1691 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1692 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1693 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1694 on_activate => sub {
1496 $CONN ? stop_game 1695 $CONN ? stop_game
1497 : start_game; 1696 : start_game;
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 => -1, 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
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1721 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1722 );
1522 1723
1523 my $row = 0; 1724 my $row = 0;
1524 1725
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1726 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1727 {
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 }
1552 1753
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1754 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1755 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1756 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1757 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1758 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1759 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1760 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1761 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1762 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1763 );
1563 1764
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1765 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1766 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1767 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1768 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1769 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1770 . "default will be used, which is usually around 100kb/s. Most servers will "
1582sub client_setup { 1783sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1784 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1785
1585 my $row = 0; 1786 my $row = 0;
1586 1787
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, 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 valign => 0, 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_WINDOW->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 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1947 },
1721 mtime => sub { 1948 mtime => sub {
1722 my $NOW = time; 1949 my $NOW = time;
1723 sort { 1950 sort {
1724 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;
1725 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;
1737 1964
1738sub inventory_widget { 1965sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1966 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1967
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1968 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1969 $vb1->add (new DC::UI::Label text => "Player");
1743 1970
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1971 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1972
1746 use sort 'stable'; 1973 use sort 'stable';
1747 1974
1756 $::CFG->{inv_sort} = $_[1]; 1983 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1984 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1985 },
1759 ); 1986 );
1760 $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);
1761 #TODO# update to weigh/maxweight 1988 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1989 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1990
1764 $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);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1992 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1993 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1994
1827 $PL_NOTEBOOK->set_current_page ($widget); 2054 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2055 $PL_WINDOW->show;
1829 } 2056 }
1830} 2057}
1831 2058
1832sub player_window { 2059sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2060 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2061 x => "center",
1835 y => "center", 2062 y => "center",
1836 force_w => $WIDTH * 9/10, 2063 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2064 force_h => $HEIGHT * 9/10,
1871 "License, Author and Source info for media sent by the server."); 2098 "License, Author and Source info for media sent by the server.");
1872 2099
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2100 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2101
1875 $plwin->add ($ntb); 2102 $plwin->add ($ntb);
1876 $plwin
1877} 2103}
1878 2104
1879sub keyboard_setup { 2105sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2106 DC::Macro::keyboard_setup
1881} 2107}
1882 2108
1883sub help_window { 2109sub make_help_window {
1884 my $win = new DC::UI::Toplevel 2110 my $win = new DC::UI::Toplevel
1885 x => 'center', 2111 x => 'center',
1886 y => 'center', 2112 y => 'center',
1887 z => 4, 2113 z => 4,
1888 name => 'doc_browser', 2114 name => 'doc_browser',
1947 my @path = DC::Pod::full_path_of $node; 2173 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2174 pop @path; # drop current node
1949 2175
1950 for my $node (@path) { 2176 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2177 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2178 text => $node->[DC::Pod::N_KW][0],
1953 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>",
1954 on_activate => sub { 2180 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2181 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2182 $load_node->($node);
1957 }, 2183 },
1958 ); 2184 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2185 $buttons->add (new DC::UI::Label text => "/");
1960 } 2186 }
1961 2187
1962 $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);
1963 2189
1964 $curnode = $node; 2190 $curnode = $node;
1965 2191
1966 $viewer->clear; 2192 $viewer->clear;
1967 $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);
1977 2203
1978 $load_node->((DC::Pod::find @path)[0]); 2204 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2205 $win->show;
1980 }; 2206 };
1981 2207
1982 $win 2208 $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} 2209}
2005 2210
2006sub open_quit_dialog { 2211sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2212 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2213 $QUIT_DIALOG = new DC::UI::Toplevel
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2235 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2236 );
2032 $hb->add (new DC::UI::Button 2237 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2238 text => "Quit anyway",
2034 expand => 1, 2239 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2240 on_activate => sub {
2241 crash "Quit anyway";
2242 EV::unloop EV::UNLOOP_ALL;
2243 },
2036 ); 2244 );
2037 } 2245 }
2038 2246
2039 $QUIT_DIALOG->show; 2247 $QUIT_DIALOG->show;
2040 $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;
2041} 2357}
2042 2358
2043sub show_tip_of_the_day { 2359sub show_tip_of_the_day {
2044 # find all tips 2360 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2361 my @tod = DC::Pod::find tip_of_the_day => "*";
2093 $dialog->show; 2409 $dialog->show;
2094 }; 2410 };
2095} 2411}
2096 2412
2097sub sdl_init { 2413sub sdl_init {
2098 DC::SDL_Init 2414 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2415 and die "SDL::Init failed!\n";
2100} 2416}
2101 2417
2102sub 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
2103 $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 }
2104 2441
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2442 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2443
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2444 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2445 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2446 $FAST = $CFG->{fast};
2110 2447
2448 # 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 2449 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2450 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2451 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2452
2114 $SDL_ACTIVE = 1; 2453 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2454 $LAST_REFRESH = time - 0.01;
2116 2455
2146 force_x => "max", 2485 force_x => "max",
2147 force_y => 0; 2486 force_y => 0;
2148 $DEBUG_STATUS->show; 2487 $DEBUG_STATUS->show;
2149 2488
2150 $STATUSBOX = new DC::UI::Statusbox; 2489 $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]); 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;
2152 2502
2153 (new DC::UI::Frame 2503 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2504 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2505 force_x => 0,
2156 force_y => "max", 2506 force_y => "max",
2157 child => $STATUSBOX, 2507 child => (my $LL = new DC::UI::VBox),
2158 )->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 );
2159 2518
2160 DC::UI::Toplevel->new ( 2519 DC::UI::Toplevel->new (
2161 title => "Minimap", 2520 title => "Minimap",
2162 name => "mapmap", 2521 name => "mapmap",
2163 x => 0, 2522 x => 0,
2164 y => $FONTSIZE + 8, 2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2165 border_bg => [1, 1, 1, 192/255], 2524 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2525 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2526 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.", 2527 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2528 ),
2170 )->show; 2529 )->show;
2171 2530
2172 $MAPWIDGET = new DC::MapWidget; 2531 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2532 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2533 my ($mapwidget, $preset) = @_;
2175 2534
2176 $MESSAGE_WINDOW->activate_console ($preset) 2535 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2536 if $MESSAGE_DIST;
2178 }); 2537 });
2179 $MAPWIDGET->show; 2538 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2539 $MAPWIDGET->grab_focus;
2181 2540
2182 $COMPLETER = new DC::MapWidget::Command:: 2541 $COMPLETER = new DC::MapWidget::Command::
2194 force_h => $::HEIGHT * 0.6, 2553 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2554 has_close_button => 1,
2196 ; 2555 ;
2197 2556
2198 $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
2199 $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 ;
2200 2566
2567 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2568
2201 $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,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2570 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2571
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2572 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2573 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2574 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2219 . "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 "
2220 . "binding editor closes"); 2588 . "binding editor closes");
2221 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2589 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2222 "Some debuggin' options. Do not ask."); 2590 "Some debuggin' options. Do not ask.");
2223 2591
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2592 make_help_window;
2593 make_menubar;
2225 2594
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231
2232 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
2233
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2236
2237 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2243 status "Configuration Saved";
2244 0
2245 },
2246 );
2247
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation");
2250
2251
2252 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit",
2254 tooltip => "Terminates the program",
2255 on_activate => sub {
2256 if ($CONN) {
2257 open_quit_dialog;
2258 } else {
2259 EV::unloop EV::UNLOOP_ALL;
2260 }
2261 0
2262 },
2263 );
2264
2265 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2595 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2596 $MESSAGE_WINDOW->show;
2268 } 2597 }
2269 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
2270 $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]);
2271} 2609}
2272 2610
2273sub video_shutdown { 2611sub video_shutdown {
2274 DC::OpenGL::shutdown; 2612 DC::OpenGL::shutdown;
2613 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2614
2276 undef $SDL_ACTIVE; 2615 undef $SDL_ACTIVE;
2277} 2616}
2278 2617
2279my %animate_object; 2618my %animate_object;
2298my $want_refresh = EV::prepare_ns \&force_refresh; 2637my $want_refresh = EV::prepare_ns \&force_refresh;
2299 2638
2300my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2639my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2301 $NOW = EV::now; 2640 $NOW = EV::now;
2302 2641
2303 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2642 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2304 for DC::poll_events; 2643 for DC::poll_events;
2305 2644
2306 if (%animate_object) { 2645 if (%animate_object) {
2307 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2646 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2308 $WANT_REFRESH = 1; 2647 $WANT_REFRESH = 1;
2320sub animation_stop { 2659sub animation_stop {
2321 my ($widget) = @_; 2660 my ($widget) = @_;
2322 delete $animate_object{$widget}; 2661 delete $animate_object{$widget};
2323} 2662}
2324 2663
2325%SDL_CB = (
2326 DC::SDL_QUIT => sub { 2664$SDL_CB[DC::SDL_QUIT] = sub {
2665 crash "SDL_QUIT";
2327 EV::unloop EV::UNLOOP_ALL; 2666 EV::unloop EV::UNLOOP_ALL;
2328 }, 2667};
2329 DC::SDL_VIDEORESIZE => sub { 2668$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2330 },
2331 DC::SDL_VIDEOEXPOSE => sub { 2669$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2332 DC::UI::full_refresh; 2670 DC::UI::full_refresh;
2333 }, 2671};
2334 DC::SDL_ACTIVEEVENT => sub { 2672$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2335# not useful, as APPACTIVE includes only iconified state, not unmapped 2673# not useful, as APPACTIVE includes only iconified state, not unmapped
2336# 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#
2337# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2675# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2338# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2676# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2339# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2677# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2678# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2679};
2342 DC::SDL_KEYDOWN => sub { 2680$SDL_CB[DC::SDL_KEYDOWN] = sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2681 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2682 # alt-enter
2683 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2684 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2685 video_init;
2348 } else { 2686 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2687 &DC::UI::feed_sdl_key_down_event;
2350 }
2351 }, 2688 }
2352 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};
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2695$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2696$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2698$SDL_CB[DC::SDL_USEREVENT] = sub {
2357 if ($_[0]{code} == 1) { 2699 if ($_[0]{code} == 1) {
2358 audio_channel_finished $_[0]{data1}; 2700 audio_channel_finished $_[0]{data1};
2359 } elsif ($_[0]{code} == 0) { 2701 } elsif ($_[0]{code} == 0) {
2360 audio_music_finished; 2702 audio_music_finished;
2361 }
2362 }, 2703 }
2363); 2704};
2364 2705
2365############################################################################# 2706#############################################################################
2366 2707
2367$SIG{INT} = $SIG{TERM} = sub { 2708$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2709 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2710 #d# TODO calling exit here hangs the process in some futex
2370}; 2711};
2371 2712
2372{ 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
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2718 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2719 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2720 } else {
2376 #TODO: compatibility cruft 2721 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2722 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2723 print STDERR "INFO: used old configuration file\n";
2379 } 2724 }
2380 2725
2381 DC::DB::Server::run; 2726 DC::DB::Server::run;
2382 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
2383 DC::UI::set_layout ($::CFG->{layout}); 2737 DC::UI::set_layout ($::CFG->{layout});
2384 2738
2385 my %DEF_CFG = ( 2739 my %DEF_CFG = (
2740 config_autosave => 1,
2386 sdl_mode => 0, 2741 sdl_mode => undef,
2387 fullscreen => 1, 2742 fullscreen => 1,
2388 fast => 0, 2743 fast => 0,
2389 force_opengl11 => undef, 2744 force_opengl11 => undef,
2745 disable_alpha => 0,
2746 smooth_movement => 1,
2747 smooth_transitions => 1,
2390 texture_compression => 1, 2748 texture_compression => 1,
2391 map_scale => 1, 2749 map_scale => 1,
2392 fow_enable => 1, 2750 fow_enable => 1,
2393 fow_intensity => 0, 2751 fow_intensity => 0,
2752 fow_texture => 0,
2394 map_smoothing => 1, 2753 map_smoothing => 1,
2395 gui_fontsize => 1, 2754 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2755 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2756 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2757 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2758 stat_fontsize => 0.7,
2400 mapsize => 100, 2759 mapsize => 100,
2401 audio_enable => 1, 2760 audio_enable => 1,
2402 audio_hw_channels => 0, 2761 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2762 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2763 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2764 audio_mix_channels => 8,
2406 effects_enable => 1, 2765 effects_enable => 1,
2407 effects_volume => 1, 2766 effects_volume => 1,
2408 bgm_enable => 1, 2767 bgm_enable => 1,
2409 bgm_volume => 0.5, 2768 bgm_volume => 0.5,
2410 output_rate => "", 2769 output_rate => "",
2411 pickup => 0, 2770 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2412 inv_sort => "mtime", 2771 inv_sort => "mtime",
2413 default => "profile", # default profile 2772 default => "profile", # default profile
2414 show_tips => 1, 2773 show_tips => 1,
2415 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
2416 ); 2779 );
2417 2780
2418 while (my ($k, $v) = each %DEF_CFG) { 2781 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2782 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2783 }
2421 2784
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2785 my @args = @ARGV;
2423 $PROFILE = $CFG->{profile}{default};
2424 2786
2425 # convert old bindings (only default profile matters) 2787 my $profile = 'default';
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2788
2427 while (my ($mod, $syms) = each %$bindings) { 2789 for (my $i = 0; $i < @args; $i++) {
2428 while (my ($sym, $cmds) = each %$syms) { 2790 if ($args[$i] =~ /^--?profile$/) {
2429 push @{ $PROFILE->{macro} }, { 2791 $profile = $args[$i + 1];
2430 accelkey => [$mod*1, $sym*1], 2792 splice @args, $i, 2, ();
2431 action => $cmds,
2432 }; 2793 $i = 0;
2794 } elsif ($args[$i] =~ /^--?h/) {
2795 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2796 exit 0;
2433 } 2797 }
2434 } 2798 }
2435 }
2436 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
2437 sdl_init; 2820 sdl_init;
2438 2821
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2822 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2823 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2441 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2442 2824
2443 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2825 {
2444
2445 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2446
2447 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2826 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2827 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2828 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2829 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2830 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2831 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2832 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2833 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2834 DejaVuSansMono-BoldOblique.ttf
2835 mona.ttf
2457 ); 2836 );
2458 2837
2459 DC::add_font $_ for @fonts; 2838 DC::add_font $_ for @fonts;
2460
2461 DC::pango_init;
2462 2839
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2840 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2841 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2842
2466 $FONT_PROP->make_default; 2843 $FONT_PROP->make_default;
2467 } 2844
2845 DC::pango_init;
2846 }
2468 2847
2469# compare mono (ft) vs. rgba (cairo) 2848# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2849# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2850# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2851# my $t1 = Time::HiRes::time;
2477# } 2856# }
2478# my $t2 = Time::HiRes::time; 2857# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2858# warn $t2-$t1;
2480# } 2859# }
2481 2860
2482 video_init; 2861 video_init;
2483 audio_init; 2862 audio_init;
2484} 2863 }
2485 2864
2486show_tip_of_the_day if $CFG->{show_tips}; 2865 show_tip_of_the_day if $CFG->{show_tips};
2487 2866
2488our $STARTUP_CANCEL = EV::idle sub { 2867 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2868 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2869 $startup_done->();
2491}; 2870 };
2492 2871
2872 delete $SIG{__DIE__};
2493EV::loop; 2873 EV::loop;
2494 2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2495#video_shutdown; 2877 #video_shutdown;
2496#audio_shutdown; 2878 #audio_shutdown;
2879
2497DC::OpenGL::quit; 2880 DC::OpenGL::quit;
2498DC::SDL_Quit; 2881 DC::SDL_Quit;
2499DC::DB::Server::stop; 2882 DC::DB::Server::stop;
2883}
2884
2885DC::SDL_braino; # see sub above
2500 2886
2501=head1 NAME 2887=head1 NAME
2502 2888
2503deliantra - A Deliantra MORPG game client 2889deliantra - A Deliantra MORPG game client
2504 2890
2505=head1 SYNOPSIS 2891=head1 SYNOPSIS
2506 2892
2507Just run it - no commandline arguments are supported. 2893 deliantra [--profile name] [host [user [password]]]
2894 deliantra --help
2508 2895
2509=head1 USAGE 2896=head1 USAGE
2510 2897
2511deliantra 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
2512be used in fullscreen mode and interactively. 2899is supposed to be used in fullscreen mode and interactively.
2513 2900
2514=head1 DEBUGGING 2901=head1 DEBUGGING
2515
2516 2902
2517CFPLUS_DEBUG - environment variable 2903CFPLUS_DEBUG - environment variable
2518 2904
2519 1 draw borders around widgets 2905 1 draw borders around widgets
2520 2 add low-level widget info to tooltips 2906 2 add low-level widget info to tooltips
2521 4 show fps 2907 4 show fps
2522 8 suppress tooltips 2908 8 suppress tooltips
2523 2909
2524=head1 AUTHOR 2910=head1 AUTHOR
2525 2911
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2912Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2913
2528 2914
2529 2915

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines