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.18 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.108 by root, Thu Apr 8 04:49:32 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;
127my $MIN_FPS = 5; # unused as of yet 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
128 139
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 141
131our $LAST_REFRESH; 142our $LAST_REFRESH;
132our $NOW; 143our $NOW;
133 144
134our $CFG; 145our $CFG;
135our $CONN;
136our $PROFILE; # current profile 146our $PROFILE; # current profile
137our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
138 148
139our $WANT_REFRESH; 149our $WANT_REFRESH;
140 150
151our $MODE_SLIDER;
152our $CAVEAT_LABEL;
153
141our @SDL_MODES; 154our @SDL_MODES;
155our $SDL_REINIT = 1;
142our $WIDTH; 156our $WIDTH;
143our $HEIGHT; 157our $HEIGHT;
144our $FULLSCREEN; 158our $FULLSCREEN;
145our $FONTSIZE; 159our $FONTSIZE;
146 160
147our $FONT_PROP; 161our $FONT_PROP;
148our $FONT_FIXED; 162our $FONT_FIXED;
149 163
164our $CONN;
165
150our $MAP; 166our $MAP;
151our $MAPMAP; 167our $MAPMAP;
152our $MAPWIDGET; 168our $MAPWIDGET;
153our $COMPLETER; 169our $COMPLETER;
154our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
155our $METASERVER; 174our $METASERVER;
156our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
157our $QUIT_DIALOG; 176our $QUIT_DIALOG;
158our $HOST_ENTRY; 177our $HOST_ENTRY;
159our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
179our $SPELL_PAGE; 198our $SPELL_PAGE;
180our $SPELL_LIST; 199our $SPELL_LIST;
181 200
182our $HELP_WINDOW; 201our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 202our $MESSAGE_WINDOW;
203our $MESSAGE_DIST;
184our $FLOORBOX; 204our $FLOORBOX;
185our $GAUGES; 205our $GAUGES;
186our $STATWIDS; 206our $STATWIDS;
187 207
188our $SDL_ACTIVE; 208our $SDL_ACTIVE;
189our %SDL_CB; 209our @SDL_CB;
190 210
191our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 212our $STATUSBOX;
213our $MODBOX;
193our $DEBUG_STATUS; 214our $DEBUG_STATUS;
194 215
195our $INV; 216our $INV;
196our $INVR; 217our $INVR;
197our $INVR_HB; 218our $INVR_HB;
198 219
199############################################################################# 220#############################################################################
200 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
201sub status { 262sub status {
202 $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]);
203} 264}
204 265
205sub debug { 266sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 267 $DEBUG_STATUS->set_text ($_[0]);
207} 268}
208 269
209sub message { 270sub message {
210 $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>");
211} 298}
212 299
213############################################################################# 300#############################################################################
214#TODO: maybe move into own audio module... 301#TODO: maybe move into own audio module...
215 302
258 or return; 345 or return;
259 346
260 $meta->{data} 347 $meta->{data}
261 or return; 348 or return;
262 349
263 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
264 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
265 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
266 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
267 &audio_music_push ($face); 354 &audio_music_push ($face);
268 } 355 }
269 } else { 356 } else {
270 # fetch from database 357 # fetch from database
271 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
272 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
273 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
274 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;
275 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
276 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
277 364
278 audio_sound_push ($face); 365 audio_sound_push ($face);
279 }; 366 };
326 413
327 audio_music_update_volume; 414 audio_music_update_volume;
328 415
329 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
330 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
331 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
332 ? 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
333 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
334 424
335 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
336 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
337 427
338 my $NOW = time; 428 my $NOW = time;
339 429
340 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
341 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
450 sub audio_tab_update; 540 sub audio_tab_update;
451 audio_tab_update; 541 audio_tab_update;
452} 542}
453 543
454sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
455 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
456 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
457 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
458 553
459 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
635 # right: accept 730 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 731 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 732 text => "Accept",
638 on_activate => sub { 733 on_activate => sub {
639 $conn->send ("reply n"); 734 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 735 destroy_query_dialog $conn;
642 0 736 0
643 }, 737 },
644 ); 738 );
645 739
654 [Cha => CS_STAT_CHA], 748 [Cha => CS_STAT_CHA],
655 ) { 749 ) {
656 my ($name, $id) = @$_; 750 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 751 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 752 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 753 expand => 1,
661 can_events => 1, 754 can_events => 1,
662 can_hover => 1, 755 can_hover => 1,
663 tooltip => "#stat_$name", 756 tooltip => "#stat_$name",
664 ); 757 );
698 791
699 $vbox->add (@dialog); 792 $vbox->add (@dialog);
700 $dialog->show; 793 $dialog->show;
701} 794}
702 795
703sub start_game { 796sub dc_connect {
704 status "logging in..."; 797 my ($host, $port) = @_;
705 798
706 $LOGIN_BUTTON->set_text ("Logout");
707 $SETUP_DIALOG->hide;
708
709 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;
710 801
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 802 $CONN =
716 new DC::Protocol 803 new DC::Protocol
717 host => $host, 804 host => $host,
718 port => $port || 13327, 805 port => $port,
719 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
721 mapw => $mapsize, 808 mapw => $mapw,
722 maph => $mapsize, 809 maph => $maph,
723 810
724 client => "cfplus $DC::VERSION $] $^O", 811 version => {
812 client => "deliantra",
813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
725 817
726 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
728 map => $MAP, 820 map => $MAP,
729 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
730 query => \&server_query, 822 query => \&server_query,
731 823
732 setup_req => { 824 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 825 smoothing => $CFG->{map_smoothing}*1,
734 }, 826 },
735 };
736 827
737 if ($CONN) { 828 on_connect => sub {
829 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
739 831
740 status "login successful"; 832 status "successfully connected to the server";
833 } else {
834 undef $CONN;
835 status "unable to connect: $!";
836 stop_game();
837 }
838 },
839 ;
840}
841
842sub start_game {
843 status "logging in...";
844
845 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
846 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
847 or return status "$server: unable to parse server address, try an empty field.";
848
849 $LOGIN_BUTTON->set_text ("Logout");
850 $SETUP_DIALOG->hide;
851
852 $MAP = new DC::Map;
853
854 # hack to make SURE we find the IP address all right
855 # can be removed once AnyEvent::DNS is proven stable.
856 if ($host eq "gameserver.deliantra.net") {
857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
858 if ($_[0] ne "80.101.114.108") { # Perl
859 status "dns failure, trying differently";
860 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
861 unless (defined $host) {
862 status "dns failure, using hardcoded address";
863 $host = "129.13.162.95";
864 }
865 }
866
867 dc_connect $host, $port;
868 };
741 } else { 869 } else {
742 status "unable to connect"; 870 dc_connect $host, $port;
743 stop_game();
744 } 871 }
745} 872}
746 873
747sub stop_game { 874sub stop_game {
875 crash "stop_game";
876
748 $LOGIN_BUTTON->set_text ("Login / Register"); 877 $LOGIN_BUTTON->set_text ("Login / Register");
749 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 878 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
750 $SETUP_DIALOG->show; 879 $SETUP_DIALOG->show;
751 $PL_WINDOW->hide; 880 $PL_WINDOW->hide;
752 $SPELL_LIST->clear_spells; 881 $SPELL_LIST->clear_spells;
766} 895}
767 896
768sub graphics_setup { 897sub graphics_setup {
769 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
770 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 903 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 904
773 my $row = 0; 905 my $row = 0;
774 906
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
776 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 908 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
777 can_events => 1, 909 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 911
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
913 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
914 can_events => 1,
915 tooltip => "This field shows any known issues with your config or driver, such as "
916 . "a non-accelerated display format. You can try to work around these issues "
917 . "by selecting a different video mode, changing the settings below or "
918 . "by installing the right driver for your graphics card.");
919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
922 value => $CFG->{uitheme},
923 options => [
924 [wood => "Wood (the default)"],
925 [plain => "Plain (very)"],
926 [blue => "Blue (dark)"],
927 [metal => "Metal (light)"],
928 ],
929 tooltip => "Choose the User Interface theme that you like most :)",
930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
931 );
932
780 my $vidmode_tooltip = 933 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 934 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 935 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 936
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
785 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 939
787 $hbox->add (my $mode_slider = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 941 c_rescale => 1,
942 force_w => $WIDTH * 0.1, expand => 1,
943 range => [ ($CFG->{sdl_mode}) x 3 ],
789 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
793 948
794 $mode_slider->connect (changed => sub { 949 $MODE_SLIDER->connect (changed => sub {
795 my ($self, $value) = @_; 950 my ($self, $value) = @_;
796 951
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 952 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 953 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 954 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 955 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
801 956
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 958 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 959 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 960 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 961 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 962 );
808 963
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
810 $table->add_at (1, $row++, new DC::UI::CheckBox 965 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 966 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 967 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 968 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 969 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 970 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 971 . "but cards and drivers from other vendors (ATI) are often just as bad. "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 972 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 973 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 974 );
820 975
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{disable_alpha},
979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
980 . "by disabling a number of textures and transparency effects. Normally, these "
981 . "effects do not cost a lot of resources, but some graphics cards might fall "
982 . "back to extremely slow rendering if this is enabled. If disabling this option "
983 . "noticably improves the framerate of the client please report this! "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub {
986 my ($self, $value) = @_;
987 $CFG->{disable_alpha} = $value;
988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
990 }
991 );
992
993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
994 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 996 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
825 . "will save a lot of memory and increase performance. The compression algorithm " 997 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
826 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 998 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 1001 );
830 1002
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 1005 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 1008 );
837 1009
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1013 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 1015 );
844 1016
845 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 1018 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
848 on_activate => sub { 1020 on_activate => sub {
849 video_shutdown (); 1021 video_shutdown ();
850 video_init (); 1022 video_init ();
1023 0
851 0 1024 }
852 } 1025 );
1026 }
1027
1028 {
1029 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1030
1031 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1032
1033 my $row = 0;
1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1035 $table->add_at (1, $row++, new DC::UI::CheckBox
1036 state => $CFG->{smooth_movement},
1037 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1039 . "then disable this option. Changes take effect immdiately.",
1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
853 ); 1041 );
854 1042
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1044 $table->add_at (1, $row++, new DC::UI::CheckBox
1045 state => $CFG->{smooth_transitions},
1046 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1047 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1048 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1049 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1050 );
1051
1052
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 1058 );
861 1059
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1063 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
866 . "This increases load on the graphics subsystem and works only with TRT servers. " 1064 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 1067 );
870 1068
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
872 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1072 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 1074 );
877 1075
1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1077 $table->add_at (1, $row++, new DC::UI::ImageButton
1078 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1079 bg => [0.3, 0.3, 0.2],
1080 force_w => 64,
1081 force_h => 64,
1082 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.",
1083 on_activate => sub {
1084 my ($self) = @_;
1085 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1086 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1087 $MAPWIDGET->update;
1088 }
1089 );
1090
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1091 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1094 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 1096 );
884 1097
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1101 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 1102 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 1104 );
892 1105
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 1110 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
900 0 1114 }
901 } 1115 );
902 );
903 1116
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1120 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 1121 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
910 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
911 0 1125 }
912 } 1126 );
913 ); 1127 }
914 1128
915 $vbox 1129 $vbox
916} 1130}
917 1131
918our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
931 1145
932 my $text = !$freq 1146 my $text = !$freq
933 ? "audio is off" 1147 ? "audio is off"
934 : "audio is enabled\n" 1148 : "audio is enabled\n"
935 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
936 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
937 1153
938 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
939} 1155}
940 1156
941sub audio_setup { 1157sub audio_setup {
943 1159
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1160 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 1161
946 my $row = 0; 1162 my $row = 0;
947 1163
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1164 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1165 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1166 state => $CFG->{audio_enable},
951 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.", 1167 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.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1168 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1169 );
954 1170
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1171 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1172 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1173 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1174 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 1175 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1176 $CFG->{effects_enable} = $_[1];
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1183 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
968 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1184 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1185 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1186 );
971 1187
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1188 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1189 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1190 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1191 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1192 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1193 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1200 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1201 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1202 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1203 );
988 1204
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1205 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1206 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1207 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1208 value => $CFG->{audio_hw_frequency},
993 options => [ 1209 options => [
994 [ 0, "default" , "Use System Default"], 1210 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1219 audio_tab_update;
1004 1 1220 1
1005 } 1221 }
1006 ); 1222 );
1007 1223
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1224 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1225 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1226 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1227 value => $CFG->{audio_hw_channels},
1012 options => [ 1228 options => [
1013 [0, "default" , "Use System Default"], 1229 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1238 audio_tab_update;
1023 1 1239 1
1024 } 1240 }
1025 ); 1241 );
1026 1242
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1243 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1028 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1244 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1245 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1246 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1247 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1248 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1252 1
1037 } 1253 }
1038 ); 1254 );
1039 1255
1040 # should really be a slider 1256 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1257 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1258 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1259 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1260 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1261 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1262 template => ">= 99",
1052 1; 1268 1;
1053 } 1269 }
1054 ); 1270 );
1055 1271
1056 $table->add_at (1, $row++, new DC::UI::Button 1272 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1273 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1274 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1275 on_activate => sub {
1060 audio_shutdown (); 1276 audio_shutdown ();
1061 audio_init (); 1277 audio_init ();
1062 0 1278 0
1081} 1297}
1082 1298
1083sub make_gauge_window { 1299sub make_gauge_window {
1084 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1085 1301
1086 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1087 force_x => 0, 1303 force_x => 0,
1088 force_y => "max", 1304 force_y => "max",
1089 force_w => $WIDTH, 1305 force_w => $WIDTH,
1090 force_h => $gh, 1306 force_h => $gh,
1091 ); 1307 );
1107 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1108 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1109 ], 1325 ],
1110 ); 1326 );
1111 1327
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1328 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1113 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1329 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1114 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1330 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1115 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1331 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121
1122 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1126 };
1127 1332
1128 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1129 1334
1130 $win 1335 $win
1131} 1336}
1141 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1346 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1347 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1348 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1349 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1350
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1351 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1352
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1353 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new DC::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1354 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1355 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new DC::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1356 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1357 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new DC::UI::Label text => "e"); 1358 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1359
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1360 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1361
1157 $c->add_items ({ 1362 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1396 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1397 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1398 child => (my $pi = new DC::UI::VBox),
1194 ); 1399 );
1195 1400
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1401 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1402 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1403 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1404 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1405 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1406 tooltip => "The map you are currently on (if supported by the server).");
1202 1407
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1408 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1409 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1410 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1411 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1412 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1413 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1414 tooltip => "The weight limit: you cannot carry more than this.");
1210 1415
1211 $vb->add (new DC::UI::FancyFrame 1416 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1417 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1438 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1439 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1440 my ($col, $row, $id, $label, $template) = @$_;
1236 1441
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1442 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1443 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1444 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1445 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1241 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1446 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1447 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1448 }
1244 1449
1245 $vb->add (new DC::UI::FancyFrame 1450 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1451 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1452 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1453 );
1249 1454
1250 my $row = 0; 1455 my $row = 0;
1251 my $col = 0; 1456 my $col = 0;
1252 1457
1291 1496
1292 for (qw/slow holyw conf fire depl magic 1497 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1498 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1499 blind fear tund elec cold ghit/)
1295 { 1500 {
1296 $tbl2->add_at ($col, $row, 1501 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1502 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1503 new DC::UI::Label
1299 font => $FONT_FIXED, 1504 font => $FONT_FIXED,
1300 template => "-100%", 1505 template => "-100%",
1301 align => +1, 1506 align => 1,
1302 valign => 0,
1303 can_events => 1, 1507 can_events => 1,
1304 can_hover => 1, 1508 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1509 tooltip => $resist_names{$_}->[1],
1306 ); 1510 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1511 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1513 can_hover => 1,
1310 can_events => 1, 1514 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1515 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1516 tooltip => $resist_names{$_}->[1],
1313 ); 1517 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1518 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1519 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1520 font => $FONT_FIXED,
1521 align => 1,
1317 can_hover => 1, 1522 can_hover => 1,
1318 can_events => 1, 1523 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1524 tooltip => $resist_names{$_}->[1],
1320 ); 1525 );
1321 1526
1322 $row++; 1527 $row++;
1323 if ($row % 6 == 0) { 1528 if ($row % 6 == 0) {
1324 $col += 3; 1529 $col += 4;
1325 $row = 0; 1530 $row = 0;
1326 } 1531 }
1327 } 1532 }
1328 1533
1329 #update_stats_window ({}); 1534 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1580 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1581 "Short information about this server provided by its admins.",
1377 ); 1582 );
1378 my @col = qw(#Users Host Uptime Version Description); 1583 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1584 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1585 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1586 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1587 for 0 .. $#col;
1384 1588
1385 my @align = qw(1 0 1 1 -1); 1589 my @align = qw(1 0.5 1 1 0);
1386 1590
1387 my $y = 0; 1591 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1592 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1593 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1594 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1471 $vbox->add (new DC::UI::FancyFrame 1675 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1676 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1677 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1678 );
1475 1679
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1680 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1479 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1481 ); 1685 );
1482 1686
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1687 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1486 hidden => 1, 1690 hidden => 1,
1487 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1489 ); 1693 );
1490 1694
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1696 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1697 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1698 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1699 on_activate => sub {
1497 $CONN ? stop_game 1700 $CONN ? stop_game
1498 : start_game; 1701 : start_game;
1499 1 1702 1
1500 }, 1703 },
1501 ); 1704 );
1502 1705
1503 $vbox->add (new DC::UI::FancyFrame 1706 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1707 label => "How to Play",
1505 min_h => 200, 1708 min_h => 240,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1709 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1710 markup =>
1711 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1712 . "Then register a new account (or use an existing one if you have one). "
1508 "To register a new account, choose a username that hasn't been taken yet and " 1713 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1509 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1714 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1715 ),
1511 ); 1716 );
1512 1717
1513 $vbox 1718 $vbox
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1726 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1727 );
1523 1728
1524 my $row = 0; 1729 my $row = 0;
1525 1730
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1731 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1732 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1734
1530 $vbox->add ( 1735 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1737 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1739 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1740 on_changed => sub {
1536 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1538 1 1743 1
1539 } 1744 }
1540 ); 1745 );
1541 1746
1542 if (0) { #d# disabled 1747 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1748 $vbox->add (new DC::UI::Button
1544 expand => 1, 1749 expand => 1,
1545 text => "Server List", 1750 text => "Server List",
1546 other => $METASERVER, 1751 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1752 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1753 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1754 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1755 );
1551 }#d# 1756 }#d#
1552 } 1757 }
1553 1758
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1759 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1760 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1761 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1762 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1763 tooltip => "This is the size of the portion of the map update the server sends you. "
1559 . "If you set this to a high value you will be able to see further, " 1764 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1765 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1766 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1767 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1768 );
1564 1769
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1770 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1771 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1772 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1773 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1774 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1775 . "default will be used, which is usually around 100kb/s. Most servers will "
1583sub client_setup { 1788sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1789 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1790
1586 my $row = 0; 1791 my $row = 0;
1587 1792
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1793 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1589 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1590 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1797 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1798 on_changed => sub {
1593 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
1595 0 1801 0
1596 } 1802 }
1597 ); 1803 );
1598 1804
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1806 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1807 c_colspan => 2,
1601 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1809 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1810 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1811 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1812 on_changed => sub {
1606 my ($self, $value) = @_; 1813 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1815 0
1609 }, 1816 },
1817 );
1818
1819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1820 $table->add_at (1, $row, new DC::UI::CheckBox
1821 state => $CFG->{config_autosave},
1822 tooltip => "Normally, configuration settings and the user interface layout "
1823 . "are saved on client exit. You can disable this behaviour by "
1824 . "unchecking this checkbox.",
1825 on_changed => sub {
1826 my ($self, $value) = @_;
1827 $CFG->{config_autosave} = $value;
1828 0
1829 }
1830 );
1831 $table->add_at (2, $row++, new DC::UI::Button
1832 text => "Save Now",
1833 tooltip => "Use this to manually save configuration and UI layout when "
1834 . "autosave is disabled.",
1835 on_activate => sub {
1836 DC::write_cfg;
1837 0
1838 }
1610 ); 1839 );
1611 1840
1612 $table 1841 $table
1613} 1842}
1614 1843
1622 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1623 ); 1852 );
1624 1853
1625 for ( 1854 for (
1626 ["General", 0, 0, 1855 ["General", 0, 0,
1627 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1628 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1629 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1630 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1631 ], 1859 ],
1632 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1633 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
1659 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1887 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1660 ["Ignore cursed" => PICKUP_NOT_CURSED], 1888 ["Ignore cursed" => PICKUP_NOT_CURSED],
1661 ["Jewelery" => PICKUP_JEWELS], 1889 ["Jewelery" => PICKUP_JEWELS],
1662 ["Flesh" => PICKUP_FLESH], 1890 ["Flesh" => PICKUP_FLESH],
1663 ], 1891 ],
1664 ["Weight/Value ratio", 2, 17] 1892 ["Value/Weight ratio", 2, 17]
1665 ) 1893 )
1666 { 1894 {
1667 my ($title, $x, $y, @bits) = @$_; 1895 my ($title, $x, $y, @bits) = @$_;
1668 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1896 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1669 1897
1681 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1682 } else { 1910 } else {
1683 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1684 } 1912 }
1685 1913
1686 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1687 if defined $::CONN; 1915 if defined $::CONN;
1688 1916
1689 0 1917 0
1690 }); 1918 });
1691 1919
1694 } 1922 }
1695 1923
1696 $table->add_at (2, 18, new DC::UI::ValSlider 1924 $table->add_at (2, 18, new DC::UI::ValSlider
1697 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1925 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1698 template => ">= 99", 1926 template => ">= 99",
1927 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1699 to_value => sub { ">= " . 5 * $_[0] }, 1928 to_value => sub { ">= " . 5 * $_[0] },
1700 on_changed => sub { 1929 on_changed => sub {
1701 my ($slider, $value) = @_; 1930 my ($slider, $value) = @_;
1702 1931
1703 $::CFG->{pickup} &= ~0xF; 1932 $::CFG->{pickup} &= ~0xF;
1707 }); 1936 });
1708 1937
1709 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1710 text => "set", 1939 text => "set",
1711 on_activate => sub { 1940 on_activate => sub {
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1942 if defined $::CONN;
1714 0 1943 0
1715 }); 1944 });
1716 1945
1717 $r 1946 $r
1718} 1947}
1719 1948
1720my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1721 type => undef, 1950 type => sub {
1951 use sort 'stable';
1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1953 },
1722 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1723 my $NOW = time; 1956 my $NOW = time;
1724 sort { 1957 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1958 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1726 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1959 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1727 1960
1728 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1729 or $btime <=> $atime 1962 or $btime <=> $atime
1730 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1731 } @_ 1964 } @_
1732 }, 1965 },
1733 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1734 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1735 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1736 } @_ }, 1971 } @_
1972 },
1737); 1973);
1738 1974
1739sub inventory_widget { 1975sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1977
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1978 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1979 $vb1->add (new DC::UI::Label text => "Player");
1744 1980
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1981 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1982
1747 use sort 'stable'; 1983 use sort 'stable';
1748 1984
1757 $::CFG->{inv_sort} = $_[1]; 1993 $::CFG->{inv_sort} = $_[1];
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1994 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1995 },
1760 ); 1996 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1997 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1998 #TODO# update to weight/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1999 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 2000
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2001 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 2002 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 2003 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 2004
1828 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1829 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1830 } 2066 }
1831} 2067}
1832 2068
1833sub player_window { 2069sub make_playerbook {
1834 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1835 x => "center", 2071 x => "center",
1836 y => "center", 2072 y => "center",
1837 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1838 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
1872 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
1873 2109
1874 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
1875 2111
1876 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
1877 $plwin
1878} 2113}
1879 2114
1880sub keyboard_setup { 2115sub keyboard_setup {
1881 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
1882} 2117}
1883 2118
1884sub help_window { 2119sub make_help_window {
1885 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
1886 x => 'center', 2121 x => 'center',
1887 y => 'center', 2122 y => 'center',
1888 z => 4, 2123 z => 4,
1889 name => 'doc_browser', 2124 name => 'doc_browser',
1948 my @path = DC::Pod::full_path_of $node; 2183 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2184 pop @path; # drop current node
1950 2185
1951 for my $node (@path) { 2186 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2187 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2188 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2189 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 2190 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2191 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2192 $load_node->($node);
1958 }, 2193 },
1959 ); 2194 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2195 $buttons->add (new DC::UI::Label text => "/");
1961 } 2196 }
1962 2197
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2198 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 2199
1965 $curnode = $node; 2200 $curnode = $node;
1966 2201
1967 $viewer->clear; 2202 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2203 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1978 2213
1979 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
1980 $win->show; 2215 $win->show;
1981 }; 2216 };
1982 2217
1983 $win 2218 $HELP_WINDOW = $win;
1984}
1985
1986sub open_string_query {
1987 my ($title, $cb, $txt, $tooltip) = @_;
1988 my $dialog = new DC::UI::Toplevel
1989 x => "center",
1990 y => "center",
1991 z => 50,
1992 force_w => $WIDTH * 4/5,
1993 title => $title;
1994
1995 $dialog->add (
1996 my $e = new DC::UI::Entry
1997 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1998 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1999 tooltip => $tooltip
2000 );
2001
2002 $e->grab_focus;
2003 $e->set_text ($txt) if $txt;
2004 $dialog->show;
2005} 2219}
2006 2220
2007sub open_quit_dialog { 2221sub open_quit_dialog {
2008 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2009 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
2031 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2245 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2032 ); 2246 );
2033 $hb->add (new DC::UI::Button 2247 $hb->add (new DC::UI::Button
2034 text => "Quit anyway", 2248 text => "Quit anyway",
2035 expand => 1, 2249 expand => 1,
2036 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2250 on_activate => sub {
2251 crash "Quit anyway";
2252 EV::unloop EV::UNLOOP_ALL;
2253 },
2037 ); 2254 );
2038 } 2255 }
2039 2256
2040 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2041 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2259}
2260
2261sub make_menubar {
2262 $MENUFRAME = new DC::UI::Toplevel
2263 border => 0,
2264 force_x => 0,
2265 force_y => 0,
2266 force_w => $::WIDTH,
2267 child => ($MENUBAR = new DC::UI::HBox),
2268 ;
2269
2270 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2271
2272 # 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
2273 make_gauge_window->show;
2274
2275# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2276# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2277
2278 make_playerbook;
2279
2280 $MENUPOPUP = DC::UI::Menu->new (items => [
2281 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2282 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2283 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2284 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2285 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2286 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2287 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2288 ["Quit…" , sub {
2289 if ($CONN) {
2290 open_quit_dialog;
2291 } else {
2292 EV::unloop EV::UNLOOP_ALL;
2293 }
2294 }],
2295 ]);
2296
2297 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2298 tooltip => "Shows the main menu",
2299 on_button_down => sub {
2300 my ($self, $ev) = @_;
2301 local $ev->{x} = 0;
2302 local $ev->{y} = 0;
2303 $MENUPOPUP->popup ($ev);
2304 },
2305 );
2306
2307 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2308 padding_x => 6,
2309 padding_y => 3,
2310 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2311 template => " Exp: 888,888,888,888 (lvl 188) ",
2312 );
2313
2314 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2315 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2316 . "will automatically pick up items as defined by your item pickup settings "
2317 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2318 . "disable autopickup by disabling this checkbox.",
2319 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2320 on_changed => sub {
2321 my ($self, $value) = @_;
2322 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2323 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2324 $CONN->send_pickup ($CFG->{pickup})
2325 if $CONN;
2326 },
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2330 c_rescale => 1,
2331 padding_x => 6,
2332 padding_y => 3,
2333 force_w => $::WIDTH * 0.2,
2334 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2335 template => "two handed weapons 99%",
2336 );
2337
2338 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2339 expand => 1,
2340 align => 1, can_hover => 1, can_events => 1,
2341 text => "Range and Combat Slots",
2342 tooltip => "#stat_ranged",
2343 );
2344
2345 $MENUFRAME->show;
2346}
2347
2348sub open_string_query {
2349 my ($title, $cb, $txt, $tooltip) = @_;
2350 my $dialog = new DC::UI::Toplevel
2351 x => "center",
2352 y => "center",
2353 z => 50,
2354 force_w => $WIDTH * 4/5,
2355 title => $title;
2356
2357 $dialog->add (
2358 my $e = new DC::UI::Entry
2359 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2360 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2361 tooltip => $tooltip
2362 );
2363
2364 $e->grab_focus;
2365 $e->set_text ($txt) if $txt;
2366 $dialog->show;
2042} 2367}
2043 2368
2044sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2045 # find all tips 2370 # find all tips
2046 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2094 $dialog->show; 2419 $dialog->show;
2095 }; 2420 };
2096} 2421}
2097 2422
2098sub sdl_init { 2423sub sdl_init {
2099 DC::SDL_Init 2424 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2100 and die "SDL::Init failed!\n"; 2425 and die "SDL::Init failed!\n";
2101} 2426}
2102 2427
2103sub video_init { 2428sub video_init {
2429 DC::set_theme $CFG->{uitheme};
2430
2431 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2432 $SDL_REINIT = 0;
2433
2434 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2435 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2436 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2437 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2438
2439 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2440
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2441 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2442 $CFG->{sdl_mode} = 0; # lowest resolution by default
2443
2444 # now choose biggest mode <= 1024x768
2445 for (0 .. $#SDL_MODES) {
2446 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2447 $CFG->{sdl_mode} = $_;
2448 }
2449 }
2450 }
2105 2451
2106 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2452 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2107 2453
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2454 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2455 $FULLSCREEN = $CFG->{fullscreen};
2110 $FAST = $CFG->{fast}; 2456 $FAST = $CFG->{fast};
2111 2457
2458 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2112 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2459 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2460 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2113 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2461 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2114 2462
2115 $SDL_ACTIVE = 1; 2463 $SDL_ACTIVE = 1;
2116 $LAST_REFRESH = time - 0.01; 2464 $LAST_REFRESH = time - 0.01;
2117 2465
2147 force_x => "max", 2495 force_x => "max",
2148 force_y => 0; 2496 force_y => 0;
2149 $DEBUG_STATUS->show; 2497 $DEBUG_STATUS->show;
2150 2498
2151 $STATUSBOX = new DC::UI::Statusbox; 2499 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2500
2501 $MODBOX = new DC::UI::Label
2502 can_events => 1,
2503 can_hover => 1,
2504 markup => "",
2505 align => 0,
2506 font => $FONT_FIXED,
2507 tooltip => "#modifier_box",
2508 tooltip_width => 0.67,
2509 ;
2510
2511 update_modbox;
2153 2512
2154 (new DC::UI::Frame 2513 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2515 force_x => 0,
2157 force_y => "max", 2516 force_y => "max",
2158 child => $STATUSBOX, 2517 child => (my $LL = new DC::UI::VBox),
2159 )->show; 2518 )->show;
2519
2520 $LL->add ($STATUSBOX);
2521 $LL->add ($MODBOX);
2522 $LL->add (new DC::UI::Label
2523 align => 0,
2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2525 fontsize => 0.5,
2526 fg => [1, 1, 0, 0.7],
2527 );
2160 2528
2161 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2162 title => "Minimap", 2530 title => "Minimap",
2163 name => "mapmap", 2531 name => "mapmap",
2164 x => 0, 2532 x => 0,
2165 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2166 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2167 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2168 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2169 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2170 ), 2538 ),
2171 )->show; 2539 )->show;
2172 2540
2173 $MAPWIDGET = new DC::MapWidget; 2541 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2542 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2543 my ($mapwidget, $preset) = @_;
2176 2544
2177 $MESSAGE_WINDOW->activate_console ($preset) 2545 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2546 if $MESSAGE_DIST;
2179 }); 2547 });
2180 $MAPWIDGET->show; 2548 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2549 $MAPWIDGET->grab_focus;
2182 2550
2183 $COMPLETER = new DC::MapWidget::Command:: 2551 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2563 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2564 has_close_button => 1,
2197 ; 2565 ;
2198 2566
2199 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2568 # the name is changed to not conflict with the older name as users could have hidden it
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2570 name => "message_window2",
2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2573 force_w => $::WIDTH * 0.6,
2574 force_h => $::HEIGHT * 0.25,
2575 ;
2201 2576
2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2578
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2579 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2580 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2581
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2582 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2583 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2584 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2220 . "After pressing the combo the binding will be saved automatically and the " 2597 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2598 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2224 2601
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2226 2604
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2234
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237
2238 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2244 status "Configuration Saved";
2245 0
2246 },
2247 );
2248
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation");
2251
2252
2253 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit",
2255 tooltip => "Terminates the program",
2256 on_activate => sub {
2257 if ($CONN) {
2258 open_quit_dialog;
2259 } else {
2260 EV::unloop EV::UNLOOP_ALL;
2261 }
2262 0
2263 },
2264 );
2265
2266 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2269 } 2607 }
2270 2608
2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2611
2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2617
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2619}
2273 2620
2274sub video_shutdown { 2621sub video_shutdown {
2275 DC::OpenGL::shutdown; 2622 DC::OpenGL::shutdown;
2623 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2624
2277 undef $SDL_ACTIVE; 2625 undef $SDL_ACTIVE;
2278} 2626}
2279 2627
2280my %animate_object; 2628my %animate_object;
2294 $DC::UI::ROOT->draw; 2642 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2643 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2644 $LAST_REFRESH = $NOW;
2297} 2645}
2298 2646
2299my $want_refresh = EV::idle_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2648
2301my $input = EV::periodic 0, 1/60, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2650 $NOW = EV::now;
2303 2651
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2653 for DC::poll_events;
2306 2654
2307 if (%animate_object) { 2655 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
2321sub animation_stop { 2669sub animation_stop {
2322 my ($widget) = @_; 2670 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2324} 2672}
2325 2673
2326%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2675 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2329 }, 2677};
2330 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2331 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2333 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2334 }, 2681};
2335 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2684# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2689};
2343 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2692 # alt-enter
2693 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2695 video_init;
2349 } else { 2696 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2697 &DC::UI::feed_sdl_key_down_event;
2351 }
2352 }, 2698 }
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2699 update_modbox;
2700};
2701$SDL_CB[DC::SDL_KEYUP] = sub {
2702 &DC::UI::feed_sdl_key_up_event;
2703 update_modbox;
2704};
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2358 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2712 audio_music_finished;
2362 }
2363 }, 2713 }
2364); 2714};
2365 2715
2366############################################################################# 2716#############################################################################
2367 2717
2368$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2719 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2371}; 2721};
2372 2722
2373{ 2723# due to mac os x + sdl combined braindamage, we need this contortion
2724sub main {
2725 {
2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2727
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2729 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2730 } else {
2377 #TODO: compatibility cruft 2731 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2732 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2733 print STDERR "INFO: used old configuration file\n";
2380 } 2734 }
2381 2735
2382 DC::DB::Server::run; 2736 DC::DB::Server::run;
2383 2737
2738 if ($CFG->{db_schema} < 1) {
2739 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2740 DC::DB::nuke_db;
2741 $CFG->{db_schema} = 1;
2742 DC::write_cfg;
2743 }
2744
2745 DC::DB::open_db;
2746
2384 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2385 2748
2386 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2387 sdl_mode => 0, 2751 sdl_mode => undef,
2388 fullscreen => 1, 2752 fullscreen => 1,
2389 fast => 0, 2753 fast => 0,
2390 force_opengl11 => undef, 2754 force_opengl11 => undef,
2755 disable_alpha => 0,
2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2391 texture_compression => 1, 2758 texture_compression => 1,
2392 map_scale => 1, 2759 map_scale => 1,
2393 fow_enable => 1, 2760 fow_enable => 1,
2394 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2395 map_smoothing => 1, 2763 map_smoothing => 1,
2396 gui_fontsize => 1, 2764 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2767 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2768 stat_fontsize => 0.7,
2401 mapsize => 100, 2769 mapsize => 100,
2402 audio_enable => 1, 2770 audio_enable => 1,
2403 audio_hw_channels => 0, 2771 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2772 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2773 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2774 audio_mix_channels => 8,
2407 effects_enable => 1, 2775 effects_enable => 1,
2408 effects_volume => 1, 2776 effects_volume => 1,
2409 bgm_enable => 1, 2777 bgm_enable => 1,
2410 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2411 output_rate => "", 2779 output_rate => "",
2412 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2413 inv_sort => "mtime", 2781 inv_sort => "mtime",
2414 default => "profile", # default profile 2782 default => "profile", # default profile
2415 show_tips => 1, 2783 show_tips => 1,
2416 logview_max_par => 1000, 2784 logview_max_par => 1000,
2785 shift_fire_stop => 0,
2786 uitheme => "wood",
2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2417 ); 2789 );
2418 2790
2419 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2793 }
2422 2794
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2424 $PROFILE = $CFG->{profile}{default};
2425 2796
2426 # convert old bindings (only default profile matters) 2797 my $profile = 'default';
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2798
2428 while (my ($mod, $syms) = each %$bindings) { 2799 for (my $i = 0; $i < @args; $i++) {
2429 while (my ($sym, $cmds) = each %$syms) { 2800 if ($args[$i] =~ /^--?profile$/) {
2430 push @{ $PROFILE->{macro} }, { 2801 $profile = $args[$i + 1];
2431 accelkey => [$mod*1, $sym*1], 2802 splice @args, $i, 2, ();
2432 action => $cmds,
2433 }; 2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2434 } 2807 }
2435 } 2808 }
2436 }
2437 2809
2810 $CFG->{profile}{$profile} ||= {};
2811 $PROFILE = $CFG->{profile}{$profile};
2812 $PROFILE->{host} ||= "gameserver.deliantra.net";
2813
2814 $PROFILE->{host} = $args[0] if @args > 0;
2815 $PROFILE->{user} = $args[1] if @args > 1;
2816 $PROFILE->{password} = $args[2] if @args > 2;
2817
2818 # convert old bindings (only default profile matters)
2819 if (my $bindings = delete $PROFILE->{bindings}) {
2820 while (my ($mod, $syms) = each %$bindings) {
2821 while (my ($sym, $cmds) = each %$syms) {
2822 push @{ $PROFILE->{macro} }, {
2823 accelkey => [$mod*1, $sym*1],
2824 action => $cmds,
2825 };
2826 }
2827 }
2828 }
2829
2438 sdl_init; 2830 sdl_init;
2439 2831
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443 2834
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2835 {
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2837 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2458 ); 2846 );
2459 2847
2460 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2461
2462 DC::pango_init;
2463 2849
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2852
2467 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2468 } 2854
2855 DC::pango_init;
2856 }
2469 2857
2470# compare mono (ft) vs. rgba (cairo) 2858# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2859# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2860# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2861# my $t1 = Time::HiRes::time;
2478# } 2866# }
2479# my $t2 = Time::HiRes::time; 2867# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2868# warn $t2-$t1;
2481# } 2869# }
2482 2870
2483 video_init; 2871 video_init;
2484 audio_init; 2872 audio_init;
2485} 2873 }
2486 2874
2487show_tip_of_the_day if $CFG->{show_tips}; 2875 show_tip_of_the_day if $CFG->{show_tips};
2488 2876
2489our $STARTUP_CANCEL = EV::idle sub { 2877 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2878 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2879 $startup_done->();
2492}; 2880 };
2493 2881
2882 delete $SIG{__DIE__};
2494EV::loop; 2883 EV::loop;
2495 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2496#video_shutdown; 2887 #video_shutdown;
2497#audio_shutdown; 2888 #audio_shutdown;
2889
2498DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2499DC::SDL_Quit; 2891 DC::SDL_Quit;
2500DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2893}
2894
2895DC::SDL_braino; # see sub above
2501 2896
2502=head1 NAME 2897=head1 NAME
2503 2898
2504deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2505 2900
2506=head1 SYNOPSIS 2901=head1 SYNOPSIS
2507 2902
2508Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2509 2905
2510=head1 USAGE 2906=head1 USAGE
2511 2907
2512deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2908The deliantra client utilises OpenGL for all UI elements and the game. It
2513be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2514 2910
2515=head1 DEBUGGING 2911=head1 DEBUGGING
2516
2517 2912
2518CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2519 2914
2520 1 draw borders around widgets 2915 1 draw borders around widgets
2521 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips
2522 4 show fps 2917 4 show fps
2523 8 suppress tooltips 2918 8 suppress tooltips
2524 2919
2525=head1 AUTHOR 2920=head1 AUTHOR
2526 2921
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2922Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2923
2529 2924
2530 2925

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines