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.99 by root, Tue Dec 22 00:35:44 2009 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 {
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # 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"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
86 last; 76 last;
87 } 77 }
88 } 78 }
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
93use AnyEvent::Util ();
94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
96
102use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
103 99
104use DC; 100use DC;
101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
105use DC::OpenGL (); 114use DC::OpenGL ();
106use DC::Protocol; 115use DC::Protocol;
107use DC::DB; 116use DC::DB;
108use DC::UI; 117use DC::UI;
109use DC::UI::Canvas; 118use DC::UI::Canvas;
110use DC::UI::Inventory; 119use DC::UI::Inventory;
111use DC::UI::SpellList; 120use DC::UI::SpellList;
112use DC::UI::Dockable; 121use DC::UI::Dockable;
113use DC::UI::MessageWindow; 122use DC::UI::Dockbar;
114use DC::UI::ChatView; 123use DC::UI::ChatView;
124use DC::MessageDistributor;
115use DC::Pod; 125use DC::Pod;
116use DC::MapWidget; 126use DC::MapWidget;
117use DC::Macro; 127use DC::Macro;
118 128
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
121 131
122$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
123 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
124}; 135};
125 136
126my $MAX_FPS = 60; 137my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
128 140
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 142
131our $LAST_REFRESH; 143our $LAST_REFRESH;
132our $NOW; 144our $NOW;
133 145
134our $CFG; 146our $CFG;
135our $CONN;
136our $PROFILE; # current profile 147our $PROFILE; # current profile
137our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
138 149
139our $WANT_REFRESH; 150our $WANT_REFRESH;
140 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
141our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
142our $WIDTH; 157our $WIDTH;
143our $HEIGHT; 158our $HEIGHT;
144our $FULLSCREEN; 159our $FULLSCREEN;
145our $FONTSIZE; 160our $FONTSIZE;
146 161
147our $FONT_PROP; 162our $FONT_PROP;
148our $FONT_FIXED; 163our $FONT_FIXED;
149 164
165our $CONN;
166
150our $MAP; 167our $MAP;
151our $MAPMAP; 168our $MAPMAP;
152our $MAPWIDGET; 169our $MAPWIDGET;
153our $COMPLETER; 170our $COMPLETER;
154our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
155our $METASERVER; 175our $METASERVER;
156our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
157our $QUIT_DIALOG; 177our $QUIT_DIALOG;
158our $HOST_ENTRY; 178our $HOST_ENTRY;
159our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
179our $SPELL_PAGE; 199our $SPELL_PAGE;
180our $SPELL_LIST; 200our $SPELL_LIST;
181 201
182our $HELP_WINDOW; 202our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 203our $MESSAGE_WINDOW;
204our $MESSAGE_DIST;
184our $FLOORBOX; 205our $FLOORBOX;
185our $GAUGES; 206our $GAUGES;
186our $STATWIDS; 207our $STATWIDS;
187 208
188our $SDL_ACTIVE; 209our $SDL_ACTIVE;
189our %SDL_CB; 210our @SDL_CB;
190 211
191our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 213our $STATUSBOX;
214our $MODBOX;
193our $DEBUG_STATUS; 215our $DEBUG_STATUS;
194 216
195our $INV; 217our $INV;
196our $INVR; 218our $INVR;
197our $INVR_HB; 219our $INVR_HB;
198 220
199############################################################################# 221#############################################################################
200 222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
260
261#############################################################################
262
201sub status { 263sub status {
202 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
203} 265}
204 266
205sub debug { 267sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 268 $DEBUG_STATUS->set_text ($_[0]);
207} 269}
208 270
209sub message { 271sub message {
210 $MESSAGE_WINDOW->message (@_); 272 $MESSAGE_DIST->message (@_);
273}
274
275sub update_modbox {
276 my $mod = DC::SDL_GetModState;
277
278 my $markup;
279
280 $markup .= $mod & DC::KMOD_CTRL
281 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
282 : "[<span foreground='#888'> once </span>]";
283
284 $markup .= $mod & DC::KMOD_SHIFT
285 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
286 : "[<span foreground='#888'>move</span>]";
287
288 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
289 ? "[ALT]"
290 : "[<span foreground='#888'>alt</span>]";
291
292 $markup .= $mod & DC::KMOD_NUM
293 ? "[NUM]"
294 : "[<span foreground='#888'>num</span>]";
295
296 # <tt> around next statement works around some bug that keeps the
297 # "font =>" from being used on windows
298 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 299}
212 300
213############################################################################# 301#############################################################################
214#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
215 303
258 or return; 346 or return;
259 347
260 $meta->{data} 348 $meta->{data}
261 or return; 349 or return;
262 350
263 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
264 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
265 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
266 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
267 &audio_music_push ($face); 355 &audio_music_push ($face);
268 } 356 }
269 } else { 357 } else {
270 # fetch from database 358 # fetch from database
271 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
272 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
273 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
274 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
275 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
276 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
277 365
278 audio_sound_push ($face); 366 audio_sound_push ($face);
279 }; 367 };
326 414
327 audio_music_update_volume; 415 audio_music_update_volume;
328 416
329 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
330 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
331 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
332 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
333 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
334 425
335 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
336 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
337 428
338 my $NOW = time; 429 my $NOW = time;
339 430
340 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
341 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
459 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
460 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
461 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
462 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
463 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
464 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
465 undef $SDL_MIXER; 558 undef $SDL_MIXER;
466} 559}
467 560
468############################################################################# 561#############################################################################
635 # right: accept 728 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 729 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 730 text => "Accept",
638 on_activate => sub { 731 on_activate => sub {
639 $conn->send ("reply n"); 732 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 733 destroy_query_dialog $conn;
642 0 734 0
643 }, 735 },
644 ); 736 );
645 737
654 [Cha => CS_STAT_CHA], 746 [Cha => CS_STAT_CHA],
655 ) { 747 ) {
656 my ($name, $id) = @$_; 748 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 749 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 750 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 751 expand => 1,
661 can_events => 1, 752 can_events => 1,
662 can_hover => 1, 753 can_hover => 1,
663 tooltip => "#stat_$name", 754 tooltip => "#stat_$name",
664 ); 755 );
698 789
699 $vbox->add (@dialog); 790 $vbox->add (@dialog);
700 $dialog->show; 791 $dialog->show;
701} 792}
702 793
703sub start_game { 794sub dc_connect {
704 status "logging in..."; 795 my ($host, $port) = @_;
705 796
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; 797 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
798 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
710 799
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 800 $CONN =
716 new DC::Protocol 801 new DC::Protocol
717 host => $host, 802 host => $host,
718 port => $port || 13327, 803 port => $port,
719 user => $PROFILE->{user}, 804 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 805 pass => $PROFILE->{password},
721 mapw => $mapsize, 806 mapw => $mapw,
722 maph => $mapsize, 807 maph => $maph,
723 808
724 client => "cfplus $DC::VERSION $] $^O", 809 client => "$DC::VERSION $] $^O",
725 810
726 map_widget => $MAPWIDGET, 811 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 812 statusbox => $STATUSBOX,
728 map => $MAP, 813 map => $MAP,
729 mapmap => $MAPMAP, 814 mapmap => $MAPMAP,
730 query => \&server_query, 815 query => \&server_query,
731 816
732 setup_req => { 817 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 818 smoothing => $CFG->{map_smoothing}*1,
734 }, 819 },
735 };
736 820
737 if ($CONN) { 821 on_connect => sub {
822 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
739 824
740 status "login successful"; 825 status "successfully connected to the server";
826 } else {
827 undef $CONN;
828 status "unable to connect: $!";
829 stop_game();
830 }
831 },
832 ;
833}
834
835sub start_game {
836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
841
842 $LOGIN_BUTTON->set_text ("Logout");
843 $SETUP_DIALOG->hide;
844
845 $MAP = new DC::Map;
846
847 # hack to make SURE we find the IP address all right
848 # can be removed once AnyEvent::DNS is proven stable.
849 if ($host eq "gameserver.deliantra.net") {
850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
855 status "dns failure, using hardcoded address";
856 $host = "129.13.162.95";
857 }
858 }
859
860 dc_connect $host, $port;
861 };
741 } else { 862 } else {
742 status "unable to connect"; 863 dc_connect $host, $port;
743 stop_game();
744 } 864 }
745} 865}
746 866
747sub stop_game { 867sub stop_game {
868 crash "stop_game";
869
748 $LOGIN_BUTTON->set_text ("Login / Register"); 870 $LOGIN_BUTTON->set_text ("Login / Register");
749 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 871 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
750 $SETUP_DIALOG->show; 872 $SETUP_DIALOG->show;
751 $PL_WINDOW->hide; 873 $PL_WINDOW->hide;
752 $SPELL_LIST->clear_spells; 874 $SPELL_LIST->clear_spells;
766} 888}
767 889
768sub graphics_setup { 890sub graphics_setup {
769 my $vbox = new DC::UI::VBox; 891 my $vbox = new DC::UI::VBox;
770 892
893 {
894 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
895
771 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 896 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 897
773 my $row = 0; 898 my $row = 0;
774 899
775 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 900 $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, 901 $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, 902 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 903 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 904
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
906 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
907 can_events => 1,
908 tooltip => "This field shows any known issues with your config or driver, such as "
909 . "a non-accelerated display format. You can try to work around these issues "
910 . "by selecting a different video mode, changing the settings below or "
911 . "by installing the right driver for your graphics card.");
912
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
914 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
915 value => $CFG->{uitheme},
916 options => [
917 [wood => "Wood (the default)"],
918 [plain => "Plain (very)"],
919 [blue => "Blue (dark)"],
920 [metal => "Metal (light)"],
921 ],
922 tooltip => "Choose the User Interface theme that you like most :)",
923 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
924 );
925
780 my $vidmode_tooltip = 926 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 927 "<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>."; 928 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 929
784 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 930 $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); 931 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 932
787 $hbox->add (my $mode_slider = new DC::UI::Slider 933 $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], 934 c_rescale => 1,
935 force_w => $WIDTH * 0.1, expand => 1,
936 range => [ ($CFG->{sdl_mode}) x 3 ],
789 tooltip => $vidmode_tooltip); 937 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 938 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 939 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 940 can_events => 1, tooltip => $vidmode_tooltip);
793 941
794 $mode_slider->connect (changed => sub { 942 $MODE_SLIDER->connect (changed => sub {
795 my ($self, $value) = @_; 943 my ($self, $value) = @_;
796 944
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 945 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 946 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 947 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 948 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
801 949
802 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 950 $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 951 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 952 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 953 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 954 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 955 );
808 956
809 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 957 $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 958 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 959 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 960 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 " 961 . "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. " 962 . "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, " 963 . "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 " 964 . "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>", 965 . "<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 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 967 );
820 968
821 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
822 $table->add_at (1, $row++, new DC::UI::CheckBox 970 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{disable_alpha},
972 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
973 . "by disabling a number of textures and transparency effects. Normally, these "
974 . "effects do not cost a lot of resources, but some graphics cards might fall "
975 . "back to extremely slow rendering if this is enabled. If disabling this option "
976 . "noticably improves the framerate of the client please report this! "
977 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
978 on_changed => sub {
979 my ($self, $value) = @_;
980 $CFG->{disable_alpha} = $value;
981 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
982 0
983 }
984 );
985
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
987 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 988 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 989 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 " 990 . "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 " 991 . "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.", 992 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 993 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 994 );
830 995
831 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 997 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 998 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 999 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 1001 );
837 1002
838 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1005 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.", 1006 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 }, 1007 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 1008 );
844 1009
845 $table->add_at (1, $row++, new DC::UI::Button 1010 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 1011 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 1012 tooltip => "Apply the video settings above.",
848 on_activate => sub { 1013 on_activate => sub {
849 video_shutdown (); 1014 video_shutdown ();
850 video_init (); 1015 video_init ();
1016 0
851 0 1017 }
852 } 1018 );
1019 }
1020
1021 {
1022 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1023
1024 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1025
1026 my $row = 0;
1027 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1028 $table->add_at (1, $row++, new DC::UI::CheckBox
1029 state => $CFG->{smooth_movement},
1030 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1032 . "then disable this option. Changes take effect immdiately.",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
853 ); 1034 );
854 1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1045
855 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 1051 );
861 1052
862 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 1054 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 1055 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1056 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. " 1057 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 1058 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 1060 );
870 1061
871 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1062 $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 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 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 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 1067 );
877 1068
1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1070 $table->add_at (1, $row++, new DC::UI::ImageButton
1071 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1072 bg => [0.3, 0.3, 0.2],
1073 force_w => 64,
1074 force_h => 64,
1075 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.",
1076 on_activate => sub {
1077 my ($self) = @_;
1078 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1079 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1080 }
1081 );
1082
878 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1083 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new DC::UI::Slider 1084 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1085 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.", 1086 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 } 1087 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 1088 );
884 1089
885 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1090 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new DC::UI::Slider 1091 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1092 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, " 1093 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.", 1094 . "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 }, 1095 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 1096 );
892 1097
893 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1100 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.", 1101 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 1102 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 1103 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 1104 &set_gauge_window_fontsize;
1105 0
900 0 1106 }
901 } 1107 );
902 );
903 1108
904 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1109 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new DC::UI::Slider 1110 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 1111 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1112 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 1113 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 1114 $CFG->{gauge_size} = $_[1];
910 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1115 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1116 0
911 0 1117 }
912 } 1118 );
913 ); 1119 }
914 1120
915 $vbox 1121 $vbox
916} 1122}
917 1123
918our $AUDIO_HW_CHUNKSIZE; 1124our $AUDIO_HW_CHUNKSIZE;
943 1149
944 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1150 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 1151
946 my $row = 0; 1152 my $row = 0;
947 1153
948 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1154 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1155 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1156 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.", 1157 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 } 1158 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1159 );
954 1160
955 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1161 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1162 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1163 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1164 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 1165 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1166 $CFG->{effects_enable} = $_[1];
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1173 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.", 1174 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1175 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1176 );
971 1177
972 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1178 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1179 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1180 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1181 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1182 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1183 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1190 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1191 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1192 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1193 );
988 1194
989 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1195 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new DC::UI::Selector 1196 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1197 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1198 value => $CFG->{audio_hw_frequency},
993 options => [ 1199 options => [
994 [ 0, "default" , "Use System Default"], 1200 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1209 audio_tab_update;
1004 1 1210 1
1005 } 1211 }
1006 ); 1212 );
1007 1213
1008 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1214 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1215 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1216 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1217 value => $CFG->{audio_hw_channels},
1012 options => [ 1218 options => [
1013 [0, "default" , "Use System Default"], 1219 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1228 audio_tab_update;
1023 1 1229 1
1024 } 1230 }
1025 ); 1231 );
1026 1232
1027 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1233 $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 1234 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1235 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1236 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 " 1237 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.", 1238 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1242 1
1037 } 1243 }
1038 ); 1244 );
1039 1245
1040 # should really be a slider 1246 # should really be a slider
1041 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1247 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1248 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1249 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.", 1250 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], 1251 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1252 template => ">= 99",
1052 1; 1258 1;
1053 } 1259 }
1054 ); 1260 );
1055 1261
1056 $table->add_at (1, $row++, new DC::UI::Button 1262 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1263 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1264 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1265 on_activate => sub {
1060 audio_shutdown (); 1266 audio_shutdown ();
1061 audio_init (); 1267 audio_init ();
1062 0 1268 0
1081} 1287}
1082 1288
1083sub make_gauge_window { 1289sub make_gauge_window {
1084 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1290 my $gh = int $HEIGHT * $CFG->{gauge_size};
1085 1291
1086 my $win = new DC::UI::Frame ( 1292 $GAUGES->{win} = my $win = new DC::UI::Frame (
1087 force_x => 0, 1293 force_x => 0,
1088 force_y => "max", 1294 force_y => "max",
1089 force_w => $WIDTH, 1295 force_w => $WIDTH,
1090 force_h => $gh, 1296 force_h => $gh,
1091 ); 1297 );
1107 (new DC::UI::Empty expand => 1), 1313 (new DC::UI::Empty expand => 1),
1108 (my $hb = new DC::UI::HBox), 1314 (my $hb = new DC::UI::HBox),
1109 ], 1315 ],
1110 ); 1316 );
1111 1317
1112 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1318 $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"); 1319 $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"); 1320 $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"); 1321 $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 1322
1128 &set_gauge_window_fontsize; 1323 &set_gauge_window_fontsize;
1129 1324
1130 $win 1325 $win
1131} 1326}
1141 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1336 $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"); 1337 $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 }); 1338 $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() } ); 1339 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1340
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1341 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1342
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1343 $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); 1344 $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); 1345 $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); 1346 $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); 1347 $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"); 1348 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1349
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1350 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1351
1157 $c->add_items ({ 1352 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1386 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1387 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1388 child => (my $pi = new DC::UI::VBox),
1194 ); 1389 );
1195 1390
1196 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1391 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1392 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."); 1393 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, 1394 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1395 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1396 tooltip => "The map you are currently on (if supported by the server).");
1202 1397
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1398 $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, 1399 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1400 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1401 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, 1402 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1403 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1404 tooltip => "The weight limit: you cannot carry more than this.");
1210 1405
1211 $vb->add (new DC::UI::FancyFrame 1406 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1407 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1428 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1429 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1430 my ($col, $row, $id, $label, $template) = @$_;
1236 1431
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1432 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1433 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1434 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1435 $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, 1436 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1437 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1438 }
1244 1439
1245 $vb->add (new DC::UI::FancyFrame 1440 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1441 label => "Resistancies",
1247 child => (my $tbl2 = new DC::UI::Table expand => 1), 1442 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1443 );
1249 1444
1250 my $row = 0; 1445 my $row = 0;
1251 my $col = 0; 1446 my $col = 0;
1252 1447
1291 1486
1292 for (qw/slow holyw conf fire depl magic 1487 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1488 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1489 blind fear tund elec cold ghit/)
1295 { 1490 {
1296 $tbl2->add_at ($col, $row, 1491 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1492 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1493 new DC::UI::Label
1299 font => $FONT_FIXED, 1494 font => $FONT_FIXED,
1300 template => "-100%", 1495 template => "-100%",
1301 align => +1, 1496 align => 1,
1302 valign => 0,
1303 can_events => 1, 1497 can_events => 1,
1304 can_hover => 1, 1498 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1499 tooltip => $resist_names{$_}->[1],
1306 ); 1500 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1501 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1503 can_hover => 1,
1310 can_events => 1, 1504 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1505 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1506 tooltip => $resist_names{$_}->[1],
1313 ); 1507 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1508 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1509 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1510 font => $FONT_FIXED,
1511 align => 1,
1317 can_hover => 1, 1512 can_hover => 1,
1318 can_events => 1, 1513 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1514 tooltip => $resist_names{$_}->[1],
1320 ); 1515 );
1321 1516
1322 $row++; 1517 $row++;
1323 if ($row % 6 == 0) { 1518 if ($row % 6 == 0) {
1324 $col += 3; 1519 $col += 4;
1325 $row = 0; 1520 $row = 0;
1326 } 1521 }
1327 } 1522 }
1328 1523
1329 #update_stats_window ({}); 1524 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1570 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1571 "Short information about this server provided by its admins.",
1377 ); 1572 );
1378 my @col = qw(#Users Host Uptime Version Description); 1573 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1574 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1575 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1576 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1577 for 0 .. $#col;
1384 1578
1385 my @align = qw(1 0 1 1 -1); 1579 my @align = qw(1 0.5 1 1 0);
1386 1580
1387 my $y = 0; 1581 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1582 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1583 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1584 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1471 $vbox->add (new DC::UI::FancyFrame 1665 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1666 label => "Login Settings",
1473 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1667 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1668 );
1475 1669
1476 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1670 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new DC::UI::Entry 1671 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1672 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1673 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 } 1674 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1675 );
1482 1676
1483 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1677 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new DC::UI::Entry 1678 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1679 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1680 hidden => 1,
1487 tooltip => "The password for your character.", 1681 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1682 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1683 );
1490 1684
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1685 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1686 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1687 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1688 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1689 on_activate => sub {
1497 $CONN ? stop_game 1690 $CONN ? stop_game
1498 : start_game; 1691 : start_game;
1499 1 1692 1
1500 }, 1693 },
1501 ); 1694 );
1502 1695
1503 $vbox->add (new DC::UI::FancyFrame 1696 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1697 label => "How to Play",
1505 min_h => 200, 1698 min_h => 240,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1699 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1700 markup =>
1701 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1702 . "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 " 1703 . "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.", 1704 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1705 ),
1511 ); 1706 );
1512 1707
1513 $vbox 1708 $vbox
1521 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1716 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1717 );
1523 1718
1524 my $row = 0; 1719 my $row = 0;
1525 1720
1526 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1721 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1722 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1723 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1724
1530 $vbox->add ( 1725 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1726 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1727 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1728 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1729 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1730 on_changed => sub {
1536 my ($self, $value) = @_; 1731 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1732 $CFG->{profile}{default}{host} = $value;
1538 1 1733 1
1539 } 1734 }
1542 if (0) { #d# disabled 1737 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1738 $vbox->add (new DC::UI::Button
1544 expand => 1, 1739 expand => 1,
1545 text => "Server List", 1740 text => "Server List",
1546 other => $METASERVER, 1741 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1742 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1743 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1744 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1745 );
1551 }#d# 1746 }#d#
1552 } 1747 }
1553 1748
1554 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1749 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new DC::UI::Slider 1750 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1751 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1752 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1753 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, " 1754 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1755 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1756 . "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 }, 1757 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1758 );
1564 1759
1565 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1760 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new DC::UI::Entry 1761 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1762 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1763 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1764 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1765 . "default will be used, which is usually around 100kb/s. Most servers will "
1583sub client_setup { 1778sub client_setup {
1584 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1779 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1780
1586 my $row = 0; 1781 my $row = 0;
1587 1782
1588 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1783 $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 1784 $table->add_at (1, $row++, new DC::UI::CheckBox
1785 c_colspan => 2,
1590 state => $CFG->{show_tips}, 1786 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1787 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1788 on_changed => sub {
1593 my ($self, $value) = @_; 1789 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1790 $CFG->{show_tips} = $value;
1595 0 1791 0
1596 } 1792 }
1597 ); 1793 );
1598 1794
1599 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1795 $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 1796 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1797 c_colspan => 2,
1601 text => $CFG->{logview_max_par}, 1798 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1799 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 " 1800 . "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.", 1801 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1802 on_changed => sub {
1606 my ($self, $value) = @_; 1803 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1804 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1805 0
1609 }, 1806 },
1807 );
1808
1809 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1810 $table->add_at (1, $row, new DC::UI::CheckBox
1811 state => $CFG->{config_autosave},
1812 tooltip => "Normally, configuration settings and the user interface layout "
1813 . "are saved on client exit. You can disable this behaviour by "
1814 . "unchecking this checkbox.",
1815 on_changed => sub {
1816 my ($self, $value) = @_;
1817 $CFG->{config_autosave} = $value;
1818 0
1819 }
1820 );
1821 $table->add_at (2, $row++, new DC::UI::Button
1822 text => "Save Now",
1823 tooltip => "Use this to manually save configuration and UI layout when "
1824 . "autosave is disabled.",
1825 on_activate => sub {
1826 DC::write_cfg;
1827 0
1828 }
1610 ); 1829 );
1611 1830
1612 $table 1831 $table
1613} 1832}
1614 1833
1622 col_expand => [0, 1, 0, 1], 1841 col_expand => [0, 1, 0, 1],
1623 ); 1842 );
1624 1843
1625 for ( 1844 for (
1626 ["General", 0, 0, 1845 ["General", 0, 0,
1627 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1628 ["Inhibit autopickup" => PICKUP_INHIBIT], 1846# ["Inhibit autopickup" => PICKUP_INHIBIT],
1629 ["Stop before pickup" => PICKUP_STOP], 1847 ["Stop before pickup" => PICKUP_STOP],
1630 ["Debug autopickup" => PICKUP_DEBUG], 1848 ["Debug autopickup" => PICKUP_DEBUG],
1631 ], 1849 ],
1632 ["Weapons", 0, 6, 1850 ["Weapons", 0, 6,
1633 ["All weapons" => PICKUP_ALLWEAPON], 1851 ["All weapons" => PICKUP_ALLWEAPON],
1659 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1877 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1660 ["Ignore cursed" => PICKUP_NOT_CURSED], 1878 ["Ignore cursed" => PICKUP_NOT_CURSED],
1661 ["Jewelery" => PICKUP_JEWELS], 1879 ["Jewelery" => PICKUP_JEWELS],
1662 ["Flesh" => PICKUP_FLESH], 1880 ["Flesh" => PICKUP_FLESH],
1663 ], 1881 ],
1664 ["Weight/Value ratio", 2, 17] 1882 ["Value/Weight ratio", 2, 17]
1665 ) 1883 )
1666 { 1884 {
1667 my ($title, $x, $y, @bits) = @$_; 1885 my ($title, $x, $y, @bits) = @$_;
1668 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1886 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1669 1887
1681 $::CFG->{pickup} |= $mask; 1899 $::CFG->{pickup} |= $mask;
1682 } else { 1900 } else {
1683 $::CFG->{pickup} &= ~$mask; 1901 $::CFG->{pickup} &= ~$mask;
1684 } 1902 }
1685 1903
1686 $::CONN->send_command ("pickup $::CFG->{pickup}") 1904 $::CONN->send_pickup ($::CFG->{pickup})
1687 if defined $::CONN; 1905 if defined $::CONN;
1688 1906
1689 0 1907 0
1690 }); 1908 });
1691 1909
1694 } 1912 }
1695 1913
1696 $table->add_at (2, 18, new DC::UI::ValSlider 1914 $table->add_at (2, 18, new DC::UI::ValSlider
1697 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1915 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1698 template => ">= 99", 1916 template => ">= 99",
1917 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] }, 1918 to_value => sub { ">= " . 5 * $_[0] },
1700 on_changed => sub { 1919 on_changed => sub {
1701 my ($slider, $value) = @_; 1920 my ($slider, $value) = @_;
1702 1921
1703 $::CFG->{pickup} &= ~0xF; 1922 $::CFG->{pickup} &= ~0xF;
1707 }); 1926 });
1708 1927
1709 $table->add_at (3, 18, new DC::UI::Button 1928 $table->add_at (3, 18, new DC::UI::Button
1710 text => "set", 1929 text => "set",
1711 on_activate => sub { 1930 on_activate => sub {
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1931 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1932 if defined $::CONN;
1714 0 1933 0
1715 }); 1934 });
1716 1935
1717 $r 1936 $r
1718} 1937}
1719 1938
1720my %SORT_ORDER = ( 1939my %SORT_ORDER = (
1721 type => undef, 1940 type => sub {
1941 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1942 },
1722 mtime => sub { 1943 mtime => sub {
1723 my $NOW = time; 1944 my $NOW = time;
1724 sort { 1945 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1946 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; 1947 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1738 1959
1739sub inventory_widget { 1960sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1961 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1962
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1963 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1964 $vb1->add (new DC::UI::Label text => "Player");
1744 1965
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1966 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1967
1747 use sort 'stable'; 1968 use sort 'stable';
1748 1969
1757 $::CFG->{inv_sort} = $_[1]; 1978 $::CFG->{inv_sort} = $_[1];
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1979 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1980 },
1760 ); 1981 );
1761 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1982 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1983 #TODO# update to weight/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1984 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1985
1765 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1986 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1987 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1988 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1989
1828 $PL_NOTEBOOK->set_current_page ($widget); 2049 $PL_NOTEBOOK->set_current_page ($widget);
1829 $PL_WINDOW->show; 2050 $PL_WINDOW->show;
1830 } 2051 }
1831} 2052}
1832 2053
1833sub player_window { 2054sub make_playerbook {
1834 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2055 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1835 x => "center", 2056 x => "center",
1836 y => "center", 2057 y => "center",
1837 force_w => $WIDTH * 9/10, 2058 force_w => $WIDTH * 9/10,
1838 force_h => $HEIGHT * 9/10, 2059 force_h => $HEIGHT * 9/10,
1872 "License, Author and Source info for media sent by the server."); 2093 "License, Author and Source info for media sent by the server.");
1873 2094
1874 $ntb->set_current_page ($INVENTORY_PAGE); 2095 $ntb->set_current_page ($INVENTORY_PAGE);
1875 2096
1876 $plwin->add ($ntb); 2097 $plwin->add ($ntb);
1877 $plwin
1878} 2098}
1879 2099
1880sub keyboard_setup { 2100sub keyboard_setup {
1881 DC::Macro::keyboard_setup 2101 DC::Macro::keyboard_setup
1882} 2102}
1883 2103
1884sub help_window { 2104sub make_help_window {
1885 my $win = new DC::UI::Toplevel 2105 my $win = new DC::UI::Toplevel
1886 x => 'center', 2106 x => 'center',
1887 y => 'center', 2107 y => 'center',
1888 z => 4, 2108 z => 4,
1889 name => 'doc_browser', 2109 name => 'doc_browser',
1948 my @path = DC::Pod::full_path_of $node; 2168 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2169 pop @path; # drop current node
1950 2170
1951 for my $node (@path) { 2171 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2172 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2173 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2174 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 2175 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2176 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2177 $load_node->($node);
1958 }, 2178 },
1959 ); 2179 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2180 $buttons->add (new DC::UI::Label text => "/");
1961 } 2181 }
1962 2182
1963 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2183 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 2184
1965 $curnode = $node; 2185 $curnode = $node;
1966 2186
1967 $viewer->clear; 2187 $viewer->clear;
1968 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2188 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1978 2198
1979 $load_node->((DC::Pod::find @path)[0]); 2199 $load_node->((DC::Pod::find @path)[0]);
1980 $win->show; 2200 $win->show;
1981 }; 2201 };
1982 2202
1983 $win 2203 $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} 2204}
2006 2205
2007sub open_quit_dialog { 2206sub open_quit_dialog {
2008 unless ($QUIT_DIALOG) { 2207 unless ($QUIT_DIALOG) {
2009 $QUIT_DIALOG = new DC::UI::Toplevel 2208 $QUIT_DIALOG = new DC::UI::Toplevel
2031 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2230 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2032 ); 2231 );
2033 $hb->add (new DC::UI::Button 2232 $hb->add (new DC::UI::Button
2034 text => "Quit anyway", 2233 text => "Quit anyway",
2035 expand => 1, 2234 expand => 1,
2036 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2235 on_activate => sub {
2236 crash "Quit anyway";
2237 EV::unloop EV::UNLOOP_ALL;
2238 },
2037 ); 2239 );
2038 } 2240 }
2039 2241
2040 $QUIT_DIALOG->show; 2242 $QUIT_DIALOG->show;
2041 $QUIT_DIALOG->grab_focus; 2243 $QUIT_DIALOG->grab_focus;
2244}
2245
2246sub make_menubar {
2247 $MENUFRAME = new DC::UI::Toplevel
2248 border => 0,
2249 force_x => 0,
2250 force_y => 0,
2251 force_w => $::WIDTH,
2252 child => ($MENUBAR = new DC::UI::HBox),
2253 ;
2254
2255 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2256
2257 # 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
2258 make_gauge_window->show;
2259
2260# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2261# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2262
2263 make_playerbook;
2264
2265 $MENUPOPUP = DC::UI::Menu->new (items => [
2266 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2267 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2268 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2269 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2270 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2271 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2272 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2273 ["Quit…" , sub {
2274 if ($CONN) {
2275 open_quit_dialog;
2276 } else {
2277 EV::unloop EV::UNLOOP_ALL;
2278 }
2279 }],
2280 ]);
2281
2282 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2283 tooltip => "Shows the main menu",
2284 on_button_down => sub {
2285 my ($self, $ev) = @_;
2286 local $ev->{x} = 0;
2287 local $ev->{y} = 0;
2288 $MENUPOPUP->popup ($ev);
2289 },
2290 );
2291
2292 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2293 padding_x => 6,
2294 padding_y => 3,
2295 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2296 template => " Exp: 888,888,888,888 (lvl 188) ",
2297 );
2298
2299 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2300 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2301 . "will automatically pick up items as defined by your item pickup settings "
2302 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2303 . "disable autopickup by disabling this checkbox.",
2304 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2305 on_changed => sub {
2306 my ($self, $value) = @_;
2307 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2308 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2309 $CONN->send_pickup ($CFG->{pickup})
2310 if $CONN;
2311 },
2312 );
2313
2314 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2315 c_rescale => 1,
2316 padding_x => 6,
2317 padding_y => 3,
2318 force_w => $::WIDTH * 0.2,
2319 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2320 template => "two handed weapons 99%",
2321 );
2322
2323 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2324 expand => 1,
2325 align => 1, can_hover => 1, can_events => 1,
2326 text => "Range and Combat Slots",
2327 tooltip => "#stat_ranged",
2328 );
2329
2330 $MENUFRAME->show;
2331}
2332
2333sub open_string_query {
2334 my ($title, $cb, $txt, $tooltip) = @_;
2335 my $dialog = new DC::UI::Toplevel
2336 x => "center",
2337 y => "center",
2338 z => 50,
2339 force_w => $WIDTH * 4/5,
2340 title => $title;
2341
2342 $dialog->add (
2343 my $e = new DC::UI::Entry
2344 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2345 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2346 tooltip => $tooltip
2347 );
2348
2349 $e->grab_focus;
2350 $e->set_text ($txt) if $txt;
2351 $dialog->show;
2042} 2352}
2043 2353
2044sub show_tip_of_the_day { 2354sub show_tip_of_the_day {
2045 # find all tips 2355 # find all tips
2046 my @tod = DC::Pod::find tip_of_the_day => "*"; 2356 my @tod = DC::Pod::find tip_of_the_day => "*";
2094 $dialog->show; 2404 $dialog->show;
2095 }; 2405 };
2096} 2406}
2097 2407
2098sub sdl_init { 2408sub sdl_init {
2099 DC::SDL_Init 2409 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2100 and die "SDL::Init failed!\n"; 2410 and die "SDL::Init failed!\n";
2101} 2411}
2102 2412
2103sub video_init { 2413sub video_init {
2414 DC::set_theme $CFG->{uitheme};
2415
2416 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2417 $SDL_REINIT = 0;
2418
2419 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2420 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2421 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2422 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2423
2424 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2425
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2426 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2427 $CFG->{sdl_mode} = 0; # lowest resolution by default
2428
2429 # now choose biggest mode <= 1024x768
2430 for (0 .. $#SDL_MODES) {
2431 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2432 $CFG->{sdl_mode} = $_;
2433 }
2434 }
2435 }
2105 2436
2106 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2437 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2107 2438
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2439 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2440 $FULLSCREEN = $CFG->{fullscreen};
2110 $FAST = $CFG->{fast}; 2441 $FAST = $CFG->{fast};
2111 2442
2443 # 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 2444 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2445 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2113 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2446 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2114 2447
2115 $SDL_ACTIVE = 1; 2448 $SDL_ACTIVE = 1;
2116 $LAST_REFRESH = time - 0.01; 2449 $LAST_REFRESH = time - 0.01;
2117 2450
2147 force_x => "max", 2480 force_x => "max",
2148 force_y => 0; 2481 force_y => 0;
2149 $DEBUG_STATUS->show; 2482 $DEBUG_STATUS->show;
2150 2483
2151 $STATUSBOX = new DC::UI::Statusbox; 2484 $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]); 2485
2486 $MODBOX = new DC::UI::Label
2487 can_events => 1,
2488 can_hover => 1,
2489 markup => "",
2490 align => 0,
2491 font => $FONT_FIXED,
2492 tooltip => "#modifier_box",
2493 tooltip_width => 0.67,
2494 ;
2495
2496 update_modbox;
2153 2497
2154 (new DC::UI::Frame 2498 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2499 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2500 force_x => 0,
2157 force_y => "max", 2501 force_y => "max",
2158 child => $STATUSBOX, 2502 child => (my $LL = new DC::UI::VBox),
2159 )->show; 2503 )->show;
2504
2505 $LL->add ($STATUSBOX);
2506 $LL->add ($MODBOX);
2507 $LL->add (new DC::UI::Label
2508 align => 0,
2509 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2510 fontsize => 0.5,
2511 fg => [1, 1, 0, 0.7],
2512 );
2160 2513
2161 DC::UI::Toplevel->new ( 2514 DC::UI::Toplevel->new (
2162 title => "Minimap", 2515 title => "Minimap",
2163 name => "mapmap", 2516 name => "mapmap",
2164 x => 0, 2517 x => 0,
2165 y => $FONTSIZE + 8, 2518 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2166 border_bg => [1, 1, 1, 192/255], 2519 border_bg => [1, 1, 1, 192/255],
2167 bg => [1, 1, 1, 0], 2520 bg => [1, 1, 1, 0],
2168 child => ($MAPMAP = new DC::MapWidget::MapMap 2521 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.", 2522 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2170 ), 2523 ),
2171 )->show; 2524 )->show;
2172 2525
2173 $MAPWIDGET = new DC::MapWidget; 2526 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2527 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2528 my ($mapwidget, $preset) = @_;
2176 2529
2177 $MESSAGE_WINDOW->activate_console ($preset) 2530 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2531 if $MESSAGE_DIST;
2179 }); 2532 });
2180 $MAPWIDGET->show; 2533 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2534 $MAPWIDGET->grab_focus;
2182 2535
2183 $COMPLETER = new DC::MapWidget::Command:: 2536 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2548 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2549 has_close_button => 1,
2197 ; 2550 ;
2198 2551
2199 $METASERVER = metaserver_dialog; 2552 $METASERVER = metaserver_dialog;
2553 # the name is changed to not conflict with the older name as users could have hidden it
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2554 $MESSAGE_WINDOW = new DC::UI::Dockbar
2555 name => "message_window2",
2556 title => 'Messages',
2557 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2558 force_w => $::WIDTH * 0.6,
2559 force_h => $::HEIGHT * 0.25,
2560 ;
2201 2561
2562 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2563
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2564 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2565 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2566
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2567 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2568 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2569 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2220 . "After pressing the combo the binding will be saved automatically and the " 2582 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2583 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2584 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2585 "Some debuggin' options. Do not ask.");
2224 2586
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2587 make_help_window;
2588 make_menubar;
2226 2589
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; 2590 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2591 $MESSAGE_WINDOW->show;
2269 } 2592 }
2270 2593
2594 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2595 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2596
2597 $CAVEAT_LABEL->set_text ("None :)");
2598 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2599 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2600 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2601 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2602
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2603 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2604}
2273 2605
2274sub video_shutdown { 2606sub video_shutdown {
2275 DC::OpenGL::shutdown; 2607 DC::OpenGL::shutdown;
2608 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2609
2277 undef $SDL_ACTIVE; 2610 undef $SDL_ACTIVE;
2278} 2611}
2279 2612
2280my %animate_object; 2613my %animate_object;
2294 $DC::UI::ROOT->draw; 2627 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2628 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2629 $LAST_REFRESH = $NOW;
2297} 2630}
2298 2631
2299my $want_refresh = EV::idle_ns \&force_refresh; 2632my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2633
2301my $input = EV::periodic 0, 1/60, undef, sub { 2634my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2635 $NOW = EV::now;
2303 2636
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2637 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2638 for DC::poll_events;
2306 2639
2307 if (%animate_object) { 2640 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2641 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2642 $WANT_REFRESH = 1;
2321sub animation_stop { 2654sub animation_stop {
2322 my ($widget) = @_; 2655 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2656 delete $animate_object{$widget};
2324} 2657}
2325 2658
2326%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2659$SDL_CB[DC::SDL_QUIT] = sub {
2660 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2661 EV::unloop EV::UNLOOP_ALL;
2329 }, 2662};
2330 DC::SDL_VIDEORESIZE => sub { 2663$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2331 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2664$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2333 DC::UI::full_refresh; 2665 DC::UI::full_refresh;
2334 }, 2666};
2335 DC::SDL_ACTIVEEVENT => sub { 2667$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2668# 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# 2669# 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# 2670# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2671# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2672# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2673# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2674};
2343 DC::SDL_KEYDOWN => sub { 2675$SDL_CB[DC::SDL_KEYDOWN] = sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2676 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2677 # alt-enter
2678 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2679 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2680 video_init;
2349 } else { 2681 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2682 &DC::UI::feed_sdl_key_down_event;
2351 }
2352 }, 2683 }
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2684 update_modbox;
2685};
2686$SDL_CB[DC::SDL_KEYUP] = sub {
2687 &DC::UI::feed_sdl_key_up_event;
2688 update_modbox;
2689};
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2690$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2691$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2692$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2693$SDL_CB[DC::SDL_USEREVENT] = sub {
2358 if ($_[0]{code} == 1) { 2694 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2695 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2696 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2697 audio_music_finished;
2362 }
2363 }, 2698 }
2364); 2699};
2365 2700
2366############################################################################# 2701#############################################################################
2367 2702
2368$SIG{INT} = $SIG{TERM} = sub { 2703$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2704 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2705 #d# TODO calling exit here hangs the process in some futex
2371}; 2706};
2372 2707
2373{ 2708# due to mac os x + sdl combined braindamage, we need this contortion
2709sub main {
2710 {
2711 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2712
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2713 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2714 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2715 } else {
2377 #TODO: compatibility cruft 2716 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2717 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2718 print STDERR "INFO: used old configuration file\n";
2380 } 2719 }
2381 2720
2382 DC::DB::Server::run; 2721 DC::DB::Server::run;
2383 2722
2723 if ($CFG->{db_schema} < 1) {
2724 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2725 DC::DB::nuke_db;
2726 $CFG->{db_schema} = 1;
2727 DC::write_cfg;
2728 }
2729
2730 DC::DB::open_db;
2731
2384 DC::UI::set_layout ($::CFG->{layout}); 2732 DC::UI::set_layout ($::CFG->{layout});
2385 2733
2386 my %DEF_CFG = ( 2734 my %DEF_CFG = (
2735 config_autosave => 1,
2387 sdl_mode => 0, 2736 sdl_mode => undef,
2388 fullscreen => 1, 2737 fullscreen => 1,
2389 fast => 0, 2738 fast => 0,
2390 force_opengl11 => undef, 2739 force_opengl11 => undef,
2740 disable_alpha => 0,
2741 smooth_movement => 1,
2742 smooth_transitions => 1,
2391 texture_compression => 1, 2743 texture_compression => 1,
2392 map_scale => 1, 2744 map_scale => 1,
2393 fow_enable => 1, 2745 fow_enable => 1,
2394 fow_intensity => 0, 2746 fow_intensity => 0,
2747 fow_texture => 0,
2395 map_smoothing => 1, 2748 map_smoothing => 1,
2396 gui_fontsize => 1, 2749 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2750 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2751 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2752 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2753 stat_fontsize => 0.7,
2401 mapsize => 100, 2754 mapsize => 100,
2402 audio_enable => 1, 2755 audio_enable => 1,
2403 audio_hw_channels => 0, 2756 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2757 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2758 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2759 audio_mix_channels => 8,
2407 effects_enable => 1, 2760 effects_enable => 1,
2408 effects_volume => 1, 2761 effects_volume => 1,
2409 bgm_enable => 1, 2762 bgm_enable => 1,
2410 bgm_volume => 0.5, 2763 bgm_volume => 0.5,
2411 output_rate => "", 2764 output_rate => "",
2412 pickup => 0, 2765 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2413 inv_sort => "mtime", 2766 inv_sort => "mtime",
2414 default => "profile", # default profile 2767 default => "profile", # default profile
2415 show_tips => 1, 2768 show_tips => 1,
2416 logview_max_par => 1000, 2769 logview_max_par => 1000,
2770 shift_fire_stop => 0,
2771 uitheme => "wood",
2772 map_shift_x => -24, # arbitrary
2773 map_shift_y => +24, # arbitrary
2417 ); 2774 );
2418 2775
2419 while (my ($k, $v) = each %DEF_CFG) { 2776 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2777 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2778 }
2422 2779
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2780 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2781 $PROFILE = $CFG->{profile}{default};
2425 2782
2426 # convert old bindings (only default profile matters) 2783 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2784 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2785 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2786 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2787 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2788 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2789 action => $cmds,
2790 };
2433 }; 2791 }
2434 } 2792 }
2435 } 2793 }
2436 }
2437 2794
2438 sdl_init; 2795 sdl_init;
2439 2796
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2797 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2798 $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 2799
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2800 {
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2801 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2802 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2803 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2804 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2805 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2806 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2807 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2808 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2809 DejaVuSansMono-BoldOblique.ttf
2810 mona.ttf
2458 ); 2811 );
2459 2812
2460 DC::add_font $_ for @fonts; 2813 DC::add_font $_ for @fonts;
2461 2814
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2815 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2816 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2817
2467 $FONT_PROP->make_default; 2818 $FONT_PROP->make_default;
2468 } 2819
2820 DC::pango_init;
2821 }
2469 2822
2470# compare mono (ft) vs. rgba (cairo) 2823# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2824# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2825# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2826# my $t1 = Time::HiRes::time;
2478# } 2831# }
2479# my $t2 = Time::HiRes::time; 2832# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2833# warn $t2-$t1;
2481# } 2834# }
2482 2835
2483 video_init; 2836 video_init;
2484 audio_init; 2837 audio_init;
2485} 2838 }
2486 2839
2487show_tip_of_the_day if $CFG->{show_tips}; 2840 show_tip_of_the_day if $CFG->{show_tips};
2488 2841
2489our $STARTUP_CANCEL = EV::idle sub { 2842 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2843 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2844 $startup_done->();
2492}; 2845 };
2493 2846
2847 delete $SIG{__DIE__};
2494EV::loop; 2848 EV::loop;
2495 2849
2850 DC::write_cfg if $CFG->{config_autosave};
2851
2496#video_shutdown; 2852 #video_shutdown;
2497#audio_shutdown; 2853 #audio_shutdown;
2854
2498DC::OpenGL::quit; 2855 DC::OpenGL::quit;
2499DC::SDL_Quit; 2856 DC::SDL_Quit;
2500DC::DB::Server::stop; 2857 DC::DB::Server::stop;
2858}
2859
2860DC::SDL_braino; # see sub above
2501 2861
2502=head1 NAME 2862=head1 NAME
2503 2863
2504deliantra - A Deliantra MORPG game client 2864deliantra - A Deliantra MORPG game client
2505 2865
2522 4 show fps 2882 4 show fps
2523 8 suppress tooltips 2883 8 suppress tooltips
2524 2884
2525=head1 AUTHOR 2885=head1 AUTHOR
2526 2886
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2887Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2888
2529 2889
2530 2890

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines