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.38 by root, Mon May 5 16:26:11 2008 UTC vs.
Revision 1.95 by root, Sun Apr 26 19:10:57 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 new DC::Protocol 797 new DC::Protocol
744 host => $host, 798 host => $host,
745 port => $port || 13327, 799 port => $port,
746 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
748 mapw => $mapsize, 802 mapw => $mapw,
749 maph => $mapsize, 803 maph => $maph,
750 804
751 client => "$DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
752 806
753 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
… …
757 query => \&server_query, 811 query => \&server_query,
758 812
759 setup_req => { 813 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 814 smoothing => $CFG->{map_smoothing}*1,
761 }, 815 },
762 };
763 816
764 if ($CONN) { 817 on_connect => sub {
818 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
766 820
767 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, trying differently";
847 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
848 unless (defined $host) {
849 status "dns failure, using hardcoded address";
850 $host = "129.13.162.95";
851 }
852 }
853
854 dc_connect $host, $port;
855 };
768 } else { 856 } else {
769 warn $@; 857 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 858 }
773} 859}
774 860
775sub stop_game { 861sub stop_game {
862 crash "stop_game";
863
776 $LOGIN_BUTTON->set_text ("Login / Register"); 864 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 865 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 866 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 867 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 868 $SPELL_LIST->clear_spells;
… …
794} 882}
795 883
796sub graphics_setup { 884sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 885 my $vbox = new DC::UI::VBox;
798 886
887 {
888 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
889
799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 890 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
800 891
801 my $row = 0; 892 my $row = 0;
802 893
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 895 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 896 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 897 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 898
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
900 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
901 can_events => 1,
902 tooltip => "This field shows any known issues with your config or driver, such as "
903 . "a non-accelerated display format. You can try to work around these issues "
904 . "by selecting a different video mode, changing the settings below or "
905 . "by installing the right driver for your graphics card.");
906
907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
908 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
909 value => $CFG->{uitheme},
910 options => [
911 [wood => "Wood (the default)"],
912 [plain => "Plain (very)"],
913 [blue => "Blue (dark)"],
914 [metal => "Metal (light)"],
915 ],
916 tooltip => "Choose the User Interface theme that you like most :)",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
918 );
919
808 my $vidmode_tooltip = 920 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 921 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 922 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 923
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 925 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 926
815 $hbox->add (my $mode_slider = new DC::UI::Slider 927 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 928 c_rescale => 1,
929 force_w => $WIDTH * 0.1, expand => 1,
930 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 931 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 932 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 933 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 934 can_events => 1, tooltip => $vidmode_tooltip);
821 935
822 $mode_slider->connect (changed => sub { 936 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 937 my ($self, $value) = @_;
824 938
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 939 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 940 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 941 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 942 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 943
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 945 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 946 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 947 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 948 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 949 );
836 950
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 951 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 952 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 953 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 954 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 955 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 956 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 957 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 958 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 959 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 961 );
848 962
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
964 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{disable_alpha},
966 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
967 . "by disabling a number of textures and transparency effects. Normally, these "
968 . "effects do not cost a lot of resources, but some graphics cards might fall "
969 . "back to extremely slow rendering if this is enabled. If disabling this option "
970 . "noticably improves the framerate of the client please report this! "
971 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
972 on_changed => sub {
973 my ($self, $value) = @_;
974 $CFG->{disable_alpha} = $value;
975 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
976 0
977 }
978 );
979
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 980 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 981 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 982 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 983 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 984 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 985 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 986 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 987 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 988 );
858 989
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 991 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 992 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 993 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 995 );
865 996
866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 997 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
867 $table->add_at (1, $row++, new DC::UI::Slider 998 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 999 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1000 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1001 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 1002 );
872 1003
873 $table->add_at (1, $row++, new DC::UI::Button 1004 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 1005 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 1006 tooltip => "Apply the video settings above.",
876 on_activate => sub { 1007 on_activate => sub {
877 video_shutdown (); 1008 video_shutdown ();
878 video_init (); 1009 video_init ();
1010 0
879 0 1011 }
880 } 1012 );
1013 }
1014
1015 {
1016 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1017
1018 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1019
1020 my $row = 0;
1021 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1022 $table->add_at (1, $row++, new DC::UI::CheckBox
1023 state => $CFG->{smooth_movement},
1024 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1025 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1026 . "then disable this option. Changes take effect immdiately.",
1027 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1028 );
882 1029
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1031 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1032 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1033 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1034 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
888 ); 1035 );
889 1036
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1038 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1039 state => $CFG->{map_smoothing},
893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1040 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
894 . "This increases load on the graphics subsystem and works only with TRT servers. " 1041 . "This increases load on the graphics subsystem and works only with TRT servers. "
895 . "Changes take effect at next login only.", 1042 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1043 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1044 );
898 1045
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1047 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1048 state => $CFG->{fow_enable},
902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1049 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1050 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1051 );
905 1052
906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
907 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1055 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1056 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1058 );
912 1059
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
914 $table->add_at (1, $row++, new DC::UI::Slider 1061 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1062 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1063 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1064 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1065 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1066 );
920 1067
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1068 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1069 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1070 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1071 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1072 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1073 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1074 &set_gauge_window_fontsize;
1075 0
928 0 1076 }
929 } 1077 );
930 );
931 1078
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1079 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
933 $table->add_at (1, $row++, new DC::UI::Slider 1080 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1081 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1082 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
936 on_changed => sub { 1083 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1084 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1085 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1086 0
939 0 1087 }
940 } 1088 );
941 ); 1089 }
942 1090
943 $vbox 1091 $vbox
944} 1092}
945 1093
946our $AUDIO_HW_CHUNKSIZE; 1094our $AUDIO_HW_CHUNKSIZE;
… …
1109} 1257}
1110 1258
1111sub make_gauge_window { 1259sub make_gauge_window {
1112 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1260 my $gh = int $HEIGHT * $CFG->{gauge_size};
1113 1261
1114 my $win = new DC::UI::Frame ( 1262 $GAUGES->{win} = my $win = new DC::UI::Frame (
1115 force_x => 0, 1263 force_x => 0,
1116 force_y => "max", 1264 force_y => "max",
1117 force_w => $WIDTH, 1265 force_w => $WIDTH,
1118 force_h => $gh, 1266 force_h => $gh,
1119 ); 1267 );
… …
1135 (new DC::UI::Empty expand => 1), 1283 (new DC::UI::Empty expand => 1),
1136 (my $hb = new DC::UI::HBox), 1284 (my $hb = new DC::UI::HBox),
1137 ], 1285 ],
1138 ); 1286 );
1139 1287
1140 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1288 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1141 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1289 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1142 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1290 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1143 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1291 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1144
1145 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1147 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1149
1150 $GAUGES = {
1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1152 win => $win, range => $rng,
1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1154 };
1155 1292
1156 &set_gauge_window_fontsize; 1293 &set_gauge_window_fontsize;
1157 1294
1158 $win 1295 $win
1159} 1296}
… …
1501 ); 1638 );
1502 1639
1503 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1640 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1504 $table->add_at (1, 4, new DC::UI::Entry 1641 $table->add_at (1, 4, new DC::UI::Entry
1505 text => $CFG->{profile}{default}{user}, 1642 text => $CFG->{profile}{default}{user},
1506 tooltip => "The name of your character on the server.", 1643 tooltip => "The name of your character on the server. The name is case-sensitive!",
1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1644 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1508 ); 1645 );
1509 1646
1510 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1647 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1511 $table->add_at (1, 5, new DC::UI::Entry 1648 $table->add_at (1, 5, new DC::UI::Entry
… …
1525 1 1662 1
1526 }, 1663 },
1527 ); 1664 );
1528 1665
1529 $vbox->add (new DC::UI::FancyFrame 1666 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1667 label => "How to Play",
1531 min_h => 200, 1668 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1669 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1670 markup =>
1671 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1672 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1673 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1674 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1675 ),
1537 ); 1676 );
1538 1677
1539 $vbox 1678 $vbox
… …
1611 1750
1612 my $row = 0; 1751 my $row = 0;
1613 1752
1614 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1753 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1615 $table->add_at (1, $row++, new DC::UI::CheckBox 1754 $table->add_at (1, $row++, new DC::UI::CheckBox
1755 c_colspan => 2,
1616 state => $CFG->{show_tips}, 1756 state => $CFG->{show_tips},
1617 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1757 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1618 on_changed => sub { 1758 on_changed => sub {
1619 my ($self, $value) = @_; 1759 my ($self, $value) = @_;
1620 $CFG->{show_tips} = $value; 1760 $CFG->{show_tips} = $value;
… …
1622 } 1762 }
1623 ); 1763 );
1624 1764
1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1765 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1766 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1767 c_colspan => 2,
1627 text => $CFG->{logview_max_par}, 1768 text => $CFG->{logview_max_par},
1628 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1769 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1629 . "sends more messages than this number, older messages get removed to save memory and " 1770 . "sends more messages than this number, older messages get removed to save memory and "
1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1771 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1631 on_changed => sub { 1772 on_changed => sub {
… …
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1774 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1634 0 1775 0
1635 }, 1776 },
1636 ); 1777 );
1637 1778
1779 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1780 $table->add_at (1, $row, new DC::UI::CheckBox
1781 state => $CFG->{config_autosave},
1782 tooltip => "Normally, configuration settings and the user interface layout "
1783 . "are saved on client exit. You can disable this behaviour by "
1784 . "unchecking this checkbox.",
1785 on_changed => sub {
1786 my ($self, $value) = @_;
1787 $CFG->{config_autosave} = $value;
1788 0
1789 }
1790 );
1791 $table->add_at (2, $row++, new DC::UI::Button
1792 text => "Save Now",
1793 tooltip => "Use this to manually save configuration and UI layout when "
1794 . "autosave is disabled.",
1795 on_activate => sub {
1796 DC::write_cfg;
1797 0
1798 }
1799 );
1800
1638 $table 1801 $table
1639} 1802}
1640 1803
1641sub autopickup_setup { 1804sub autopickup_setup {
1642 my $r = new DC::UI::ScrolledWindow ( 1805 my $r = new DC::UI::ScrolledWindow (
… …
1648 col_expand => [0, 1, 0, 1], 1811 col_expand => [0, 1, 0, 1],
1649 ); 1812 );
1650 1813
1651 for ( 1814 for (
1652 ["General", 0, 0, 1815 ["General", 0, 0,
1653 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1654 ["Inhibit autopickup" => PICKUP_INHIBIT], 1816# ["Inhibit autopickup" => PICKUP_INHIBIT],
1655 ["Stop before pickup" => PICKUP_STOP], 1817 ["Stop before pickup" => PICKUP_STOP],
1656 ["Debug autopickup" => PICKUP_DEBUG], 1818 ["Debug autopickup" => PICKUP_DEBUG],
1657 ], 1819 ],
1658 ["Weapons", 0, 6, 1820 ["Weapons", 0, 6,
1659 ["All weapons" => PICKUP_ALLWEAPON], 1821 ["All weapons" => PICKUP_ALLWEAPON],
… …
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1847 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1848 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1849 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1850 ["Flesh" => PICKUP_FLESH],
1689 ], 1851 ],
1690 ["Weight/Value ratio", 2, 17] 1852 ["Value/Weight ratio", 2, 17]
1691 ) 1853 )
1692 { 1854 {
1693 my ($title, $x, $y, @bits) = @$_; 1855 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1856 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1857
… …
1707 $::CFG->{pickup} |= $mask; 1869 $::CFG->{pickup} |= $mask;
1708 } else { 1870 } else {
1709 $::CFG->{pickup} &= ~$mask; 1871 $::CFG->{pickup} &= ~$mask;
1710 } 1872 }
1711 1873
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1874 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1875 if defined $::CONN;
1714 1876
1715 0 1877 0
1716 }); 1878 });
1717 1879
… …
1720 } 1882 }
1721 1883
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1884 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1885 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1886 template => ">= 99",
1887 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1888 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1889 on_changed => sub {
1727 my ($slider, $value) = @_; 1890 my ($slider, $value) = @_;
1728 1891
1729 $::CFG->{pickup} &= ~0xF; 1892 $::CFG->{pickup} &= ~0xF;
… …
1733 }); 1896 });
1734 1897
1735 $table->add_at (3, 18, new DC::UI::Button 1898 $table->add_at (3, 18, new DC::UI::Button
1736 text => "set", 1899 text => "set",
1737 on_activate => sub { 1900 on_activate => sub {
1738 $::CONN->send_command ("pickup $::CFG->{pickup}") 1901 $::CONN->send_pickup ($::CFG->{pickup})
1739 if defined $::CONN; 1902 if defined $::CONN;
1740 0 1903 0
1741 }); 1904 });
1742 1905
1743 $r 1906 $r
1744} 1907}
1745 1908
1746my %SORT_ORDER = ( 1909my %SORT_ORDER = (
1747 type => undef, 1910 type => sub {
1911 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1912 },
1748 mtime => sub { 1913 mtime => sub {
1749 my $NOW = time; 1914 my $NOW = time;
1750 sort { 1915 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1916 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1917 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1783 $::CFG->{inv_sort} = $_[1]; 1948 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1949 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1950 },
1786 ); 1951 );
1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1952 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1788 #TODO# update to weigh/maxweight 1953 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1954 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1955
1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1956 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1957 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1958 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1854 $PL_NOTEBOOK->set_current_page ($widget); 2019 $PL_NOTEBOOK->set_current_page ($widget);
1855 $PL_WINDOW->show; 2020 $PL_WINDOW->show;
1856 } 2021 }
1857} 2022}
1858 2023
1859sub player_window { 2024sub make_playerbook {
1860 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2025 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1861 x => "center", 2026 x => "center",
1862 y => "center", 2027 y => "center",
1863 force_w => $WIDTH * 9/10, 2028 force_w => $WIDTH * 9/10,
1864 force_h => $HEIGHT * 9/10, 2029 force_h => $HEIGHT * 9/10,
… …
1898 "License, Author and Source info for media sent by the server."); 2063 "License, Author and Source info for media sent by the server.");
1899 2064
1900 $ntb->set_current_page ($INVENTORY_PAGE); 2065 $ntb->set_current_page ($INVENTORY_PAGE);
1901 2066
1902 $plwin->add ($ntb); 2067 $plwin->add ($ntb);
1903 $plwin
1904} 2068}
1905 2069
1906sub keyboard_setup { 2070sub keyboard_setup {
1907 DC::Macro::keyboard_setup 2071 DC::Macro::keyboard_setup
1908} 2072}
1909 2073
1910sub help_window { 2074sub make_help_window {
1911 my $win = new DC::UI::Toplevel 2075 my $win = new DC::UI::Toplevel
1912 x => 'center', 2076 x => 'center',
1913 y => 'center', 2077 y => 'center',
1914 z => 4, 2078 z => 4,
1915 name => 'doc_browser', 2079 name => 'doc_browser',
… …
2004 2168
2005 $load_node->((DC::Pod::find @path)[0]); 2169 $load_node->((DC::Pod::find @path)[0]);
2006 $win->show; 2170 $win->show;
2007 }; 2171 };
2008 2172
2009 $win 2173 $HELP_WINDOW = $win;
2010}
2011
2012sub open_string_query {
2013 my ($title, $cb, $txt, $tooltip) = @_;
2014 my $dialog = new DC::UI::Toplevel
2015 x => "center",
2016 y => "center",
2017 z => 50,
2018 force_w => $WIDTH * 4/5,
2019 title => $title;
2020
2021 $dialog->add (
2022 my $e = new DC::UI::Entry
2023 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2024 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2025 tooltip => $tooltip
2026 );
2027
2028 $e->grab_focus;
2029 $e->set_text ($txt) if $txt;
2030 $dialog->show;
2031} 2174}
2032 2175
2033sub open_quit_dialog { 2176sub open_quit_dialog {
2034 unless ($QUIT_DIALOG) { 2177 unless ($QUIT_DIALOG) {
2035 $QUIT_DIALOG = new DC::UI::Toplevel 2178 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2057 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2200 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2058 ); 2201 );
2059 $hb->add (new DC::UI::Button 2202 $hb->add (new DC::UI::Button
2060 text => "Quit anyway", 2203 text => "Quit anyway",
2061 expand => 1, 2204 expand => 1,
2062 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2205 on_activate => sub {
2206 crash "Quit anyway";
2207 EV::unloop EV::UNLOOP_ALL;
2208 },
2063 ); 2209 );
2064 } 2210 }
2065 2211
2066 $QUIT_DIALOG->show; 2212 $QUIT_DIALOG->show;
2067 $QUIT_DIALOG->grab_focus; 2213 $QUIT_DIALOG->grab_focus;
2214}
2215
2216sub make_menubar {
2217 $MENUFRAME = new DC::UI::Toplevel
2218 border => 0,
2219 force_x => 0,
2220 force_y => 0,
2221 force_w => $::WIDTH,
2222 child => ($MENUBAR = new DC::UI::HBox),
2223 ;
2224
2225 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2226
2227 # 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
2228 make_gauge_window->show;
2229
2230# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 make_playerbook;
2234
2235 $MENUPOPUP = DC::UI::Menu->new (items => [
2236 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2237 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2238 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2239 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2240 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2241 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2242 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2243 ["Quit…" , sub {
2244 if ($CONN) {
2245 open_quit_dialog;
2246 } else {
2247 EV::unloop EV::UNLOOP_ALL;
2248 }
2249 }],
2250 ]);
2251
2252 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2253 tooltip => "Shows the main menu",
2254 on_button_down => sub {
2255 my ($self, $ev) = @_;
2256 local $ev->{x} = 0;
2257 local $ev->{y} = 0;
2258 $MENUPOPUP->popup ($ev);
2259 },
2260 );
2261
2262 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2263 padding_x => 6,
2264 padding_y => 3,
2265 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2266 template => " Exp: 888,888,888,888 (lvl 188) ",
2267 );
2268
2269 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2270 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2271 . "will automatically pick up items as defined by your item pickup settings "
2272 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2273 . "disable autopickup by disabling this checkbox.",
2274 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2275 on_changed => sub {
2276 my ($self, $value) = @_;
2277 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2278 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2279 $CONN->send_pickup ($CFG->{pickup})
2280 if $CONN;
2281 },
2282 );
2283
2284 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2285 c_rescale => 1,
2286 padding_x => 6,
2287 padding_y => 3,
2288 force_w => $::WIDTH * 0.2,
2289 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2290 template => "two handed weapons 99%",
2291 );
2292
2293 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2294 expand => 1,
2295 align => 1, can_hover => 1, can_events => 1,
2296 text => "Range and Combat Slots",
2297 tooltip => "#stat_ranged",
2298 );
2299
2300 $MENUFRAME->show;
2301}
2302
2303sub open_string_query {
2304 my ($title, $cb, $txt, $tooltip) = @_;
2305 my $dialog = new DC::UI::Toplevel
2306 x => "center",
2307 y => "center",
2308 z => 50,
2309 force_w => $WIDTH * 4/5,
2310 title => $title;
2311
2312 $dialog->add (
2313 my $e = new DC::UI::Entry
2314 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2315 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2316 tooltip => $tooltip
2317 );
2318
2319 $e->grab_focus;
2320 $e->set_text ($txt) if $txt;
2321 $dialog->show;
2068} 2322}
2069 2323
2070sub show_tip_of_the_day { 2324sub show_tip_of_the_day {
2071 # find all tips 2325 # find all tips
2072 my @tod = DC::Pod::find tip_of_the_day => "*"; 2326 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2120 $dialog->show; 2374 $dialog->show;
2121 }; 2375 };
2122} 2376}
2123 2377
2124sub sdl_init { 2378sub sdl_init {
2125 DC::SDL_Init 2379 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2380 and die "SDL::Init failed!\n";
2127} 2381}
2128 2382
2129sub video_init { 2383sub video_init {
2384 DC::set_theme $CFG->{uitheme};
2385
2386 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2387 $SDL_REINIT = 0;
2388
2389 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2390 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2391 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2392 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2393
2394 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2395
2130 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2396 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2397 $CFG->{sdl_mode} = 0; # lowest resolution by default
2398
2399 # now choose biggest mode <= 1024x768
2400 for (0 .. $#SDL_MODES) {
2401 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2402 $CFG->{sdl_mode} = $_;
2403 }
2404 }
2405 }
2131 2406
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2407 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2408
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2409 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2410 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2411 $FAST = $CFG->{fast};
2137 2412
2413 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2414 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2415 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2416 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2417
2141 $SDL_ACTIVE = 1; 2418 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2419 $LAST_REFRESH = time - 0.01;
2143 2420
… …
2190 2467
2191 (new DC::UI::Frame 2468 (new DC::UI::Frame
2192 bg => [0, 0, 0, 0.4], 2469 bg => [0, 0, 0, 0.4],
2193 force_x => 0, 2470 force_x => 0,
2194 force_y => "max", 2471 force_y => "max",
2195 child => (my $LR = new DC::UI::VBox), 2472 child => (my $LL = new DC::UI::VBox),
2196 )->show; 2473 )->show;
2197 2474
2198 $LR->add ($STATUSBOX); 2475 $LL->add ($STATUSBOX);
2199 $LR->add ($MODBOX); 2476 $LL->add ($MODBOX);
2200 $LR->add (new DC::UI::Label 2477 $LL->add (new DC::UI::Label
2201 align => 0, 2478 align => 0,
2202 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2479 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2203 fontsize => 0.5, 2480 fontsize => 0.5,
2204 fg => [1, 1, 0, 0.7], 2481 fg => [1, 1, 0, 0.7],
2205 ); 2482 );
2206 2483
2207 DC::UI::Toplevel->new ( 2484 DC::UI::Toplevel->new (
2208 title => "Minimap", 2485 title => "Minimap",
2209 name => "mapmap", 2486 name => "mapmap",
2210 x => 0, 2487 x => 0,
2211 y => $FONTSIZE + 8, 2488 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2212 border_bg => [1, 1, 1, 192/255], 2489 border_bg => [1, 1, 1, 192/255],
2213 bg => [1, 1, 1, 0], 2490 bg => [1, 1, 1, 0],
2214 child => ($MAPMAP = new DC::MapWidget::MapMap 2491 child => ($MAPMAP = new DC::MapWidget::MapMap
2215 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2492 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2216 ), 2493 ),
2217 )->show; 2494 )->show;
2218 2495
2219 $MAPWIDGET = new DC::MapWidget; 2496 $MAPWIDGET = new DC::MapWidget;
2220 $MAPWIDGET->connect (activate_console => sub { 2497 $MAPWIDGET->connect (activate_console => sub {
… …
2241 force_h => $::HEIGHT * 0.6, 2518 force_h => $::HEIGHT * 0.6,
2242 has_close_button => 1, 2519 has_close_button => 1,
2243 ; 2520 ;
2244 2521
2245 $METASERVER = metaserver_dialog; 2522 $METASERVER = metaserver_dialog;
2523 # the name is changed to not conflict with the older name as users could have hidden it
2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2524 $MESSAGE_WINDOW = new DC::UI::Dockbar
2525 name => "message_window2",
2526 title => 'Messages',
2527 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2528 force_w => $::WIDTH * 0.6,
2529 force_h => $::HEIGHT * 0.25,
2530 ;
2531
2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2532 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2248 2533
2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, 2534 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2535 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2251 2536
… …
2267 . "After pressing the combo the binding will be saved automatically and the " 2552 . "After pressing the combo the binding will be saved automatically and the "
2268 . "binding editor closes"); 2553 . "binding editor closes");
2269 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2554 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2270 "Some debuggin' options. Do not ask."); 2555 "Some debuggin' options. Do not ask.");
2271 2556
2272 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2557 make_help_window;
2558 make_menubar;
2273 2559
2274 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2275 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2276
2277# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2278# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2279
2280 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
2281
2282 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2283 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2284
2285 $BUTTONBAR->add (new DC::UI::Button
2286 text => "Save Config",
2287 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2288 on_activate => sub {
2289 $::CFG->{layout} = DC::UI::get_layout;
2290 DC::write_cfg;
2291 status "Configuration Saved";
2292 0
2293 },
2294 );
2295
2296 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2297 tooltip => "View Documentation");
2298
2299 $BUTTONBAR->add (new DC::UI::Button
2300 text => "Quit",
2301 tooltip => "Terminates the program",
2302 on_activate => sub {
2303 if ($CONN) {
2304 open_quit_dialog;
2305 } else {
2306 EV::unloop EV::UNLOOP_ALL;
2307 }
2308 0
2309 },
2310 );
2311
2312 $BUTTONBAR->show;
2313 $SETUP_DIALOG->show; 2560 $SETUP_DIALOG->show;
2314 $MESSAGE_WINDOW->show; 2561 $MESSAGE_WINDOW->show;
2315 } 2562 }
2316 2563
2564 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2565 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2566
2567 $CAVEAT_LABEL->set_text ("None :)");
2568 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2569 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2570
2317 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2571 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2318} 2572}
2319 2573
2320sub video_shutdown { 2574sub video_shutdown {
2321 DC::OpenGL::shutdown; 2575 DC::OpenGL::shutdown;
2576 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2322 2577
2323 undef $SDL_ACTIVE; 2578 undef $SDL_ACTIVE;
2324} 2579}
2325 2580
2326my %animate_object; 2581my %animate_object;
… …
2345my $want_refresh = EV::prepare_ns \&force_refresh; 2600my $want_refresh = EV::prepare_ns \&force_refresh;
2346 2601
2347my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2602my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2348 $NOW = EV::now; 2603 $NOW = EV::now;
2349 2604
2350 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2605 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2351 for DC::poll_events; 2606 for DC::poll_events;
2352 2607
2353 if (%animate_object) { 2608 if (%animate_object) {
2354 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2609 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2355 $WANT_REFRESH = 1; 2610 $WANT_REFRESH = 1;
… …
2367sub animation_stop { 2622sub animation_stop {
2368 my ($widget) = @_; 2623 my ($widget) = @_;
2369 delete $animate_object{$widget}; 2624 delete $animate_object{$widget};
2370} 2625}
2371 2626
2372%SDL_CB = (
2373 DC::SDL_QUIT => sub { 2627$SDL_CB[DC::SDL_QUIT] = sub {
2628 crash "SDL_QUIT";
2374 EV::unloop EV::UNLOOP_ALL; 2629 EV::unloop EV::UNLOOP_ALL;
2375 }, 2630};
2376 DC::SDL_VIDEORESIZE => sub { 2631$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2377 },
2378 DC::SDL_VIDEOEXPOSE => sub { 2632$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2379 DC::UI::full_refresh; 2633 DC::UI::full_refresh;
2380 }, 2634};
2381 DC::SDL_ACTIVEEVENT => sub { 2635$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2382# not useful, as APPACTIVE includes only iconified state, not unmapped 2636# not useful, as APPACTIVE includes only iconified state, not unmapped
2383# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2637# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2384# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2638# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2385# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2639# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2386# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2640# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2387# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2641# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2388 }, 2642};
2389 DC::SDL_KEYDOWN => sub { 2643$SDL_CB[DC::SDL_KEYDOWN] = sub {
2390 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2644 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2391 # alt-enter 2645 # alt-enter
2646 video_shutdown;
2392 $FULLSCREEN_ENABLE->toggle; 2647 $FULLSCREEN_ENABLE->toggle;
2393 video_shutdown;
2394 video_init; 2648 video_init;
2395 } else { 2649 } else {
2396 &DC::UI::feed_sdl_key_down_event; 2650 &DC::UI::feed_sdl_key_down_event;
2397 } 2651 }
2398 update_modbox; 2652 update_modbox;
2399 }, 2653};
2400 DC::SDL_KEYUP => sub { 2654$SDL_CB[DC::SDL_KEYUP] = sub {
2401 &DC::UI::feed_sdl_key_up_event; 2655 &DC::UI::feed_sdl_key_up_event;
2402 update_modbox; 2656 update_modbox;
2403 }, 2657};
2404 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2658$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2405 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2659$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2406 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2660$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2407 DC::SDL_USEREVENT => sub { 2661$SDL_CB[DC::SDL_USEREVENT] = sub {
2408 if ($_[0]{code} == 1) { 2662 if ($_[0]{code} == 1) {
2409 audio_channel_finished $_[0]{data1}; 2663 audio_channel_finished $_[0]{data1};
2410 } elsif ($_[0]{code} == 0) { 2664 } elsif ($_[0]{code} == 0) {
2411 audio_music_finished; 2665 audio_music_finished;
2412 }
2413 }, 2666 }
2414); 2667};
2415 2668
2416############################################################################# 2669#############################################################################
2417 2670
2418$SIG{INT} = $SIG{TERM} = sub { 2671$SIG{INT} = $SIG{TERM} = sub {
2419 EV::unloop; 2672 EV::unloop;
2420 #d# TODO calling exit here hangs the process in some futex 2673 #d# TODO calling exit here hangs the process in some futex
2421}; 2674};
2422 2675
2423{ 2676# due to mac os x + sdl combined braindamage, we need this contortion
2677sub main {
2678 {
2424 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2679 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2425 2680
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2681 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2682 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2683 } else {
2429 #TODO: compatibility cruft 2684 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2685 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2686 print STDERR "INFO: used old configuration file\n";
2432 } 2687 }
2433 2688
2434 DC::DB::Server::run; 2689 DC::DB::Server::run;
2435 2690
2436 if ($CFG->{db_schema} < 1) { 2691 if ($CFG->{db_schema} < 1) {
2437 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2692 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2438 DC::DB::nuke_db; 2693 DC::DB::nuke_db;
2439 $CFG->{db_schema} = 1; 2694 $CFG->{db_schema} = 1;
2440 DC::write_cfg; 2695 DC::write_cfg;
2441 } 2696 }
2442 2697
2443 DC::DB::open_db; 2698 DC::DB::open_db;
2444 2699
2445 DC::UI::set_layout ($::CFG->{layout}); 2700 DC::UI::set_layout ($::CFG->{layout});
2446 2701
2447 my %DEF_CFG = ( 2702 my %DEF_CFG = (
2703 config_autosave => 1,
2448 sdl_mode => 0, 2704 sdl_mode => undef,
2449 fullscreen => 1, 2705 fullscreen => 1,
2450 fast => 0, 2706 fast => 0,
2451 force_opengl11 => undef, 2707 force_opengl11 => undef,
2708 disable_alpha => 0,
2709 smooth_movement => 1,
2452 texture_compression => 1, 2710 texture_compression => 1,
2453 map_scale => 1, 2711 map_scale => 1,
2454 fow_enable => 1, 2712 fow_enable => 1,
2455 fow_intensity => 0, 2713 fow_intensity => 0,
2456 map_smoothing => 1, 2714 map_smoothing => 1,
2457 gui_fontsize => 1, 2715 gui_fontsize => 1,
2458 log_fontsize => 0.7, 2716 log_fontsize => 0.7,
2459 gauge_fontsize => 1, 2717 gauge_fontsize => 1,
2460 gauge_size => 0.35, 2718 gauge_size => 0.35,
2461 stat_fontsize => 0.7, 2719 stat_fontsize => 0.7,
2462 mapsize => 100, 2720 mapsize => 100,
2463 audio_enable => 1, 2721 audio_enable => 1,
2464 audio_hw_channels => 0, 2722 audio_hw_channels => 0,
2465 audio_hw_frequency => 0, 2723 audio_hw_frequency => 0,
2466 audio_hw_chunksize => 0, 2724 audio_hw_chunksize => 0,
2467 audio_mix_channels => 8, 2725 audio_mix_channels => 8,
2468 effects_enable => 1, 2726 effects_enable => 1,
2469 effects_volume => 1, 2727 effects_volume => 1,
2470 bgm_enable => 1, 2728 bgm_enable => 1,
2471 bgm_volume => 0.5, 2729 bgm_volume => 0.5,
2472 output_rate => "", 2730 output_rate => "",
2473 pickup => 0, 2731 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2474 inv_sort => "mtime", 2732 inv_sort => "mtime",
2475 default => "profile", # default profile 2733 default => "profile", # default profile
2476 show_tips => 1, 2734 show_tips => 1,
2477 logview_max_par => 1000, 2735 logview_max_par => 1000,
2736 shift_fire_stop => 0,
2737 uitheme => "wood",
2738 map_shift_x => -24, # arbitrary
2739 map_shift_y => +24, # arbitrary
2478 ); 2740 );
2479 2741
2480 while (my ($k, $v) = each %DEF_CFG) { 2742 while (my ($k, $v) = each %DEF_CFG) {
2481 $CFG->{$k} = $v unless exists $CFG->{$k}; 2743 $CFG->{$k} = $v unless exists $CFG->{$k};
2482 } 2744 }
2483 2745
2484 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2746 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2485 $PROFILE = $CFG->{profile}{default}; 2747 $PROFILE = $CFG->{profile}{default};
2486 2748
2487 # convert old bindings (only default profile matters) 2749 # convert old bindings (only default profile matters)
2488 if (my $bindings = delete $PROFILE->{bindings}) { 2750 if (my $bindings = delete $PROFILE->{bindings}) {
2489 while (my ($mod, $syms) = each %$bindings) { 2751 while (my ($mod, $syms) = each %$bindings) {
2490 while (my ($sym, $cmds) = each %$syms) { 2752 while (my ($sym, $cmds) = each %$syms) {
2491 push @{ $PROFILE->{macro} }, { 2753 push @{ $PROFILE->{macro} }, {
2492 accelkey => [$mod*1, $sym*1], 2754 accelkey => [$mod*1, $sym*1],
2493 action => $cmds, 2755 action => $cmds,
2756 };
2494 }; 2757 }
2495 } 2758 }
2496 } 2759 }
2497 }
2498 2760
2499 sdl_init; 2761 sdl_init;
2500 2762
2501 @SDL_MODES = DC::SDL_ListModes 8, 8; 2763 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2502 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2764 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2503 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2504 2765
2505 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2766 {
2506
2507 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2508
2509 {
2510 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2767 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2511 DejaVuSans.ttf 2768 DejaVuSans.ttf
2512 DejaVuSansMono.ttf 2769 DejaVuSansMono.ttf
2513 DejaVuSans-Bold.ttf 2770 DejaVuSans-Bold.ttf
2514 DejaVuSansMono-Bold.ttf 2771 DejaVuSansMono-Bold.ttf
2515 DejaVuSans-Oblique.ttf 2772 DejaVuSans-Oblique.ttf
2516 DejaVuSansMono-Oblique.ttf 2773 DejaVuSansMono-Oblique.ttf
2517 DejaVuSans-BoldOblique.ttf 2774 DejaVuSans-BoldOblique.ttf
2518 DejaVuSansMono-BoldOblique.ttf 2775 DejaVuSansMono-BoldOblique.ttf
2776 mona.ttf
2519 ); 2777 );
2520 2778
2521 DC::add_font $_ for @fonts; 2779 DC::add_font $_ for @fonts;
2522 2780
2523 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2781 $FONT_PROP = new_from_file DC::Font $fonts[0];
2524 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2782 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2525 2783
2526 $FONT_PROP->make_default; 2784 $FONT_PROP->make_default;
2527 2785
2528 DC::pango_init; 2786 DC::pango_init;
2529 } 2787 }
2530 2788
2531# compare mono (ft) vs. rgba (cairo) 2789# compare mono (ft) vs. rgba (cairo)
2532# ft - 1.8s, cairo 3s, even in alpha-only mode 2790# ft - 1.8s, cairo 3s, even in alpha-only mode
2533# for my $rgba (0..1) { 2791# for my $rgba (0..1) {
2534# my $t1 = Time::HiRes::time; 2792# my $t1 = Time::HiRes::time;
… …
2539# } 2797# }
2540# my $t2 = Time::HiRes::time; 2798# my $t2 = Time::HiRes::time;
2541# warn $t2-$t1; 2799# warn $t2-$t1;
2542# } 2800# }
2543 2801
2544 video_init; 2802 video_init;
2545 audio_init; 2803 audio_init;
2546} 2804 }
2547 2805
2548show_tip_of_the_day if $CFG->{show_tips}; 2806 show_tip_of_the_day if $CFG->{show_tips};
2549 2807
2550our $STARTUP_CANCEL = EV::idle sub { 2808 our $STARTUP_CANCEL = EV::idle sub {
2551 undef $::STARTUP_CANCEL; 2809 undef $::STARTUP_CANCEL;
2552 $startup_done->(); 2810 $startup_done->();
2553}; 2811 };
2554 2812
2555delete $SIG{__DIE__}; 2813 delete $SIG{__DIE__};
2556EV::loop; 2814 EV::loop;
2557 2815
2816 DC::write_cfg if $CFG->{config_autosave};
2817
2558#video_shutdown; 2818 #video_shutdown;
2559#audio_shutdown; 2819 #audio_shutdown;
2820
2560DC::OpenGL::quit; 2821 DC::OpenGL::quit;
2561DC::SDL_Quit; 2822 DC::SDL_Quit;
2562DC::DB::Server::stop; 2823 DC::DB::Server::stop;
2824}
2825
2826DC::SDL_braino; # see sub above
2563 2827
2564=head1 NAME 2828=head1 NAME
2565 2829
2566deliantra - A Deliantra MORPG game client 2830deliantra - A Deliantra MORPG game client
2567 2831
… …
2584 4 show fps 2848 4 show fps
2585 8 suppress tooltips 2849 8 suppress tooltips
2586 2850
2587=head1 AUTHOR 2851=head1 AUTHOR
2588 2852
2589Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2853Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2590 2854
2591 2855
2592 2856

Diff Legend

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