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.81 by root, Mon Dec 22 02:33:30 2008 UTC vs.
Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
… …
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } else { 58 } else {
55 # OS X 59 # OS X
56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
58 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
61 } 63 }
62 64
63 unshift @INC, $root; 65 unshift @INC, $root;
64 } 66 }
65} 67}
66 68
67# prepend private library directory 69# prepend private library directory and prepare env
68BEGIN { 70BEGIN {
69 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 73 if (-d $path) {
72 unshift @INC, $path; 74 unshift @INC, $path;
… …
86 88
87use Deliantra; 89use Deliantra;
88use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
89 91
90use AnyEvent::Util (); 92use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
93 95
94use Compress::LZF; 96use Compress::LZF;
95use JSON::XS; 97use JSON::XS;
96 98
97use DC; 99use DC;
… …
125 127
126$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
127$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
128 130
129$EV::DIED = sub { 131$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1; 132 crash "CRASH/EV::DIED: $@" => 0;
131 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
132}; 134};
133 135
134my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
135 139
136our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
137 141
138our $LAST_REFRESH; 142our $LAST_REFRESH;
139our $NOW; 143our $NOW;
… …
161 165
162our $MAP; 166our $MAP;
163our $MAPMAP; 167our $MAPMAP;
164our $MAPWIDGET; 168our $MAPWIDGET;
165our $COMPLETER; 169our $COMPLETER;
166our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
167our $METASERVER; 174our $METASERVER;
168our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 176our $QUIT_DIALOG;
170our $HOST_ENTRY; 177our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
197our $FLOORBOX; 204our $FLOORBOX;
198our $GAUGES; 205our $GAUGES;
199our $STATWIDS; 206our $STATWIDS;
200 207
201our $SDL_ACTIVE; 208our $SDL_ACTIVE;
202our %SDL_CB; 209our @SDL_CB;
203 210
204our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 212our $STATUSBOX;
206our $MODBOX; 213our $MODBOX;
207our $DEBUG_STATUS; 214our $DEBUG_STATUS;
… …
215# write a crash message blockingly to the socket, if possible 222# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy. 223# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) { 224*crash = sub($;$) {
218 my ($msg, $backtrace) = @_; 225 my ($msg, $backtrace) = @_;
219 226
227 warn $msg;
228
220 return unless $CONN; 229 return unless $CONN;
221 230
222 my $fh = $CONN->{fh} 231 my $fh = $CONN->{fh}
223 or return; 232 or return;
224 233
… …
234 243
235 # backtrace as second step, in case it crashes, too 244 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace; 246 if $backtrace;
238}; 247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
239 259
240############################################################################# 260#############################################################################
241 261
242sub status { 262sub status {
243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
325 or return; 345 or return;
326 346
327 $meta->{data} 347 $meta->{data}
328 or return; 348 or return;
329 349
330 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
331 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
332 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
333 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
334 &audio_music_push ($face); 354 &audio_music_push ($face);
335 } 355 }
336 } else { 356 } else {
337 # fetch from database 357 # fetch from database
338 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
339 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
340 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
341 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
342 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
343 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
344 364
345 audio_sound_push ($face); 365 audio_sound_push ($face);
346 }; 366 };
… …
393 413
394 audio_music_update_volume; 414 audio_music_update_volume;
395 415
396 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
397 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
398 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
399 ? new_from_file DC::RW $meta->{path} 422 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
400 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
401 424
402 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
403 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
404 427
405 my $NOW = time; 428 my $NOW = time;
406 429
407 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
408 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
517 sub audio_tab_update; 540 sub audio_tab_update;
518 audio_tab_update; 541 audio_tab_update;
519} 542}
520 543
521sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
522 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
523 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
524 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
525 553
526 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
794 822
795 on_connect => sub { 823 on_connect => sub {
796 if ($_[0]) { 824 if ($_[0]) {
797 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
798 826
799 status "login successful"; 827 status "successfully connected to the server";
800 } else { 828 } else {
801 undef $CONN; 829 undef $CONN;
802 status "unable to connect: $!"; 830 status "unable to connect: $!";
803 stop_game(); 831 stop_game();
804 } 832 }
… …
806 ; 834 ;
807} 835}
808 836
809sub start_game { 837sub start_game {
810 status "logging in..."; 838 status "logging in...";
839
840 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
841 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
842 or return status "$server: unable to parse server address, try an empty field.";
811 843
812 $LOGIN_BUTTON->set_text ("Logout"); 844 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide; 845 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816 846
817 $MAP = new DC::Map; 847 $MAP = new DC::Map;
818 848
819 # hack to make SURE we find the IP address all right 849 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable. 850 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") { 851 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 if ($_[0] ne "80.101.114.108") { # Perl 853 if ($_[0] ne "80.101.114.108") { # Perl
854 status "dns failure, trying differently";
855 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
856 unless (defined $host) {
824 status "dns failure, using hardcoded address"; 857 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95"; 858 $host = "129.13.162.95";
859 }
826 } 860 }
827 861
828 dc_connect $host, $port; 862 dc_connect $host, $port;
829 }; 863 };
830 } else { 864 } else {
… …
897 931
898 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
900 934
901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
936 c_rescale => 1,
902 force_w => $WIDTH * 0.1, expand => 1, 937 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ], 938 range => [ ($CFG->{sdl_mode}) x 3 ],
904 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
905 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
906 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
… …
998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1033 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
999 . "then disable this option. Changes take effect immdiately.", 1034 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1001 ); 1036 );
1002 1037
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{smooth_transitions},
1041 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1042 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1043 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1044 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1045 );
1046
1047
1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1004 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1020 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
1021 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
1022 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1067 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1069 );
1070
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1072 $table->add_at (1, $row++, new DC::UI::ImageButton
1073 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1074 bg => [0.3, 0.3, 0.2],
1075 force_w => 64,
1076 force_h => 64,
1077 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1078 on_activate => sub {
1079 my ($self) = @_;
1080 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1081 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1082 $MAPWIDGET->update;
1083 }
1024 ); 1084 );
1025 1085
1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1027 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1080 1140
1081 my $text = !$freq 1141 my $text = !$freq
1082 ? "audio is off" 1142 ? "audio is off"
1083 : "audio is enabled\n" 1143 : "audio is enabled\n"
1084 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
1085 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1086 1148
1087 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
1088} 1150}
1089 1151
1090sub audio_setup { 1152sub audio_setup {
… …
1230} 1292}
1231 1293
1232sub make_gauge_window { 1294sub make_gauge_window {
1233 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1234 1296
1235 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1236 force_x => 0, 1298 force_x => 0,
1237 force_y => "max", 1299 force_y => "max",
1238 force_w => $WIDTH, 1300 force_w => $WIDTH,
1239 force_h => $gh, 1301 force_h => $gh,
1240 ); 1302 );
… …
1256 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1257 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1258 ], 1320 ],
1259 ); 1321 );
1260 1322
1261 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1323 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1262 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1324 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1263 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1325 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1264 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1326 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1265
1266 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1267 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1268 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1269 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1270
1271 $GAUGES = {
1272 exp => $exp, prg => $prg, sklprg => $sklprg,
1273 win => $win, range => $rng,
1274 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1275 };
1276 1327
1277 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1278 1329
1279 $win 1330 $win
1280} 1331}
… …
1621 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1672 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1622 ); 1673 );
1623 1674
1624 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1625 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1627 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1628 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1629 ); 1680 );
1630 1681
1631 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1632 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1633 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1634 hidden => 1, 1685 hidden => 1,
1635 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1636 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1637 ); 1688 );
1638 1689
1639 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1640 expand => 1, 1691 expand => 1,
1641 text => "Login / Register", 1692 text => "Login / Register",
… …
1677 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1678 1729
1679 $vbox->add ( 1730 $vbox->add (
1680 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1681 expand => 1, 1732 expand => 1,
1682 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1683 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1734 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1684 on_changed => sub { 1735 on_changed => sub {
1685 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1686 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1687 1 1738 1
1688 } 1739 }
1689 ); 1740 );
1690 1741
1691 if (0) { #d# disabled 1742 if (0) { #d# disabled
… …
1734 1785
1735 my $row = 0; 1786 my $row = 0;
1736 1787
1737 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1788 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1738 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1739 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1740 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1792 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1741 on_changed => sub { 1793 on_changed => sub {
1742 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1743 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
… …
1745 } 1797 }
1746 ); 1798 );
1747 1799
1748 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1749 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1801 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1802 c_colspan => 2,
1750 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1751 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1804 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1752 . "sends more messages than this number, older messages get removed to save memory and " 1805 . "sends more messages than this number, older messages get removed to save memory and "
1753 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1806 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1754 on_changed => sub { 1807 on_changed => sub {
… …
1756 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1757 0 1810 0
1758 }, 1811 },
1759 ); 1812 );
1760 1813
1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1815 $table->add_at (1, $row, new DC::UI::CheckBox
1816 state => $CFG->{config_autosave},
1817 tooltip => "Normally, configuration settings and the user interface layout "
1818 . "are saved on client exit. You can disable this behaviour by "
1819 . "unchecking this checkbox.",
1820 on_changed => sub {
1821 my ($self, $value) = @_;
1822 $CFG->{config_autosave} = $value;
1823 0
1824 }
1825 );
1826 $table->add_at (2, $row++, new DC::UI::Button
1827 text => "Save Now",
1828 tooltip => "Use this to manually save configuration and UI layout when "
1829 . "autosave is disabled.",
1830 on_activate => sub {
1831 DC::write_cfg;
1832 0
1833 }
1834 );
1835
1761 $table 1836 $table
1762} 1837}
1763 1838
1764sub autopickup_setup { 1839sub autopickup_setup {
1765 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
… …
1771 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1772 ); 1847 );
1773 1848
1774 for ( 1849 for (
1775 ["General", 0, 0, 1850 ["General", 0, 0,
1776 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1777 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1778 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1779 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1780 ], 1854 ],
1781 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1782 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
… …
1830 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1831 } else { 1905 } else {
1832 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1833 } 1907 }
1834 1908
1835 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1836 if defined $::CONN; 1910 if defined $::CONN;
1837 1911
1838 0 1912 0
1839 }); 1913 });
1840 1914
… …
1857 }); 1931 });
1858 1932
1859 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1860 text => "set", 1934 text => "set",
1861 on_activate => sub { 1935 on_activate => sub {
1862 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1863 if defined $::CONN; 1937 if defined $::CONN;
1864 0 1938 0
1865 }); 1939 });
1866 1940
1867 $r 1941 $r
… …
1980 $PL_NOTEBOOK->set_current_page ($widget); 2054 $PL_NOTEBOOK->set_current_page ($widget);
1981 $PL_WINDOW->show; 2055 $PL_WINDOW->show;
1982 } 2056 }
1983} 2057}
1984 2058
1985sub player_window { 2059sub make_playerbook {
1986 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2060 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1987 x => "center", 2061 x => "center",
1988 y => "center", 2062 y => "center",
1989 force_w => $WIDTH * 9/10, 2063 force_w => $WIDTH * 9/10,
1990 force_h => $HEIGHT * 9/10, 2064 force_h => $HEIGHT * 9/10,
… …
2024 "License, Author and Source info for media sent by the server."); 2098 "License, Author and Source info for media sent by the server.");
2025 2099
2026 $ntb->set_current_page ($INVENTORY_PAGE); 2100 $ntb->set_current_page ($INVENTORY_PAGE);
2027 2101
2028 $plwin->add ($ntb); 2102 $plwin->add ($ntb);
2029 $plwin
2030} 2103}
2031 2104
2032sub keyboard_setup { 2105sub keyboard_setup {
2033 DC::Macro::keyboard_setup 2106 DC::Macro::keyboard_setup
2034} 2107}
2035 2108
2036sub help_window { 2109sub make_help_window {
2037 my $win = new DC::UI::Toplevel 2110 my $win = new DC::UI::Toplevel
2038 x => 'center', 2111 x => 'center',
2039 y => 'center', 2112 y => 'center',
2040 z => 4, 2113 z => 4,
2041 name => 'doc_browser', 2114 name => 'doc_browser',
… …
2130 2203
2131 $load_node->((DC::Pod::find @path)[0]); 2204 $load_node->((DC::Pod::find @path)[0]);
2132 $win->show; 2205 $win->show;
2133 }; 2206 };
2134 2207
2135 $win 2208 $HELP_WINDOW = $win;
2136}
2137
2138sub open_string_query {
2139 my ($title, $cb, $txt, $tooltip) = @_;
2140 my $dialog = new DC::UI::Toplevel
2141 x => "center",
2142 y => "center",
2143 z => 50,
2144 force_w => $WIDTH * 4/5,
2145 title => $title;
2146
2147 $dialog->add (
2148 my $e = new DC::UI::Entry
2149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2151 tooltip => $tooltip
2152 );
2153
2154 $e->grab_focus;
2155 $e->set_text ($txt) if $txt;
2156 $dialog->show;
2157} 2209}
2158 2210
2159sub open_quit_dialog { 2211sub open_quit_dialog {
2160 unless ($QUIT_DIALOG) { 2212 unless ($QUIT_DIALOG) {
2161 $QUIT_DIALOG = new DC::UI::Toplevel 2213 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2194 2246
2195 $QUIT_DIALOG->show; 2247 $QUIT_DIALOG->show;
2196 $QUIT_DIALOG->grab_focus; 2248 $QUIT_DIALOG->grab_focus;
2197} 2249}
2198 2250
2251sub make_menubar {
2252 $MENUFRAME = new DC::UI::Toplevel
2253 border => 0,
2254 force_x => 0,
2255 force_y => 0,
2256 force_w => $::WIDTH,
2257 child => ($MENUBAR = new DC::UI::HBox),
2258 ;
2259
2260 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2261
2262 # 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
2263 make_gauge_window->show;
2264
2265# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2266# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2267
2268 make_playerbook;
2269
2270 $MENUPOPUP = DC::UI::Menu->new (items => [
2271 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2272 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2273 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2274 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2275 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2276 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2277 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2278 ["Quit…" , sub {
2279 if ($CONN) {
2280 open_quit_dialog;
2281 } else {
2282 EV::unloop EV::UNLOOP_ALL;
2283 }
2284 }],
2285 ]);
2286
2287 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2288 tooltip => "Shows the main menu",
2289 on_button_down => sub {
2290 my ($self, $ev) = @_;
2291 local $ev->{x} = 0;
2292 local $ev->{y} = 0;
2293 $MENUPOPUP->popup ($ev);
2294 },
2295 );
2296
2297 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2298 padding_x => 6,
2299 padding_y => 3,
2300 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2301 template => " Exp: 888,888,888,888 (lvl 188) ",
2302 );
2303
2304 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2305 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2306 . "will automatically pick up items as defined by your item pickup settings "
2307 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2308 . "disable autopickup by disabling this checkbox.",
2309 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2310 on_changed => sub {
2311 my ($self, $value) = @_;
2312 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2313 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2314 $CONN->send_pickup ($CFG->{pickup})
2315 if $CONN;
2316 },
2317 );
2318
2319 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2320 c_rescale => 1,
2321 padding_x => 6,
2322 padding_y => 3,
2323 force_w => $::WIDTH * 0.2,
2324 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2325 template => "two handed weapons 99%",
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2329 expand => 1,
2330 align => 1, can_hover => 1, can_events => 1,
2331 text => "Range and Combat Slots",
2332 tooltip => "#stat_ranged",
2333 );
2334
2335 $MENUFRAME->show;
2336}
2337
2338sub open_string_query {
2339 my ($title, $cb, $txt, $tooltip) = @_;
2340 my $dialog = new DC::UI::Toplevel
2341 x => "center",
2342 y => "center",
2343 z => 50,
2344 force_w => $WIDTH * 4/5,
2345 title => $title;
2346
2347 $dialog->add (
2348 my $e = new DC::UI::Entry
2349 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2350 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2351 tooltip => $tooltip
2352 );
2353
2354 $e->grab_focus;
2355 $e->set_text ($txt) if $txt;
2356 $dialog->show;
2357}
2358
2199sub show_tip_of_the_day { 2359sub show_tip_of_the_day {
2200 # find all tips 2360 # find all tips
2201 my @tod = DC::Pod::find tip_of_the_day => "*"; 2361 my @tod = DC::Pod::find tip_of_the_day => "*";
2202 2362
2203 DC::DB::get state => "tip_of_the_day", sub { 2363 DC::DB::get state => "tip_of_the_day", sub {
… …
2342 2502
2343 (new DC::UI::Frame 2503 (new DC::UI::Frame
2344 bg => [0, 0, 0, 0.4], 2504 bg => [0, 0, 0, 0.4],
2345 force_x => 0, 2505 force_x => 0,
2346 force_y => "max", 2506 force_y => "max",
2347 child => (my $LR = new DC::UI::VBox), 2507 child => (my $LL = new DC::UI::VBox),
2348 )->show; 2508 )->show;
2349 2509
2350 $LR->add ($STATUSBOX); 2510 $LL->add ($STATUSBOX);
2351 $LR->add ($MODBOX); 2511 $LL->add ($MODBOX);
2352 $LR->add (new DC::UI::Label 2512 $LL->add (new DC::UI::Label
2353 align => 0, 2513 align => 0,
2354 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2514 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2355 fontsize => 0.5, 2515 fontsize => 0.5,
2356 fg => [1, 1, 0, 0.7], 2516 fg => [1, 1, 0, 0.7],
2357 ); 2517 );
2358 2518
2359 DC::UI::Toplevel->new ( 2519 DC::UI::Toplevel->new (
2360 title => "Minimap", 2520 title => "Minimap",
2361 name => "mapmap", 2521 name => "mapmap",
2362 x => 0, 2522 x => 0,
2363 y => $FONTSIZE + 8, 2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2364 border_bg => [1, 1, 1, 192/255], 2524 border_bg => [1, 1, 1, 192/255],
2365 bg => [1, 1, 1, 0], 2525 bg => [1, 1, 1, 0],
2366 child => ($MAPMAP = new DC::MapWidget::MapMap 2526 child => ($MAPMAP = new DC::MapWidget::MapMap
2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2527 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2368 ), 2528 ),
… …
2397 $METASERVER = metaserver_dialog; 2557 $METASERVER = metaserver_dialog;
2398 # the name is changed to not conflict with the older name as users could have hidden it 2558 # the name is changed to not conflict with the older name as users could have hidden it
2399 $MESSAGE_WINDOW = new DC::UI::Dockbar 2559 $MESSAGE_WINDOW = new DC::UI::Dockbar
2400 name => "message_window2", 2560 name => "message_window2",
2401 title => 'Messages', 2561 title => 'Messages',
2562 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2402 force_w => $::WIDTH * 0.6, 2563 force_w => $::WIDTH * 0.6,
2403 force_h => $::HEIGHT * 0.25, 2564 force_h => $::HEIGHT * 0.25,
2404 ; 2565 ;
2405 2566
2406 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2567 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2426 . "After pressing the combo the binding will be saved automatically and the " 2587 . "After pressing the combo the binding will be saved automatically and the "
2427 . "binding editor closes"); 2588 . "binding editor closes");
2428 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2589 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2429 "Some debuggin' options. Do not ask."); 2590 "Some debuggin' options. Do not ask.");
2430 2591
2431 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2592 make_help_window;
2593 make_menubar;
2432 2594
2433 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2434 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2435
2436# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2437# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2438
2439 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
2440
2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2442 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2443
2444 $BUTTONBAR->add (new DC::UI::Button
2445 text => "Save Config",
2446 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2447 on_activate => sub {
2448 $::CFG->{layout} = DC::UI::get_layout;
2449 DC::write_cfg;
2450 status "Configuration Saved";
2451 0
2452 },
2453 );
2454
2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2456 tooltip => "View Documentation");
2457
2458 $BUTTONBAR->add (new DC::UI::Button
2459 text => "Quit",
2460 tooltip => "Terminates the program",
2461 on_activate => sub {
2462 if ($CONN) {
2463 open_quit_dialog;
2464 } else {
2465 EV::unloop EV::UNLOOP_ALL;
2466 }
2467 0
2468 },
2469 );
2470
2471 $BUTTONBAR->show;
2472 $SETUP_DIALOG->show; 2595 $SETUP_DIALOG->show;
2473 $MESSAGE_WINDOW->show; 2596 $MESSAGE_WINDOW->show;
2474 } 2597 }
2475 2598
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2599 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2600 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478 2601
2479 $CAVEAT_LABEL->set_text ("None :)"); 2602 $CAVEAT_LABEL->set_text ("None :)");
2603 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2604 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2605 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2606 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482 2607
2483 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2484} 2609}
… …
2512my $want_refresh = EV::prepare_ns \&force_refresh; 2637my $want_refresh = EV::prepare_ns \&force_refresh;
2513 2638
2514my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2639my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2515 $NOW = EV::now; 2640 $NOW = EV::now;
2516 2641
2517 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2642 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2518 for DC::poll_events; 2643 for DC::poll_events;
2519 2644
2520 if (%animate_object) { 2645 if (%animate_object) {
2521 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2646 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2522 $WANT_REFRESH = 1; 2647 $WANT_REFRESH = 1;
… …
2534sub animation_stop { 2659sub animation_stop {
2535 my ($widget) = @_; 2660 my ($widget) = @_;
2536 delete $animate_object{$widget}; 2661 delete $animate_object{$widget};
2537} 2662}
2538 2663
2539%SDL_CB = (
2540 DC::SDL_QUIT => sub { 2664$SDL_CB[DC::SDL_QUIT] = sub {
2541 crash "SDL_QUIT"; 2665 crash "SDL_QUIT";
2542 EV::unloop EV::UNLOOP_ALL; 2666 EV::unloop EV::UNLOOP_ALL;
2543 }, 2667};
2544 DC::SDL_VIDEORESIZE => sub { 2668$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2545 },
2546 DC::SDL_VIDEOEXPOSE => sub { 2669$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2547 DC::UI::full_refresh; 2670 DC::UI::full_refresh;
2548 }, 2671};
2549 DC::SDL_ACTIVEEVENT => sub { 2672$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2550# not useful, as APPACTIVE includes only iconified state, not unmapped 2673# not useful, as APPACTIVE includes only iconified state, not unmapped
2551# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2674# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2552# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2675# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2553# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2676# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2554# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2677# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2678# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2556 }, 2679};
2557 DC::SDL_KEYDOWN => sub { 2680$SDL_CB[DC::SDL_KEYDOWN] = sub {
2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2681 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2559 # alt-enter 2682 # alt-enter
2560 video_shutdown; 2683 video_shutdown;
2561 $FULLSCREEN_ENABLE->toggle; 2684 $FULLSCREEN_ENABLE->toggle;
2562 video_init; 2685 video_init;
2563 } else { 2686 } else {
2564 &DC::UI::feed_sdl_key_down_event; 2687 &DC::UI::feed_sdl_key_down_event;
2565 } 2688 }
2566 update_modbox; 2689 update_modbox;
2567 }, 2690};
2568 DC::SDL_KEYUP => sub { 2691$SDL_CB[DC::SDL_KEYUP] = sub {
2569 &DC::UI::feed_sdl_key_up_event; 2692 &DC::UI::feed_sdl_key_up_event;
2570 update_modbox; 2693 update_modbox;
2571 }, 2694};
2572 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2695$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2573 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2696$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2574 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2575 DC::SDL_USEREVENT => sub { 2698$SDL_CB[DC::SDL_USEREVENT] = sub {
2576 if ($_[0]{code} == 1) { 2699 if ($_[0]{code} == 1) {
2577 audio_channel_finished $_[0]{data1}; 2700 audio_channel_finished $_[0]{data1};
2578 } elsif ($_[0]{code} == 0) { 2701 } elsif ($_[0]{code} == 0) {
2579 audio_music_finished; 2702 audio_music_finished;
2580 }
2581 }, 2703 }
2582); 2704};
2583 2705
2584############################################################################# 2706#############################################################################
2585 2707
2586$SIG{INT} = $SIG{TERM} = sub { 2708$SIG{INT} = $SIG{TERM} = sub {
2587 EV::unloop; 2709 EV::unloop;
2588 #d# TODO calling exit here hangs the process in some futex 2710 #d# TODO calling exit here hangs the process in some futex
2589}; 2711};
2590 2712
2591# due to mac os x + sdl combined briandamage, we need this contortion 2713# due to mac os x + sdl combined braindamage, we need this contortion
2592sub main { 2714sub main {
2593 { 2715 {
2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2716 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2595 2717
2596 if (-e "$Deliantra::VARDIR/client.cf") { 2718 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2613 DC::DB::open_db; 2735 DC::DB::open_db;
2614 2736
2615 DC::UI::set_layout ($::CFG->{layout}); 2737 DC::UI::set_layout ($::CFG->{layout});
2616 2738
2617 my %DEF_CFG = ( 2739 my %DEF_CFG = (
2740 config_autosave => 1,
2618 sdl_mode => undef, 2741 sdl_mode => undef,
2619 fullscreen => 1, 2742 fullscreen => 1,
2620 fast => 0, 2743 fast => 0,
2621 force_opengl11 => undef, 2744 force_opengl11 => undef,
2622 disable_alpha => 0, 2745 disable_alpha => 0,
2623 smooth_movement => 1, 2746 smooth_movement => 1,
2747 smooth_transitions => 1,
2624 texture_compression => 1, 2748 texture_compression => 1,
2625 map_scale => 1, 2749 map_scale => 1,
2626 fow_enable => 1, 2750 fow_enable => 1,
2627 fow_intensity => 0, 2751 fow_intensity => 0,
2752 fow_texture => 0,
2628 map_smoothing => 1, 2753 map_smoothing => 1,
2629 gui_fontsize => 1, 2754 gui_fontsize => 1,
2630 log_fontsize => 0.7, 2755 log_fontsize => 0.7,
2631 gauge_fontsize => 1, 2756 gauge_fontsize => 1,
2632 gauge_size => 0.35, 2757 gauge_size => 0.35,
… …
2640 effects_enable => 1, 2765 effects_enable => 1,
2641 effects_volume => 1, 2766 effects_volume => 1,
2642 bgm_enable => 1, 2767 bgm_enable => 1,
2643 bgm_volume => 0.5, 2768 bgm_volume => 0.5,
2644 output_rate => "", 2769 output_rate => "",
2645 pickup => 0, 2770 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2646 inv_sort => "mtime", 2771 inv_sort => "mtime",
2647 default => "profile", # default profile 2772 default => "profile", # default profile
2648 show_tips => 1, 2773 show_tips => 1,
2649 logview_max_par => 1000, 2774 logview_max_par => 1000,
2650 shift_fire_stop => 0, 2775 shift_fire_stop => 0,
2651 uitheme => "wood", 2776 uitheme => "wood",
2652 ); 2777 map_shift_x => -24, # arbitrary
2778 map_shift_y => +24, # arbitrary
2653 2779 );
2780
2654 while (my ($k, $v) = each %DEF_CFG) { 2781 while (my ($k, $v) = each %DEF_CFG) {
2655 $CFG->{$k} = $v unless exists $CFG->{$k}; 2782 $CFG->{$k} = $v unless exists $CFG->{$k};
2656 } 2783 }
2657 2784
2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2785 my @args = @ARGV;
2786
2787 my $profile = 'default';
2788
2789 for (my $i = 0; $i < @args; $i++) {
2790 if ($args[$i] =~ /^--?profile$/) {
2791 $profile = $args[$i + 1];
2792 splice @args, $i, 2, ();
2793 $i = 0;
2794 } elsif ($args[$i] =~ /^--?h/) {
2795 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2796 exit 0;
2797 }
2798 }
2799
2800 $CFG->{profile}{$profile} ||= {};
2659 $PROFILE = $CFG->{profile}{default}; 2801 $PROFILE = $CFG->{profile}{$profile};
2802 $PROFILE->{host} ||= "gameserver.deliantra.net";
2803
2804 $PROFILE->{host} = $args[0] if @args > 0;
2805 $PROFILE->{user} = $args[1] if @args > 1;
2806 $PROFILE->{password} = $args[2] if @args > 2;
2660 2807
2661 # convert old bindings (only default profile matters) 2808 # convert old bindings (only default profile matters)
2662 if (my $bindings = delete $PROFILE->{bindings}) { 2809 if (my $bindings = delete $PROFILE->{bindings}) {
2663 while (my ($mod, $syms) = each %$bindings) { 2810 while (my ($mod, $syms) = each %$bindings) {
2664 while (my ($sym, $cmds) = each %$syms) { 2811 while (my ($sym, $cmds) = each %$syms) {
… …
2670 } 2817 }
2671 } 2818 }
2672 2819
2673 sdl_init; 2820 sdl_init;
2674 2821
2822 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2823 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2824
2675 { 2825 {
2676 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2826 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2677 DejaVuSans.ttf 2827 DejaVuSans.ttf
2678 DejaVuSansMono.ttf 2828 DejaVuSansMono.ttf
2679 DejaVuSans-Bold.ttf 2829 DejaVuSans-Bold.ttf
2680 DejaVuSansMono-Bold.ttf 2830 DejaVuSansMono-Bold.ttf
2681 DejaVuSans-Oblique.ttf 2831 DejaVuSans-Oblique.ttf
2682 DejaVuSansMono-Oblique.ttf 2832 DejaVuSansMono-Oblique.ttf
2683 DejaVuSans-BoldOblique.ttf 2833 DejaVuSans-BoldOblique.ttf
2684 DejaVuSansMono-BoldOblique.ttf 2834 DejaVuSansMono-BoldOblique.ttf
2835 mona.ttf
2685 ); 2836 );
2686 2837
2687 DC::add_font $_ for @fonts; 2838 DC::add_font $_ for @fonts;
2688 2839
2689 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2840 $FONT_PROP = new_from_file DC::Font $fonts[0];
2690 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2841 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2691 2842
2692 $FONT_PROP->make_default; 2843 $FONT_PROP->make_default;
2693 2844
… …
2719 }; 2870 };
2720 2871
2721 delete $SIG{__DIE__}; 2872 delete $SIG{__DIE__};
2722 EV::loop; 2873 EV::loop;
2723 2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2724#video_shutdown; 2877 #video_shutdown;
2725#audio_shutdown; 2878 #audio_shutdown;
2879
2726 DC::OpenGL::quit; 2880 DC::OpenGL::quit;
2727 DC::SDL_Quit; 2881 DC::SDL_Quit;
2728 DC::DB::Server::stop; 2882 DC::DB::Server::stop;
2729} 2883}
2730 2884
… …
2734 2888
2735deliantra - A Deliantra MORPG game client 2889deliantra - A Deliantra MORPG game client
2736 2890
2737=head1 SYNOPSIS 2891=head1 SYNOPSIS
2738 2892
2739Just run it - no commandline arguments are supported. 2893 deliantra [--profile name] [host [user [password]]]
2894 deliantra --help
2740 2895
2741=head1 USAGE 2896=head1 USAGE
2742 2897
2743deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2898The deliantra client utilises OpenGL for all UI elements and the game. It
2744be used in fullscreen mode and interactively. 2899is supposed to be used in fullscreen mode and interactively.
2745 2900
2746=head1 DEBUGGING 2901=head1 DEBUGGING
2747
2748 2902
2749CFPLUS_DEBUG - environment variable 2903CFPLUS_DEBUG - environment variable
2750 2904
2751 1 draw borders around widgets 2905 1 draw borders around widgets
2752 2 add low-level widget info to tooltips 2906 2 add low-level widget info to tooltips

Diff Legend

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