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.19 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.98 by root, Mon Dec 21 03:30:23 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines