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.102 by elmex, Sat Mar 20 00:50:06 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines