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.43 by root, Wed May 21 23:35:55 2008 UTC vs.
Revision 1.94 by root, Sun Mar 29 22:28:13 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"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
… …
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; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 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::Dockbar; 122use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 123use DC::UI::ChatView;
116use DC::MessageDistributor; 124use DC::MessageDistributor;
117use DC::Pod; 125use DC::Pod;
118use DC::MapWidget; 126use DC::MapWidget;
119use DC::Macro; 127use DC::Macro;
120 128
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
123 131
124$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
126}; 135};
127 136
128my $MAX_FPS = 60; 137my $MAX_FPS = 60;
129 138
… …
131 140
132our $LAST_REFRESH; 141our $LAST_REFRESH;
133our $NOW; 142our $NOW;
134 143
135our $CFG; 144our $CFG;
136our $CONN;
137our $PROFILE; # current profile 145our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 147
140our $WANT_REFRESH; 148our $WANT_REFRESH;
141 149
150our $MODE_SLIDER;
151our $CAVEAT_LABEL;
152
142our @SDL_MODES; 153our @SDL_MODES;
154our $SDL_REINIT = 1;
143our $WIDTH; 155our $WIDTH;
144our $HEIGHT; 156our $HEIGHT;
145our $FULLSCREEN; 157our $FULLSCREEN;
146our $FONTSIZE; 158our $FONTSIZE;
147 159
148our $FONT_PROP; 160our $FONT_PROP;
149our $FONT_FIXED; 161our $FONT_FIXED;
150 162
163our $CONN;
164
151our $MAP; 165our $MAP;
152our $MAPMAP; 166our $MAPMAP;
153our $MAPWIDGET; 167our $MAPWIDGET;
154our $COMPLETER; 168our $COMPLETER;
155our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
156our $METASERVER; 173our $METASERVER;
157our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 175our $QUIT_DIALOG;
159our $HOST_ENTRY; 176our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
186our $FLOORBOX; 203our $FLOORBOX;
187our $GAUGES; 204our $GAUGES;
188our $STATWIDS; 205our $STATWIDS;
189 206
190our $SDL_ACTIVE; 207our $SDL_ACTIVE;
191our %SDL_CB; 208our @SDL_CB;
192 209
193our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 211our $STATUSBOX;
195our $MODBOX; 212our $MODBOX;
196our $DEBUG_STATUS; 213our $DEBUG_STATUS;
197 214
198our $INV; 215our $INV;
199our $INVR; 216our $INVR;
200our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
201 258
202############################################################################# 259#############################################################################
203 260
204sub status { 261sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
287 or return; 344 or return;
288 345
289 $meta->{data} 346 $meta->{data}
290 or return; 347 or return;
291 348
292 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
294 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 353 &audio_music_push ($face);
297 } 354 }
298 } else { 355 } else {
299 # fetch from database 356 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
303 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
306 363
307 audio_sound_push ($face); 364 audio_sound_push ($face);
308 }; 365 };
… …
355 412
356 audio_music_update_volume; 413 audio_music_update_volume;
357 414
358 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
359 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
360 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
361 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
362 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
363 423
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 426
367 my $NOW = time; 427 my $NOW = time;
368 428
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
725 785
726 $vbox->add (@dialog); 786 $vbox->add (@dialog);
727 $dialog->show; 787 $dialog->show;
728} 788}
729 789
730sub start_game { 790sub dc_connect {
731 status "logging in..."; 791 my ($host, $port) = @_;
732 792
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 793 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
794 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
737 795
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 796 $CONN =
743 local $SIG{__DIE__};
744
745 new DC::Protocol 797 new DC::Protocol
746 host => $host, 798 host => $host,
747 port => $port || 13327, 799 port => $port,
748 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
749 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
750 mapw => $mapsize, 802 mapw => $mapw,
751 maph => $mapsize, 803 maph => $maph,
752 804
753 client => "$DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
754 806
755 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
756 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
… …
759 query => \&server_query, 811 query => \&server_query,
760 812
761 setup_req => { 813 setup_req => {
762 smoothing => $CFG->{map_smoothing}*1, 814 smoothing => $CFG->{map_smoothing}*1,
763 }, 815 },
764 };
765 816
766 if ($CONN) { 817 on_connect => sub {
818 if ($_[0]) {
767 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
768 820
769 status "login successful"; 821 status "successfully connected to the server";
822 } else {
823 undef $CONN;
824 status "unable to connect: $!";
825 stop_game();
826 }
827 },
828 ;
829}
830
831sub start_game {
832 status "logging in...";
833
834 $LOGIN_BUTTON->set_text ("Logout");
835 $SETUP_DIALOG->hide;
836
837 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
838
839 $MAP = new DC::Map;
840
841 # hack to make SURE we find the IP address all right
842 # can be removed once AnyEvent::DNS is proven stable.
843 if ($host eq "gameserver.deliantra.net") {
844 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
845 if ($_[0] ne "80.101.114.108") { # Perl
846 status "dns failure, using hardcoded address";
847 $host = "129.13.162.95";
848 }
849
850 dc_connect $host, $port;
851 };
770 } else { 852 } else {
771 warn $@; 853 dc_connect $host, $port;
772 status "unable to connect";
773 stop_game();
774 } 854 }
775} 855}
776 856
777sub stop_game { 857sub stop_game {
858 crash "stop_game";
859
778 $LOGIN_BUTTON->set_text ("Login / Register"); 860 $LOGIN_BUTTON->set_text ("Login / Register");
779 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 861 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
780 $SETUP_DIALOG->show; 862 $SETUP_DIALOG->show;
781 $PL_WINDOW->hide; 863 $PL_WINDOW->hide;
782 $SPELL_LIST->clear_spells; 864 $SPELL_LIST->clear_spells;
… …
796} 878}
797 879
798sub graphics_setup { 880sub graphics_setup {
799 my $vbox = new DC::UI::VBox; 881 my $vbox = new DC::UI::VBox;
800 882
883 {
884 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
885
801 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 886 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
802 887
803 my $row = 0; 888 my $row = 0;
804 889
805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
806 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 891 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
807 can_events => 1, 892 can_events => 1,
808 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 893 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
809 894
895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
896 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
897 can_events => 1,
898 tooltip => "This field shows any known issues with your config or driver, such as "
899 . "a non-accelerated display format. You can try to work around these issues "
900 . "by selecting a different video mode, changing the settings below or "
901 . "by installing the right driver for your graphics card.");
902
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
904 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
905 value => $CFG->{uitheme},
906 options => [
907 [wood => "Wood (the default)"],
908 [plain => "Plain (very)"],
909 [blue => "Blue (dark)"],
910 [metal => "Metal (light)"],
911 ],
912 tooltip => "Choose the User Interface theme that you like most :)",
913 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
914 );
915
810 my $vidmode_tooltip = 916 my $vidmode_tooltip =
811 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 917 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
812 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 918 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
813 919
814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
815 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 921 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
816 922
817 $hbox->add (my $mode_slider = new DC::UI::Slider 923 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
818 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 924 c_rescale => 1,
925 force_w => $WIDTH * 0.1, expand => 1,
926 range => [ ($CFG->{sdl_mode}) x 3 ],
819 tooltip => $vidmode_tooltip); 927 tooltip => $vidmode_tooltip);
820 $hbox->add (my $mode_label = new DC::UI::Label 928 $hbox->add (my $mode_label = new DC::UI::Label
821 height => 0.8, template => "9999x9999@9+9", 929 height => 0.8, template => "9999x9999@9+9",
822 can_events => 1, tooltip => $vidmode_tooltip); 930 can_events => 1, tooltip => $vidmode_tooltip);
823 931
824 $mode_slider->connect (changed => sub { 932 $MODE_SLIDER->connect (changed => sub {
825 my ($self, $value) = @_; 933 my ($self, $value) = @_;
826 934
827 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 935 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
828 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 936 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
829 }); 937 });
830 $mode_slider->emit (changed => $mode_slider->{range}[0]); 938 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
831 939
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
833 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 941 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
834 state => $CFG->{fullscreen}, 942 state => $CFG->{fullscreen},
835 tooltip => "Bring the client into fullscreen mode.", 943 tooltip => "Bring the client into fullscreen mode.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 944 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
837 ); 945 );
838 946
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
840 $table->add_at (1, $row++, new DC::UI::CheckBox 948 $table->add_at (1, $row++, new DC::UI::CheckBox
841 state => $CFG->{force_opengl11}, 949 state => $CFG->{force_opengl11},
842 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 950 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
843 . "higher memory usage and slower performance. It will, however, help tremendously on " 951 . "higher memory usage and slower performance. It will, however, help tremendously on "
844 . "cards that claim to support a feature but fall back to software rendering. " 952 . "cards that claim to support a feature but fall back to software rendering. "
845 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 953 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
846 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 954 . "but cards and drivers from other vendors (ATI) are often just as bad. "
847 . "experience extremely low framerates and your card should do better, try this option.</b>", 955 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
849 ); 957 );
850 958
959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{disable_alpha},
962 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
963 . "by disabling a number of textures and transparency effects. Normally, these "
964 . "effects do not cost a lot of resources, but some graphics cards might fall "
965 . "back to extremely slow rendering if this is enabled. If disabling this option "
966 . "noticably improves the framerate of the client please report this! "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub {
969 my ($self, $value) = @_;
970 $CFG->{disable_alpha} = $value;
971 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
972 0
973 }
974 );
975
851 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
852 $table->add_at (1, $row++, new DC::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{texture_compression}, 978 state => $CFG->{texture_compression},
854 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 979 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
855 . "will save a lot of memory and increase performance. The compression algorithm " 980 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
856 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 981 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
857 . "forced OpenGL 1.1 mode.", 982 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 983 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
859 ); 984 );
860 985
861 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{fast}, 988 state => $CFG->{fast},
864 tooltip => "Lower the visual quality considerably to speed up rendering.", 989 tooltip => "Lower the visual quality considerably to speed up rendering.",
865 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
866 ); 991 );
867 992
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
869 $table->add_at (1, $row++, new DC::UI::Slider 994 $table->add_at (1, $row++, new DC::UI::Slider
870 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 995 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
871 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 996 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
872 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 997 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
873 ); 998 );
874 999
875 $table->add_at (1, $row++, new DC::UI::Button 1000 $table->add_at (1, $row++, new DC::UI::Button
876 expand => 1, text => "Apply", 1001 expand => 1, text => "Apply",
877 tooltip => "Apply the video settings above.", 1002 tooltip => "Apply the video settings above.",
878 on_activate => sub { 1003 on_activate => sub {
879 video_shutdown (); 1004 video_shutdown ();
880 video_init (); 1005 video_init ();
1006 0
881 0 1007 }
882 } 1008 );
1009 }
1010
1011 {
1012 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1013
1014 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1015
1016 my $row = 0;
1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1018 $table->add_at (1, $row++, new DC::UI::CheckBox
1019 state => $CFG->{smooth_movement},
1020 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1021 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1022 . "then disable this option. Changes take effect immdiately.",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
883 ); 1024 );
884 1025
885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
886 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1028 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
888 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1029 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
889 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
890 ); 1031 );
891 1032
892 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
893 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
894 state => $CFG->{map_smoothing}, 1035 state => $CFG->{map_smoothing},
895 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1036 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
896 . "This increases load on the graphics subsystem and works only with TRT servers. " 1037 . "This increases load on the graphics subsystem and works only with TRT servers. "
897 . "Changes take effect at next login only.", 1038 . "Changes take effect at next login only.",
898 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1039 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
899 ); 1040 );
900 1041
901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
902 $table->add_at (1, $row++, new DC::UI::CheckBox 1043 $table->add_at (1, $row++, new DC::UI::CheckBox
903 state => $CFG->{fow_enable}, 1044 state => $CFG->{fow_enable},
904 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1045 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
905 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1046 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
906 ); 1047 );
907 1048
908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
909 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
910 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1051 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
911 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1052 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
912 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
913 ); 1054 );
914 1055
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
916 $table->add_at (1, $row++, new DC::UI::Slider 1057 $table->add_at (1, $row++, new DC::UI::Slider
917 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1058 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
918 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1059 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
919 . "but you still need to press apply to correctly re-layout the widget.", 1060 . "but you still need to press apply to correctly re-layout the widget.",
920 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1061 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
921 ); 1062 );
922 1063
923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
924 $table->add_at (1, $row++, new DC::UI::Slider 1065 $table->add_at (1, $row++, new DC::UI::Slider
925 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1066 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
926 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1067 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
927 on_changed => sub { 1068 on_changed => sub {
928 $CFG->{gauge_fontsize} = $_[1]; 1069 $CFG->{gauge_fontsize} = $_[1];
929 &set_gauge_window_fontsize; 1070 &set_gauge_window_fontsize;
1071 0
930 0 1072 }
931 } 1073 );
932 );
933 1074
934 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1075 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
935 $table->add_at (1, $row++, new DC::UI::Slider 1076 $table->add_at (1, $row++, new DC::UI::Slider
936 range => [$CFG->{gauge_size}, 0.2, 0.8], 1077 range => [$CFG->{gauge_size}, 0.2, 0.8],
937 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1078 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
938 on_changed => sub { 1079 on_changed => sub {
939 $CFG->{gauge_size} = $_[1]; 1080 $CFG->{gauge_size} = $_[1];
940 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1081 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1082 0
941 0 1083 }
942 } 1084 );
943 ); 1085 }
944 1086
945 $vbox 1087 $vbox
946} 1088}
947 1089
948our $AUDIO_HW_CHUNKSIZE; 1090our $AUDIO_HW_CHUNKSIZE;
… …
1111} 1253}
1112 1254
1113sub make_gauge_window { 1255sub make_gauge_window {
1114 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1256 my $gh = int $HEIGHT * $CFG->{gauge_size};
1115 1257
1116 my $win = new DC::UI::Frame ( 1258 $GAUGES->{win} = my $win = new DC::UI::Frame (
1117 force_x => 0, 1259 force_x => 0,
1118 force_y => "max", 1260 force_y => "max",
1119 force_w => $WIDTH, 1261 force_w => $WIDTH,
1120 force_h => $gh, 1262 force_h => $gh,
1121 ); 1263 );
… …
1137 (new DC::UI::Empty expand => 1), 1279 (new DC::UI::Empty expand => 1),
1138 (my $hb = new DC::UI::HBox), 1280 (my $hb = new DC::UI::HBox),
1139 ], 1281 ],
1140 ); 1282 );
1141 1283
1142 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1284 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1143 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1285 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1144 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1286 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1145 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1287 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1146
1147 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1148 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1149 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1150 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1151
1152 $GAUGES = {
1153 exp => $exp, prg => $prg, sklprg => $sklprg,
1154 win => $win, range => $rng,
1155 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1156 };
1157 1288
1158 &set_gauge_window_fontsize; 1289 &set_gauge_window_fontsize;
1159 1290
1160 $win 1291 $win
1161} 1292}
… …
1503 ); 1634 );
1504 1635
1505 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1636 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1506 $table->add_at (1, 4, new DC::UI::Entry 1637 $table->add_at (1, 4, new DC::UI::Entry
1507 text => $CFG->{profile}{default}{user}, 1638 text => $CFG->{profile}{default}{user},
1508 tooltip => "The name of your character on the server.", 1639 tooltip => "The name of your character on the server. The name is case-sensitive!",
1509 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1640 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1510 ); 1641 );
1511 1642
1512 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1643 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1513 $table->add_at (1, 5, new DC::UI::Entry 1644 $table->add_at (1, 5, new DC::UI::Entry
… …
1527 1 1658 1
1528 }, 1659 },
1529 ); 1660 );
1530 1661
1531 $vbox->add (new DC::UI::FancyFrame 1662 $vbox->add (new DC::UI::FancyFrame
1532 label => "Registering", 1663 label => "How to Play",
1533 min_h => 200, 1664 min_h => 240,
1534 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1665 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1535 markup => 1666 markup =>
1667 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1668 . "Then register a new account (or use an existing one if you have one). "
1536 "To register a new account, choose a username that hasn't been taken yet and " 1669 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1537 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1670 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1538 ), 1671 ),
1539 ); 1672 );
1540 1673
1541 $vbox 1674 $vbox
… …
1613 1746
1614 my $row = 0; 1747 my $row = 0;
1615 1748
1616 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1749 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1617 $table->add_at (1, $row++, new DC::UI::CheckBox 1750 $table->add_at (1, $row++, new DC::UI::CheckBox
1751 c_colspan => 2,
1618 state => $CFG->{show_tips}, 1752 state => $CFG->{show_tips},
1619 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1753 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1620 on_changed => sub { 1754 on_changed => sub {
1621 my ($self, $value) = @_; 1755 my ($self, $value) = @_;
1622 $CFG->{show_tips} = $value; 1756 $CFG->{show_tips} = $value;
… …
1624 } 1758 }
1625 ); 1759 );
1626 1760
1627 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1628 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1763 c_colspan => 2,
1629 text => $CFG->{logview_max_par}, 1764 text => $CFG->{logview_max_par},
1630 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1631 . "sends more messages than this number, older messages get removed to save memory and " 1766 . "sends more messages than this number, older messages get removed to save memory and "
1632 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1633 on_changed => sub { 1768 on_changed => sub {
… …
1635 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1636 0 1771 0
1637 }, 1772 },
1638 ); 1773 );
1639 1774
1775 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1776 $table->add_at (1, $row, new DC::UI::CheckBox
1777 state => $CFG->{config_autosave},
1778 tooltip => "Normally, configuration settings and the user interface layout "
1779 . "are saved on client exit. You can disable this behaviour by "
1780 . "unchecking this checkbox.",
1781 on_changed => sub {
1782 my ($self, $value) = @_;
1783 $CFG->{config_autosave} = $value;
1784 0
1785 }
1786 );
1787 $table->add_at (2, $row++, new DC::UI::Button
1788 text => "Save Now",
1789 tooltip => "Use this to manually save configuration and UI layout when "
1790 . "autosave is disabled.",
1791 on_activate => sub {
1792 DC::write_cfg;
1793 0
1794 }
1795 );
1796
1640 $table 1797 $table
1641} 1798}
1642 1799
1643sub autopickup_setup { 1800sub autopickup_setup {
1644 my $r = new DC::UI::ScrolledWindow ( 1801 my $r = new DC::UI::ScrolledWindow (
… …
1650 col_expand => [0, 1, 0, 1], 1807 col_expand => [0, 1, 0, 1],
1651 ); 1808 );
1652 1809
1653 for ( 1810 for (
1654 ["General", 0, 0, 1811 ["General", 0, 0,
1655 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1656 ["Inhibit autopickup" => PICKUP_INHIBIT], 1812# ["Inhibit autopickup" => PICKUP_INHIBIT],
1657 ["Stop before pickup" => PICKUP_STOP], 1813 ["Stop before pickup" => PICKUP_STOP],
1658 ["Debug autopickup" => PICKUP_DEBUG], 1814 ["Debug autopickup" => PICKUP_DEBUG],
1659 ], 1815 ],
1660 ["Weapons", 0, 6, 1816 ["Weapons", 0, 6,
1661 ["All weapons" => PICKUP_ALLWEAPON], 1817 ["All weapons" => PICKUP_ALLWEAPON],
… …
1687 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1843 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1688 ["Ignore cursed" => PICKUP_NOT_CURSED], 1844 ["Ignore cursed" => PICKUP_NOT_CURSED],
1689 ["Jewelery" => PICKUP_JEWELS], 1845 ["Jewelery" => PICKUP_JEWELS],
1690 ["Flesh" => PICKUP_FLESH], 1846 ["Flesh" => PICKUP_FLESH],
1691 ], 1847 ],
1692 ["Weight/Value ratio", 2, 17] 1848 ["Value/Weight ratio", 2, 17]
1693 ) 1849 )
1694 { 1850 {
1695 my ($title, $x, $y, @bits) = @$_; 1851 my ($title, $x, $y, @bits) = @$_;
1696 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1852 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1697 1853
… …
1709 $::CFG->{pickup} |= $mask; 1865 $::CFG->{pickup} |= $mask;
1710 } else { 1866 } else {
1711 $::CFG->{pickup} &= ~$mask; 1867 $::CFG->{pickup} &= ~$mask;
1712 } 1868 }
1713 1869
1714 $::CONN->send_command ("pickup $::CFG->{pickup}") 1870 $::CONN->send_pickup ($::CFG->{pickup})
1715 if defined $::CONN; 1871 if defined $::CONN;
1716 1872
1717 0 1873 0
1718 }); 1874 });
1719 1875
… …
1722 } 1878 }
1723 1879
1724 $table->add_at (2, 18, new DC::UI::ValSlider 1880 $table->add_at (2, 18, new DC::UI::ValSlider
1725 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1881 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1726 template => ">= 99", 1882 template => ">= 99",
1883 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1727 to_value => sub { ">= " . 5 * $_[0] }, 1884 to_value => sub { ">= " . 5 * $_[0] },
1728 on_changed => sub { 1885 on_changed => sub {
1729 my ($slider, $value) = @_; 1886 my ($slider, $value) = @_;
1730 1887
1731 $::CFG->{pickup} &= ~0xF; 1888 $::CFG->{pickup} &= ~0xF;
… …
1735 }); 1892 });
1736 1893
1737 $table->add_at (3, 18, new DC::UI::Button 1894 $table->add_at (3, 18, new DC::UI::Button
1738 text => "set", 1895 text => "set",
1739 on_activate => sub { 1896 on_activate => sub {
1740 $::CONN->send_command ("pickup $::CFG->{pickup}") 1897 $::CONN->send_pickup ($::CFG->{pickup})
1741 if defined $::CONN; 1898 if defined $::CONN;
1742 0 1899 0
1743 }); 1900 });
1744 1901
1745 $r 1902 $r
… …
1787 $::CFG->{inv_sort} = $_[1]; 1944 $::CFG->{inv_sort} = $_[1];
1788 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1945 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1789 }, 1946 },
1790 ); 1947 );
1791 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1948 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1792 #TODO# update to weigh/maxweight 1949 #TODO# update to weight/maxweight
1793 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1950 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1794 1951
1795 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1952 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1796 $sw1->add ($INV = new DC::UI::Inventory); 1953 $sw1->add ($INV = new DC::UI::Inventory);
1797 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1954 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1858 $PL_NOTEBOOK->set_current_page ($widget); 2015 $PL_NOTEBOOK->set_current_page ($widget);
1859 $PL_WINDOW->show; 2016 $PL_WINDOW->show;
1860 } 2017 }
1861} 2018}
1862 2019
1863sub player_window { 2020sub make_playerbook {
1864 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2021 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1865 x => "center", 2022 x => "center",
1866 y => "center", 2023 y => "center",
1867 force_w => $WIDTH * 9/10, 2024 force_w => $WIDTH * 9/10,
1868 force_h => $HEIGHT * 9/10, 2025 force_h => $HEIGHT * 9/10,
… …
1902 "License, Author and Source info for media sent by the server."); 2059 "License, Author and Source info for media sent by the server.");
1903 2060
1904 $ntb->set_current_page ($INVENTORY_PAGE); 2061 $ntb->set_current_page ($INVENTORY_PAGE);
1905 2062
1906 $plwin->add ($ntb); 2063 $plwin->add ($ntb);
1907 $plwin
1908} 2064}
1909 2065
1910sub keyboard_setup { 2066sub keyboard_setup {
1911 DC::Macro::keyboard_setup 2067 DC::Macro::keyboard_setup
1912} 2068}
1913 2069
1914sub help_window { 2070sub make_help_window {
1915 my $win = new DC::UI::Toplevel 2071 my $win = new DC::UI::Toplevel
1916 x => 'center', 2072 x => 'center',
1917 y => 'center', 2073 y => 'center',
1918 z => 4, 2074 z => 4,
1919 name => 'doc_browser', 2075 name => 'doc_browser',
… …
2008 2164
2009 $load_node->((DC::Pod::find @path)[0]); 2165 $load_node->((DC::Pod::find @path)[0]);
2010 $win->show; 2166 $win->show;
2011 }; 2167 };
2012 2168
2013 $win 2169 $HELP_WINDOW = $win;
2014}
2015
2016sub open_string_query {
2017 my ($title, $cb, $txt, $tooltip) = @_;
2018 my $dialog = new DC::UI::Toplevel
2019 x => "center",
2020 y => "center",
2021 z => 50,
2022 force_w => $WIDTH * 4/5,
2023 title => $title;
2024
2025 $dialog->add (
2026 my $e = new DC::UI::Entry
2027 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2028 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2029 tooltip => $tooltip
2030 );
2031
2032 $e->grab_focus;
2033 $e->set_text ($txt) if $txt;
2034 $dialog->show;
2035} 2170}
2036 2171
2037sub open_quit_dialog { 2172sub open_quit_dialog {
2038 unless ($QUIT_DIALOG) { 2173 unless ($QUIT_DIALOG) {
2039 $QUIT_DIALOG = new DC::UI::Toplevel 2174 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2061 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2062 ); 2197 );
2063 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2064 text => "Quit anyway", 2199 text => "Quit anyway",
2065 expand => 1, 2200 expand => 1,
2066 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2067 ); 2205 );
2068 } 2206 }
2069 2207
2070 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2071 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
2210}
2211
2212sub make_menubar {
2213 $MENUFRAME = new DC::UI::Toplevel
2214 border => 0,
2215 force_x => 0,
2216 force_y => 0,
2217 force_w => $::WIDTH,
2218 child => ($MENUBAR = new DC::UI::HBox),
2219 ;
2220
2221 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2222
2223 # 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
2224 make_gauge_window->show;
2225
2226# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228
2229 make_playerbook;
2230
2231 $MENUPOPUP = DC::UI::Menu->new (items => [
2232 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2233 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2234 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2235 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2236 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2237 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2238 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2239 ["Quit…" , sub {
2240 if ($CONN) {
2241 open_quit_dialog;
2242 } else {
2243 EV::unloop EV::UNLOOP_ALL;
2244 }
2245 }],
2246 ]);
2247
2248 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2249 tooltip => "Shows the main menu",
2250 on_button_down => sub {
2251 my ($self, $ev) = @_;
2252 local $ev->{x} = 0;
2253 local $ev->{y} = 0;
2254 $MENUPOPUP->popup ($ev);
2255 },
2256 );
2257
2258 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2259 padding_x => 6,
2260 padding_y => 3,
2261 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2262 template => " Exp: 888,888,888,888 (lvl 188) ",
2263 );
2264
2265 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2266 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2267 . "will automatically pick up items as defined by your item pickup settings "
2268 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2269 . "disable autopickup by disabling this checkbox.",
2270 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2271 on_changed => sub {
2272 my ($self, $value) = @_;
2273 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2274 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2275 $CONN->send_pickup ($CFG->{pickup})
2276 if $CONN;
2277 },
2278 );
2279
2280 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2281 c_rescale => 1,
2282 padding_x => 6,
2283 padding_y => 3,
2284 force_w => $::WIDTH * 0.2,
2285 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2286 template => "two handed weapons 99%",
2287 );
2288
2289 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2290 expand => 1,
2291 align => 1, can_hover => 1, can_events => 1,
2292 text => "Range and Combat Slots",
2293 tooltip => "#stat_ranged",
2294 );
2295
2296 $MENUFRAME->show;
2297}
2298
2299sub open_string_query {
2300 my ($title, $cb, $txt, $tooltip) = @_;
2301 my $dialog = new DC::UI::Toplevel
2302 x => "center",
2303 y => "center",
2304 z => 50,
2305 force_w => $WIDTH * 4/5,
2306 title => $title;
2307
2308 $dialog->add (
2309 my $e = new DC::UI::Entry
2310 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2311 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2312 tooltip => $tooltip
2313 );
2314
2315 $e->grab_focus;
2316 $e->set_text ($txt) if $txt;
2317 $dialog->show;
2072} 2318}
2073 2319
2074sub show_tip_of_the_day { 2320sub show_tip_of_the_day {
2075 # find all tips 2321 # find all tips
2076 my @tod = DC::Pod::find tip_of_the_day => "*"; 2322 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2124 $dialog->show; 2370 $dialog->show;
2125 }; 2371 };
2126} 2372}
2127 2373
2128sub sdl_init { 2374sub sdl_init {
2129 DC::SDL_Init 2375 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2130 and die "SDL::Init failed!\n"; 2376 and die "SDL::Init failed!\n";
2131} 2377}
2132 2378
2133sub video_init { 2379sub video_init {
2380 DC::set_theme $CFG->{uitheme};
2381
2382 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2383 $SDL_REINIT = 0;
2384
2385 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2386 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2387 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2388 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2389
2390 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2391
2134 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2392 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2393 $CFG->{sdl_mode} = 0; # lowest resolution by default
2394
2395 # now choose biggest mode <= 1024x768
2396 for (0 .. $#SDL_MODES) {
2397 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2398 $CFG->{sdl_mode} = $_;
2399 }
2400 }
2401 }
2135 2402
2136 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2403 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2137 2404
2138 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2405 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2139 $FULLSCREEN = $CFG->{fullscreen}; 2406 $FULLSCREEN = $CFG->{fullscreen};
2140 $FAST = $CFG->{fast}; 2407 $FAST = $CFG->{fast};
2141 2408
2409 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2142 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2410 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2411 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2143 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2412 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2144 2413
2145 $SDL_ACTIVE = 1; 2414 $SDL_ACTIVE = 1;
2146 $LAST_REFRESH = time - 0.01; 2415 $LAST_REFRESH = time - 0.01;
2147 2416
… …
2194 2463
2195 (new DC::UI::Frame 2464 (new DC::UI::Frame
2196 bg => [0, 0, 0, 0.4], 2465 bg => [0, 0, 0, 0.4],
2197 force_x => 0, 2466 force_x => 0,
2198 force_y => "max", 2467 force_y => "max",
2199 child => (my $LR = new DC::UI::VBox), 2468 child => (my $LL = new DC::UI::VBox),
2200 )->show; 2469 )->show;
2201 2470
2202 $LR->add ($STATUSBOX); 2471 $LL->add ($STATUSBOX);
2203 $LR->add ($MODBOX); 2472 $LL->add ($MODBOX);
2204 $LR->add (new DC::UI::Label 2473 $LL->add (new DC::UI::Label
2205 align => 0, 2474 align => 0,
2206 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2475 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2207 fontsize => 0.5, 2476 fontsize => 0.5,
2208 fg => [1, 1, 0, 0.7], 2477 fg => [1, 1, 0, 0.7],
2209 ); 2478 );
2210 2479
2211 DC::UI::Toplevel->new ( 2480 DC::UI::Toplevel->new (
2212 title => "Minimap", 2481 title => "Minimap",
2213 name => "mapmap", 2482 name => "mapmap",
2214 x => 0, 2483 x => 0,
2215 y => $FONTSIZE + 8, 2484 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2216 border_bg => [1, 1, 1, 192/255], 2485 border_bg => [1, 1, 1, 192/255],
2217 bg => [1, 1, 1, 0], 2486 bg => [1, 1, 1, 0],
2218 child => ($MAPMAP = new DC::MapWidget::MapMap 2487 child => ($MAPMAP = new DC::MapWidget::MapMap
2219 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2488 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2220 ), 2489 ),
2221 )->show; 2490 )->show;
2222 2491
2223 $MAPWIDGET = new DC::MapWidget; 2492 $MAPWIDGET = new DC::MapWidget;
2224 $MAPWIDGET->connect (activate_console => sub { 2493 $MAPWIDGET->connect (activate_console => sub {
… …
2249 $METASERVER = metaserver_dialog; 2518 $METASERVER = metaserver_dialog;
2250 # the name is changed to not conflict with the older name as users could have hidden it 2519 # the name is changed to not conflict with the older name as users could have hidden it
2251 $MESSAGE_WINDOW = new DC::UI::Dockbar 2520 $MESSAGE_WINDOW = new DC::UI::Dockbar
2252 name => "message_window2", 2521 name => "message_window2",
2253 title => 'Messages', 2522 title => 'Messages',
2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2254 force_w => $::WIDTH * 0.6, 2524 force_w => $::WIDTH * 0.6,
2255 force_h => $::HEIGHT * 0.25, 2525 force_h => $::HEIGHT * 0.25,
2256 ; 2526 ;
2257 2527
2258 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2528 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2278 . "After pressing the combo the binding will be saved automatically and the " 2548 . "After pressing the combo the binding will be saved automatically and the "
2279 . "binding editor closes"); 2549 . "binding editor closes");
2280 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2550 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2281 "Some debuggin' options. Do not ask."); 2551 "Some debuggin' options. Do not ask.");
2282 2552
2283 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2553 make_help_window;
2554 make_menubar;
2284 2555
2285 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2286 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2287
2288# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2289# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2290
2291 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
2292
2293 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2294 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2295
2296 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Save Config",
2298 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2299 on_activate => sub {
2300 $::CFG->{layout} = DC::UI::get_layout;
2301 DC::write_cfg;
2302 status "Configuration Saved";
2303 0
2304 },
2305 );
2306
2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2308 tooltip => "View Documentation");
2309
2310 $BUTTONBAR->add (new DC::UI::Button
2311 text => "Quit",
2312 tooltip => "Terminates the program",
2313 on_activate => sub {
2314 if ($CONN) {
2315 open_quit_dialog;
2316 } else {
2317 EV::unloop EV::UNLOOP_ALL;
2318 }
2319 0
2320 },
2321 );
2322
2323 $BUTTONBAR->show;
2324 $SETUP_DIALOG->show; 2556 $SETUP_DIALOG->show;
2325 $MESSAGE_WINDOW->show; 2557 $MESSAGE_WINDOW->show;
2326 } 2558 }
2327 2559
2560 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2561 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2562
2563 $CAVEAT_LABEL->set_text ("None :)");
2564 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2565 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2566
2328 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2567 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2329} 2568}
2330 2569
2331sub video_shutdown { 2570sub video_shutdown {
2332 DC::OpenGL::shutdown; 2571 DC::OpenGL::shutdown;
2572 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2333 2573
2334 undef $SDL_ACTIVE; 2574 undef $SDL_ACTIVE;
2335} 2575}
2336 2576
2337my %animate_object; 2577my %animate_object;
… …
2356my $want_refresh = EV::prepare_ns \&force_refresh; 2596my $want_refresh = EV::prepare_ns \&force_refresh;
2357 2597
2358my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2598my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2359 $NOW = EV::now; 2599 $NOW = EV::now;
2360 2600
2361 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2601 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2362 for DC::poll_events; 2602 for DC::poll_events;
2363 2603
2364 if (%animate_object) { 2604 if (%animate_object) {
2365 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2605 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2366 $WANT_REFRESH = 1; 2606 $WANT_REFRESH = 1;
… …
2378sub animation_stop { 2618sub animation_stop {
2379 my ($widget) = @_; 2619 my ($widget) = @_;
2380 delete $animate_object{$widget}; 2620 delete $animate_object{$widget};
2381} 2621}
2382 2622
2383%SDL_CB = (
2384 DC::SDL_QUIT => sub { 2623$SDL_CB[DC::SDL_QUIT] = sub {
2624 crash "SDL_QUIT";
2385 EV::unloop EV::UNLOOP_ALL; 2625 EV::unloop EV::UNLOOP_ALL;
2386 }, 2626};
2387 DC::SDL_VIDEORESIZE => sub { 2627$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2388 },
2389 DC::SDL_VIDEOEXPOSE => sub { 2628$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2390 DC::UI::full_refresh; 2629 DC::UI::full_refresh;
2391 }, 2630};
2392 DC::SDL_ACTIVEEVENT => sub { 2631$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2393# not useful, as APPACTIVE includes only iconified state, not unmapped 2632# not useful, as APPACTIVE includes only iconified state, not unmapped
2394# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2633# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2395# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2634# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2396# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2635# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2397# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2636# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2398# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2637# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2399 }, 2638};
2400 DC::SDL_KEYDOWN => sub { 2639$SDL_CB[DC::SDL_KEYDOWN] = sub {
2401 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2640 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2402 # alt-enter 2641 # alt-enter
2642 video_shutdown;
2403 $FULLSCREEN_ENABLE->toggle; 2643 $FULLSCREEN_ENABLE->toggle;
2404 video_shutdown;
2405 video_init; 2644 video_init;
2406 } else { 2645 } else {
2407 &DC::UI::feed_sdl_key_down_event; 2646 &DC::UI::feed_sdl_key_down_event;
2408 } 2647 }
2409 update_modbox; 2648 update_modbox;
2410 }, 2649};
2411 DC::SDL_KEYUP => sub { 2650$SDL_CB[DC::SDL_KEYUP] = sub {
2412 &DC::UI::feed_sdl_key_up_event; 2651 &DC::UI::feed_sdl_key_up_event;
2413 update_modbox; 2652 update_modbox;
2414 }, 2653};
2415 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2654$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2416 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2655$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2417 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2418 DC::SDL_USEREVENT => sub { 2657$SDL_CB[DC::SDL_USEREVENT] = sub {
2419 if ($_[0]{code} == 1) { 2658 if ($_[0]{code} == 1) {
2420 audio_channel_finished $_[0]{data1}; 2659 audio_channel_finished $_[0]{data1};
2421 } elsif ($_[0]{code} == 0) { 2660 } elsif ($_[0]{code} == 0) {
2422 audio_music_finished; 2661 audio_music_finished;
2423 }
2424 }, 2662 }
2425); 2663};
2426 2664
2427############################################################################# 2665#############################################################################
2428 2666
2429$SIG{INT} = $SIG{TERM} = sub { 2667$SIG{INT} = $SIG{TERM} = sub {
2430 EV::unloop; 2668 EV::unloop;
2431 #d# TODO calling exit here hangs the process in some futex 2669 #d# TODO calling exit here hangs the process in some futex
2432}; 2670};
2433 2671
2434{ 2672# due to mac os x + sdl combined braindamage, we need this contortion
2673sub main {
2674 {
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2675 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436 2676
2437 if (-e "$Deliantra::VARDIR/client.cf") { 2677 if (-e "$Deliantra::VARDIR/client.cf") {
2438 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2678 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2439 } else { 2679 } else {
2440 #TODO: compatibility cruft 2680 #TODO: compatibility cruft
2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2681 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2442 print STDERR "INFO: used old configuration file\n"; 2682 print STDERR "INFO: used old configuration file\n";
2443 } 2683 }
2444 2684
2445 DC::DB::Server::run; 2685 DC::DB::Server::run;
2446 2686
2447 if ($CFG->{db_schema} < 1) { 2687 if ($CFG->{db_schema} < 1) {
2448 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2688 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2449 DC::DB::nuke_db; 2689 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1; 2690 $CFG->{db_schema} = 1;
2451 DC::write_cfg; 2691 DC::write_cfg;
2452 } 2692 }
2453 2693
2454 DC::DB::open_db; 2694 DC::DB::open_db;
2455 2695
2456 DC::UI::set_layout ($::CFG->{layout}); 2696 DC::UI::set_layout ($::CFG->{layout});
2457 2697
2458 my %DEF_CFG = ( 2698 my %DEF_CFG = (
2699 config_autosave => 1,
2459 sdl_mode => 0, 2700 sdl_mode => undef,
2460 fullscreen => 1, 2701 fullscreen => 1,
2461 fast => 0, 2702 fast => 0,
2462 force_opengl11 => undef, 2703 force_opengl11 => undef,
2704 disable_alpha => 0,
2705 smooth_movement => 1,
2463 texture_compression => 1, 2706 texture_compression => 1,
2464 map_scale => 1, 2707 map_scale => 1,
2465 fow_enable => 1, 2708 fow_enable => 1,
2466 fow_intensity => 0, 2709 fow_intensity => 0,
2467 map_smoothing => 1, 2710 map_smoothing => 1,
2468 gui_fontsize => 1, 2711 gui_fontsize => 1,
2469 log_fontsize => 0.7, 2712 log_fontsize => 0.7,
2470 gauge_fontsize => 1, 2713 gauge_fontsize => 1,
2471 gauge_size => 0.35, 2714 gauge_size => 0.35,
2472 stat_fontsize => 0.7, 2715 stat_fontsize => 0.7,
2473 mapsize => 100, 2716 mapsize => 100,
2474 audio_enable => 1, 2717 audio_enable => 1,
2475 audio_hw_channels => 0, 2718 audio_hw_channels => 0,
2476 audio_hw_frequency => 0, 2719 audio_hw_frequency => 0,
2477 audio_hw_chunksize => 0, 2720 audio_hw_chunksize => 0,
2478 audio_mix_channels => 8, 2721 audio_mix_channels => 8,
2479 effects_enable => 1, 2722 effects_enable => 1,
2480 effects_volume => 1, 2723 effects_volume => 1,
2481 bgm_enable => 1, 2724 bgm_enable => 1,
2482 bgm_volume => 0.5, 2725 bgm_volume => 0.5,
2483 output_rate => "", 2726 output_rate => "",
2484 pickup => 0, 2727 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2485 inv_sort => "mtime", 2728 inv_sort => "mtime",
2486 default => "profile", # default profile 2729 default => "profile", # default profile
2487 show_tips => 1, 2730 show_tips => 1,
2488 logview_max_par => 1000, 2731 logview_max_par => 1000,
2489 shift_fire_stop => 0, 2732 shift_fire_stop => 0,
2733 uitheme => "wood",
2734 map_shift_x => -24, # arbitrary
2735 map_shift_y => +24, # arbitrary
2490 ); 2736 );
2491 2737
2492 while (my ($k, $v) = each %DEF_CFG) { 2738 while (my ($k, $v) = each %DEF_CFG) {
2493 $CFG->{$k} = $v unless exists $CFG->{$k}; 2739 $CFG->{$k} = $v unless exists $CFG->{$k};
2494 } 2740 }
2495 2741
2496 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2742 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2497 $PROFILE = $CFG->{profile}{default}; 2743 $PROFILE = $CFG->{profile}{default};
2498 2744
2499 # convert old bindings (only default profile matters) 2745 # convert old bindings (only default profile matters)
2500 if (my $bindings = delete $PROFILE->{bindings}) { 2746 if (my $bindings = delete $PROFILE->{bindings}) {
2501 while (my ($mod, $syms) = each %$bindings) { 2747 while (my ($mod, $syms) = each %$bindings) {
2502 while (my ($sym, $cmds) = each %$syms) { 2748 while (my ($sym, $cmds) = each %$syms) {
2503 push @{ $PROFILE->{macro} }, { 2749 push @{ $PROFILE->{macro} }, {
2504 accelkey => [$mod*1, $sym*1], 2750 accelkey => [$mod*1, $sym*1],
2505 action => $cmds, 2751 action => $cmds,
2752 };
2506 }; 2753 }
2507 } 2754 }
2508 } 2755 }
2509 }
2510 2756
2511 sdl_init; 2757 sdl_init;
2512 2758
2513 @SDL_MODES = DC::SDL_ListModes 8, 8; 2759 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2514 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2760 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2515 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2516 2761
2517 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2762 {
2518
2519 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2520
2521 {
2522 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2763 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2523 DejaVuSans.ttf 2764 DejaVuSans.ttf
2524 DejaVuSansMono.ttf 2765 DejaVuSansMono.ttf
2525 DejaVuSans-Bold.ttf 2766 DejaVuSans-Bold.ttf
2526 DejaVuSansMono-Bold.ttf 2767 DejaVuSansMono-Bold.ttf
2527 DejaVuSans-Oblique.ttf 2768 DejaVuSans-Oblique.ttf
2528 DejaVuSansMono-Oblique.ttf 2769 DejaVuSansMono-Oblique.ttf
2529 DejaVuSans-BoldOblique.ttf 2770 DejaVuSans-BoldOblique.ttf
2530 DejaVuSansMono-BoldOblique.ttf 2771 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf
2531 ); 2773 );
2532 2774
2533 DC::add_font $_ for @fonts; 2775 DC::add_font $_ for @fonts;
2534 2776
2535 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2777 $FONT_PROP = new_from_file DC::Font $fonts[0];
2536 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2778 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2537 2779
2538 $FONT_PROP->make_default; 2780 $FONT_PROP->make_default;
2539 2781
2540 DC::pango_init; 2782 DC::pango_init;
2541 } 2783 }
2542 2784
2543# compare mono (ft) vs. rgba (cairo) 2785# compare mono (ft) vs. rgba (cairo)
2544# ft - 1.8s, cairo 3s, even in alpha-only mode 2786# ft - 1.8s, cairo 3s, even in alpha-only mode
2545# for my $rgba (0..1) { 2787# for my $rgba (0..1) {
2546# my $t1 = Time::HiRes::time; 2788# my $t1 = Time::HiRes::time;
… …
2551# } 2793# }
2552# my $t2 = Time::HiRes::time; 2794# my $t2 = Time::HiRes::time;
2553# warn $t2-$t1; 2795# warn $t2-$t1;
2554# } 2796# }
2555 2797
2556 video_init; 2798 video_init;
2557 audio_init; 2799 audio_init;
2558} 2800 }
2559 2801
2560show_tip_of_the_day if $CFG->{show_tips}; 2802 show_tip_of_the_day if $CFG->{show_tips};
2561 2803
2562our $STARTUP_CANCEL = EV::idle sub { 2804 our $STARTUP_CANCEL = EV::idle sub {
2563 undef $::STARTUP_CANCEL; 2805 undef $::STARTUP_CANCEL;
2564 $startup_done->(); 2806 $startup_done->();
2565}; 2807 };
2566 2808
2567delete $SIG{__DIE__}; 2809 delete $SIG{__DIE__};
2568EV::loop; 2810 EV::loop;
2569 2811
2812 DC::write_cfg if $CFG->{config_autosave};
2813
2570#video_shutdown; 2814 #video_shutdown;
2571#audio_shutdown; 2815 #audio_shutdown;
2816
2572DC::OpenGL::quit; 2817 DC::OpenGL::quit;
2573DC::SDL_Quit; 2818 DC::SDL_Quit;
2574DC::DB::Server::stop; 2819 DC::DB::Server::stop;
2820}
2821
2822DC::SDL_braino; # see sub above
2575 2823
2576=head1 NAME 2824=head1 NAME
2577 2825
2578deliantra - A Deliantra MORPG game client 2826deliantra - A Deliantra MORPG game client
2579 2827
… …
2596 4 show fps 2844 4 show fps
2597 8 suppress tooltips 2845 8 suppress tooltips
2598 2846
2599=head1 AUTHOR 2847=head1 AUTHOR
2600 2848
2601Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2849Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2602 2850
2603 2851
2604 2852

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines