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.82 by root, Wed Dec 24 04:09:27 2008 UTC vs.
Revision 1.110 by root, Mon Apr 12 02:03:33 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;
131 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
132}; 134};
133 135
134my $MAX_FPS = 60; 136my $MAX_FPS = 60;
135 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
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;
140 144
141our $CFG; 145our $CFG;
142our $PROFILE; # current profile 146our $PROFILE; # current profile
143our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
148our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
144 149
145our $WANT_REFRESH; 150our $WANT_REFRESH;
146 151
147our $MODE_SLIDER; 152our $MODE_SLIDER;
148our $CAVEAT_LABEL; 153our $CAVEAT_LABEL;
161 166
162our $MAP; 167our $MAP;
163our $MAPMAP; 168our $MAPMAP;
164our $MAPWIDGET; 169our $MAPWIDGET;
165our $COMPLETER; 170our $COMPLETER;
166our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
167our $METASERVER; 175our $METASERVER;
168our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
169our $QUIT_DIALOG; 177our $QUIT_DIALOG;
170our $HOST_ENTRY; 178our $HOST_ENTRY;
171our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
197our $FLOORBOX; 205our $FLOORBOX;
198our $GAUGES; 206our $GAUGES;
199our $STATWIDS; 207our $STATWIDS;
200 208
201our $SDL_ACTIVE; 209our $SDL_ACTIVE;
202our %SDL_CB; 210our @SDL_CB;
203 211
204our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
205our $STATUSBOX; 213our $STATUSBOX;
206our $MODBOX; 214our $MODBOX;
207our $DEBUG_STATUS; 215our $DEBUG_STATUS;
338 or return; 346 or return;
339 347
340 $meta->{data} 348 $meta->{data}
341 or return; 349 or return;
342 350
343 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
344 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
345 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
346 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
347 &audio_music_push ($face); 355 &audio_music_push ($face);
348 } 356 }
349 } else { 357 } else {
350 # fetch from database 358 # fetch from database
351 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
352 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
353 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
354 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
355 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
356 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
357 365
358 audio_sound_push ($face); 366 audio_sound_push ($face);
359 }; 367 };
406 414
407 audio_music_update_volume; 415 audio_music_update_volume;
408 416
409 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
410 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
411 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
412 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
413 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
414 425
415 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
416 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
417 428
530 sub audio_tab_update; 541 sub audio_tab_update;
531 audio_tab_update; 542 audio_tab_update;
532} 543}
533 544
534sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
535 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
536 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
537 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
538 554
539 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
791 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
792 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
793 mapw => $mapw, 809 mapw => $mapw,
794 maph => $maph, 810 maph => $maph,
795 811
812 c_version => {
813 client => "deliantra",
796 client => "$DC::VERSION $] $^O", 814 clientver => $DC::VERSION,
815 gl_vendor => DC::OpenGL::gl_vendor,
816 gl_version => DC::OpenGL::gl_version,
817 },
797 818
798 map_widget => $MAPWIDGET, 819 map_widget => $MAPWIDGET,
799 statusbox => $STATUSBOX, 820 statusbox => $STATUSBOX,
800 map => $MAP, 821 map => $MAP,
801 mapmap => $MAPMAP, 822 mapmap => $MAPMAP,
807 828
808 on_connect => sub { 829 on_connect => sub {
809 if ($_[0]) { 830 if ($_[0]) {
810 DC::lowdelay fileno $CONN->{fh}; 831 DC::lowdelay fileno $CONN->{fh};
811 832
812 status "login successful"; 833 status "successfully connected to the server";
813 } else { 834 } else {
814 undef $CONN; 835 undef $CONN;
815 status "unable to connect: $!"; 836 status "unable to connect: $!";
816 stop_game(); 837 stop_game();
817 } 838 }
819 ; 840 ;
820} 841}
821 842
822sub start_game { 843sub start_game {
823 status "logging in..."; 844 status "logging in...";
845
846 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
847 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
848 or return status "$server: unable to parse server address, try an empty field.";
824 849
825 $LOGIN_BUTTON->set_text ("Logout"); 850 $LOGIN_BUTTON->set_text ("Logout");
826 $SETUP_DIALOG->hide; 851 $SETUP_DIALOG->hide;
827
828 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
829 852
830 $MAP = new DC::Map; 853 $MAP = new DC::Map;
831 854
832 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
833 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
834 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
835 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
836 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # Perl
860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) {
837 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
838 $host = "129.13.162.95"; 864 $host = "129.13.162.95";
865 }
839 } 866 }
840 867
841 dc_connect $host, $port; 868 dc_connect $host, $port;
842 }; 869 };
843 } else { 870 } else {
910 937
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
912 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 939 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
913 940
914 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 941 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
942 c_rescale => 1,
915 force_w => $WIDTH * 0.1, expand => 1, 943 force_w => $WIDTH * 0.1, expand => 1,
916 range => [ ($CFG->{sdl_mode}) x 3 ], 944 range => [ ($CFG->{sdl_mode}) x 3 ],
917 tooltip => $vidmode_tooltip); 945 tooltip => $vidmode_tooltip);
918 $hbox->add (my $mode_label = new DC::UI::Label 946 $hbox->add (my $mode_label = new DC::UI::Label
919 height => 0.8, template => "9999x9999@9+9", 947 height => 0.8, template => "9999x9999@9+9",
1011 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1039 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1012 . "then disable this option. Changes take effect immdiately.", 1040 . "then disable this option. Changes take effect immdiately.",
1013 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1014 ); 1042 );
1015 1043
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{smooth_transitions},
1047 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1048 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1049 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1050 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1051 );
1052
1053
1016 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1054 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1017 $table->add_at (1, $row++, new DC::UI::Slider 1055 $table->add_at (1, $row++, new DC::UI::Slider
1018 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1056 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1019 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1057 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1020 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1058 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1033 $table->add_at (1, $row++, new DC::UI::CheckBox 1071 $table->add_at (1, $row++, new DC::UI::CheckBox
1034 state => $CFG->{fow_enable}, 1072 state => $CFG->{fow_enable},
1035 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1073 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1074 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1075 );
1076
1077 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1078 $table->add_at (1, $row++, new DC::UI::ImageButton
1079 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1080 bg => [0.3, 0.3, 0.2],
1081 force_w => 64,
1082 force_h => 64,
1083 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.",
1084 on_activate => sub {
1085 my ($self) = @_;
1086 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1087 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1088 $MAPWIDGET->update;
1089 }
1037 ); 1090 );
1038 1091
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1040 $table->add_at (1, $row++, new DC::UI::Slider 1093 $table->add_at (1, $row++, new DC::UI::Slider
1041 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1094 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1093 1146
1094 my $text = !$freq 1147 my $text = !$freq
1095 ? "audio is off" 1148 ? "audio is off"
1096 : "audio is enabled\n" 1149 : "audio is enabled\n"
1097 . "frequency (Hz): $freq\n" 1150 . "frequency (Hz): $freq\n"
1098 . "channels: $chans"; 1151 . "channels: $chans\n"
1152 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1153 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1099 1154
1100 $AUDIO_INFO->set_text ($text); 1155 $AUDIO_INFO->set_text ($text);
1101} 1156}
1102 1157
1103sub audio_setup { 1158sub audio_setup {
1132 ); 1187 );
1133 1188
1134 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music"); 1189 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
1135 $table->add_at (1, $row, new DC::UI::CheckBox 1190 $table->add_at (1, $row, new DC::UI::CheckBox
1136 expand => 1, state => $CFG->{bgm_enable}, 1191 expand => 1, state => $CFG->{bgm_enable},
1137 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1192 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
1138 on_changed => sub { 1193 on_changed => sub {
1139 $CFG->{bgm_enable} = $_[1]; 1194 $CFG->{bgm_enable} = $_[1];
1140 $CONN->update_fx_want if $CONN; 1195 $CONN->update_fx_want if $CONN;
1141 audio_music_push; 1196 audio_music_push;
1142 1 1197 1
1243} 1298}
1244 1299
1245sub make_gauge_window { 1300sub make_gauge_window {
1246 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1301 my $gh = int $HEIGHT * $CFG->{gauge_size};
1247 1302
1248 my $win = new DC::UI::Frame ( 1303 $GAUGES->{win} = my $win = new DC::UI::Frame (
1249 force_x => 0, 1304 force_x => 0,
1250 force_y => "max", 1305 force_y => "max",
1251 force_w => $WIDTH, 1306 force_w => $WIDTH,
1252 force_h => $gh, 1307 force_h => $gh,
1253 ); 1308 );
1269 (new DC::UI::Empty expand => 1), 1324 (new DC::UI::Empty expand => 1),
1270 (my $hb = new DC::UI::HBox), 1325 (my $hb = new DC::UI::HBox),
1271 ], 1326 ],
1272 ); 1327 );
1273 1328
1274 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1329 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1275 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1330 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1276 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1331 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1277 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1332 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1278
1279 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1280 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1281 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1282 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1283
1284 $GAUGES = {
1285 exp => $exp, prg => $prg, sklprg => $sklprg,
1286 win => $win, range => $rng,
1287 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1288 };
1289 1333
1290 &set_gauge_window_fontsize; 1334 &set_gauge_window_fontsize;
1291 1335
1292 $win 1336 $win
1337}
1338
1339our $BW_WATCHER;
1340
1341sub debug_toggle($) {
1342 $DELIANTRA_DEBUG ^= $_[0];
1343
1344 if ($DELIANTRA_DEBUG & 16) {
1345 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1346 return unless $CONN;
1347 debug sprintf "%.2gKB/s", $CONN->{octets_in} / 1e3;
1348 $CONN->{octets_in} = 0;
1349 };
1350 } else {
1351 undef $BW_WATCHER;
1352 }
1353
1293} 1354}
1294 1355
1295sub debug_setup { 1356sub debug_setup {
1296 my $table = new DC::UI::Table; 1357 my $table = new DC::UI::Table;
1297 1358
1298 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders"); 1359 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1299 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1360 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
1300 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info"); 1361 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1301 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1362 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
1302 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS"); 1363 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1303 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1364 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
1304 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1365 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1305 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1366 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
1367 $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
1368 $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
1369
1306 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1370 $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1307
1308 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d# 1371 $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1309 1372
1310 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1373 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1311 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1374 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1312 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1375 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1313 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1376 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1634 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1697 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1635 ); 1698 );
1636 1699
1637 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1700 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1638 $table->add_at (1, 4, new DC::UI::Entry 1701 $table->add_at (1, 4, new DC::UI::Entry
1639 text => $CFG->{profile}{default}{user}, 1702 text => $PROFILE->{user},
1640 tooltip => "The name of your character on the server.", 1703 tooltip => "The name of your character on the server. The name is case-sensitive!",
1641 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1704 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1642 ); 1705 );
1643 1706
1644 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1707 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1645 $table->add_at (1, 5, new DC::UI::Entry 1708 $table->add_at (1, 5, new DC::UI::Entry
1646 text => $CFG->{profile}{default}{password}, 1709 text => $PROFILE->{password},
1647 hidden => 1, 1710 hidden => 1,
1648 tooltip => "The password for your character.", 1711 tooltip => "The password for your character.",
1649 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1712 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1650 ); 1713 );
1651 1714
1652 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1715 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1653 expand => 1, 1716 expand => 1,
1654 text => "Login / Register", 1717 text => "Login / Register",
1690 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1753 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1691 1754
1692 $vbox->add ( 1755 $vbox->add (
1693 $HOST_ENTRY = new DC::UI::Entry 1756 $HOST_ENTRY = new DC::UI::Entry
1694 expand => 1, 1757 expand => 1,
1695 text => $CFG->{profile}{default}{host}, 1758 text => $PROFILE->{host},
1696 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1759 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1697 on_changed => sub { 1760 on_changed => sub {
1698 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1699 $CFG->{profile}{default}{host} = $value; 1762 $PROFILE->{host} = $value;
1700 1 1763 1
1701 } 1764 }
1702 ); 1765 );
1703 1766
1704 if (0) { #d# disabled 1767 if (0) { #d# disabled
1747 1810
1748 my $row = 0; 1811 my $row = 0;
1749 1812
1750 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1751 $table->add_at (1, $row++, new DC::UI::CheckBox 1814 $table->add_at (1, $row++, new DC::UI::CheckBox
1815 c_colspan => 2,
1752 state => $CFG->{show_tips}, 1816 state => $CFG->{show_tips},
1753 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1817 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1754 on_changed => sub { 1818 on_changed => sub {
1755 my ($self, $value) = @_; 1819 my ($self, $value) = @_;
1756 $CFG->{show_tips} = $value; 1820 $CFG->{show_tips} = $value;
1758 } 1822 }
1759 ); 1823 );
1760 1824
1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1825 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1826 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1827 c_colspan => 2,
1763 text => $CFG->{logview_max_par}, 1828 text => $CFG->{logview_max_par},
1764 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1829 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1765 . "sends more messages than this number, older messages get removed to save memory and " 1830 . "sends more messages than this number, older messages get removed to save memory and "
1766 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1831 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1767 on_changed => sub { 1832 on_changed => sub {
1769 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1834 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1770 0 1835 0
1771 }, 1836 },
1772 ); 1837 );
1773 1838
1839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1840 $table->add_at (1, $row, new DC::UI::CheckBox
1841 state => $CFG->{config_autosave},
1842 tooltip => "Normally, configuration settings and the user interface layout "
1843 . "are saved on client exit. You can disable this behaviour by "
1844 . "unchecking this checkbox.",
1845 on_changed => sub {
1846 my ($self, $value) = @_;
1847 $CFG->{config_autosave} = $value;
1848 0
1849 }
1850 );
1851 $table->add_at (2, $row++, new DC::UI::Button
1852 text => "Save Now",
1853 tooltip => "Use this to manually save configuration and UI layout when "
1854 . "autosave is disabled.",
1855 on_activate => sub {
1856 DC::write_cfg;
1857 0
1858 }
1859 );
1860
1774 $table 1861 $table
1775} 1862}
1776 1863
1777sub autopickup_setup { 1864sub autopickup_setup {
1778 my $r = new DC::UI::ScrolledWindow ( 1865 my $r = new DC::UI::ScrolledWindow (
1784 col_expand => [0, 1, 0, 1], 1871 col_expand => [0, 1, 0, 1],
1785 ); 1872 );
1786 1873
1787 for ( 1874 for (
1788 ["General", 0, 0, 1875 ["General", 0, 0,
1789 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1790 ["Inhibit autopickup" => PICKUP_INHIBIT], 1876# ["Inhibit autopickup" => PICKUP_INHIBIT],
1791 ["Stop before pickup" => PICKUP_STOP], 1877 ["Stop before pickup" => PICKUP_STOP],
1792 ["Debug autopickup" => PICKUP_DEBUG], 1878 ["Debug autopickup" => PICKUP_DEBUG],
1793 ], 1879 ],
1794 ["Weapons", 0, 6, 1880 ["Weapons", 0, 6,
1795 ["All weapons" => PICKUP_ALLWEAPON], 1881 ["All weapons" => PICKUP_ALLWEAPON],
1843 $::CFG->{pickup} |= $mask; 1929 $::CFG->{pickup} |= $mask;
1844 } else { 1930 } else {
1845 $::CFG->{pickup} &= ~$mask; 1931 $::CFG->{pickup} &= ~$mask;
1846 } 1932 }
1847 1933
1848 $::CONN->send_command ("pickup $::CFG->{pickup}") 1934 $::CONN->send_pickup ($::CFG->{pickup})
1849 if defined $::CONN; 1935 if defined $::CONN;
1850 1936
1851 0 1937 0
1852 }); 1938 });
1853 1939
1870 }); 1956 });
1871 1957
1872 $table->add_at (3, 18, new DC::UI::Button 1958 $table->add_at (3, 18, new DC::UI::Button
1873 text => "set", 1959 text => "set",
1874 on_activate => sub { 1960 on_activate => sub {
1875 $::CONN->send_command ("pickup $::CFG->{pickup}") 1961 $::CONN->send_pickup ($::CFG->{pickup})
1876 if defined $::CONN; 1962 if defined $::CONN;
1877 0 1963 0
1878 }); 1964 });
1879 1965
1880 $r 1966 $r
1881} 1967}
1882 1968
1883my %SORT_ORDER = ( 1969my %SORT_ORDER = (
1884 type => sub { 1970 type => sub {
1971 use sort 'stable';
1885 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1972 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1886 }, 1973 },
1887 mtime => sub { 1974 mtime => sub {
1975 use sort 'stable';
1888 my $NOW = time; 1976 my $NOW = time;
1889 sort { 1977 sort {
1890 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1978 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1891 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1979 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1892 1980
1893 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1981 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1894 or $btime <=> $atime 1982 or $btime <=> $atime
1895 or $a->{type} <=> $b->{type} 1983 or $a->{type} <=> $b->{type}
1896 } @_ 1984 } @_
1897 }, 1985 },
1898 weight => sub { sort { 1986 weight => sub {
1987 use sort 'stable';
1988 sort {
1899 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1989 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1900 or $a->{type} <=> $b->{type} 1990 or $a->{type} <=> $b->{type}
1901 } @_ }, 1991 } @_
1992 },
1902); 1993);
1903 1994
1904sub inventory_widget { 1995sub inventory_widget {
1905 my $hb = new DC::UI::HBox homogeneous => 1; 1996 my $hb = new DC::UI::HBox homogeneous => 1;
1906 1997
1993 $PL_NOTEBOOK->set_current_page ($widget); 2084 $PL_NOTEBOOK->set_current_page ($widget);
1994 $PL_WINDOW->show; 2085 $PL_WINDOW->show;
1995 } 2086 }
1996} 2087}
1997 2088
1998sub player_window { 2089sub make_playerbook {
1999 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2090 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2000 x => "center", 2091 x => "center",
2001 y => "center", 2092 y => "center",
2002 force_w => $WIDTH * 9/10, 2093 force_w => $WIDTH * 9/10,
2003 force_h => $HEIGHT * 9/10, 2094 force_h => $HEIGHT * 9/10,
2037 "License, Author and Source info for media sent by the server."); 2128 "License, Author and Source info for media sent by the server.");
2038 2129
2039 $ntb->set_current_page ($INVENTORY_PAGE); 2130 $ntb->set_current_page ($INVENTORY_PAGE);
2040 2131
2041 $plwin->add ($ntb); 2132 $plwin->add ($ntb);
2042 $plwin
2043} 2133}
2044 2134
2045sub keyboard_setup { 2135sub keyboard_setup {
2046 DC::Macro::keyboard_setup 2136 DC::Macro::keyboard_setup
2047} 2137}
2048 2138
2049sub help_window { 2139sub make_help_window {
2050 my $win = new DC::UI::Toplevel 2140 my $win = new DC::UI::Toplevel
2051 x => 'center', 2141 x => 'center',
2052 y => 'center', 2142 y => 'center',
2053 z => 4, 2143 z => 4,
2054 name => 'doc_browser', 2144 name => 'doc_browser',
2143 2233
2144 $load_node->((DC::Pod::find @path)[0]); 2234 $load_node->((DC::Pod::find @path)[0]);
2145 $win->show; 2235 $win->show;
2146 }; 2236 };
2147 2237
2148 $win 2238 $HELP_WINDOW = $win;
2149}
2150
2151sub open_string_query {
2152 my ($title, $cb, $txt, $tooltip) = @_;
2153 my $dialog = new DC::UI::Toplevel
2154 x => "center",
2155 y => "center",
2156 z => 50,
2157 force_w => $WIDTH * 4/5,
2158 title => $title;
2159
2160 $dialog->add (
2161 my $e = new DC::UI::Entry
2162 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2163 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2164 tooltip => $tooltip
2165 );
2166
2167 $e->grab_focus;
2168 $e->set_text ($txt) if $txt;
2169 $dialog->show;
2170} 2239}
2171 2240
2172sub open_quit_dialog { 2241sub open_quit_dialog {
2173 unless ($QUIT_DIALOG) { 2242 unless ($QUIT_DIALOG) {
2174 $QUIT_DIALOG = new DC::UI::Toplevel 2243 $QUIT_DIALOG = new DC::UI::Toplevel
2207 2276
2208 $QUIT_DIALOG->show; 2277 $QUIT_DIALOG->show;
2209 $QUIT_DIALOG->grab_focus; 2278 $QUIT_DIALOG->grab_focus;
2210} 2279}
2211 2280
2281sub make_menubar {
2282 $MENUFRAME = new DC::UI::Toplevel
2283 border => 0,
2284 force_x => 0,
2285 force_y => 0,
2286 force_w => $::WIDTH,
2287 child => ($MENUBAR = new DC::UI::HBox),
2288 ;
2289
2290 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2291
2292 # 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
2293 make_gauge_window->show;
2294
2295# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2296# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2297
2298 make_playerbook;
2299
2300 $MENUPOPUP = DC::UI::Menu->new (items => [
2301 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2302 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2303 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2304 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2305 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2306 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2307 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2308 ["Quit…" , sub {
2309 if ($CONN) {
2310 open_quit_dialog;
2311 } else {
2312 EV::unloop EV::UNLOOP_ALL;
2313 }
2314 }],
2315 ]);
2316
2317 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2318 tooltip => "Shows the main menu",
2319 on_button_down => sub {
2320 my ($self, $ev) = @_;
2321 local $ev->{x} = 0;
2322 local $ev->{y} = 0;
2323 $MENUPOPUP->popup ($ev);
2324 },
2325 );
2326
2327 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2328 padding_x => 6,
2329 padding_y => 3,
2330 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2331 template => " Exp: 888,888,888,888 (lvl 188) ",
2332 );
2333
2334 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2335 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2336 . "will automatically pick up items as defined by your item pickup settings "
2337 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2338 . "disable autopickup by disabling this checkbox.",
2339 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2340 on_changed => sub {
2341 my ($self, $value) = @_;
2342 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2343 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2344 $CONN->send_pickup ($CFG->{pickup})
2345 if $CONN;
2346 },
2347 );
2348
2349 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2350 c_rescale => 1,
2351 padding_x => 6,
2352 padding_y => 3,
2353 force_w => $::WIDTH * 0.2,
2354 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2355 template => "two handed weapons 99%",
2356 );
2357
2358 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2359 expand => 1,
2360 align => 1, can_hover => 1, can_events => 1,
2361 text => "Range and Combat Slots",
2362 tooltip => "#stat_ranged",
2363 );
2364
2365 $MENUFRAME->show;
2366}
2367
2368sub open_string_query {
2369 my ($title, $cb, $txt, $tooltip) = @_;
2370 my $dialog = new DC::UI::Toplevel
2371 x => "center",
2372 y => "center",
2373 z => 50,
2374 force_w => $WIDTH * 4/5,
2375 title => $title;
2376
2377 $dialog->add (
2378 my $e = new DC::UI::Entry
2379 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2380 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2381 tooltip => $tooltip
2382 );
2383
2384 $e->grab_focus;
2385 $e->set_text ($txt) if $txt;
2386 $dialog->show;
2387}
2388
2212sub show_tip_of_the_day { 2389sub show_tip_of_the_day {
2213 # find all tips 2390 # find all tips
2214 my @tod = DC::Pod::find tip_of_the_day => "*"; 2391 my @tod = DC::Pod::find tip_of_the_day => "*";
2215 2392
2216 DC::DB::get state => "tip_of_the_day", sub { 2393 DC::DB::get state => "tip_of_the_day", sub {
2334 2511
2335 $DEBUG_STATUS = new DC::UI::Label 2512 $DEBUG_STATUS = new DC::UI::Label
2336 padding => 0, 2513 padding => 0,
2337 z => 100, 2514 z => 100,
2338 force_x => "max", 2515 force_x => "max",
2339 force_y => 0; 2516 force_y => 20;
2340 $DEBUG_STATUS->show; 2517 $DEBUG_STATUS->show;
2341 2518
2342 $STATUSBOX = new DC::UI::Statusbox; 2519 $STATUSBOX = new DC::UI::Statusbox;
2343 2520
2344 $MODBOX = new DC::UI::Label 2521 $MODBOX = new DC::UI::Label
2355 2532
2356 (new DC::UI::Frame 2533 (new DC::UI::Frame
2357 bg => [0, 0, 0, 0.4], 2534 bg => [0, 0, 0, 0.4],
2358 force_x => 0, 2535 force_x => 0,
2359 force_y => "max", 2536 force_y => "max",
2360 child => (my $LR = new DC::UI::VBox), 2537 child => (my $LL = new DC::UI::VBox),
2361 )->show; 2538 )->show;
2362 2539
2363 $LR->add ($STATUSBOX); 2540 $LL->add ($STATUSBOX);
2364 $LR->add ($MODBOX); 2541 $LL->add ($MODBOX);
2365 $LR->add (new DC::UI::Label 2542 $LL->add (new DC::UI::Label
2366 align => 0, 2543 align => 0,
2367 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2544 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2368 fontsize => 0.5, 2545 fontsize => 0.5,
2369 fg => [1, 1, 0, 0.7], 2546 fg => [1, 1, 0, 0.7],
2370 ); 2547 );
2371 2548
2372 DC::UI::Toplevel->new ( 2549 DC::UI::Toplevel->new (
2373 title => "Minimap", 2550 title => "Minimap",
2374 name => "mapmap", 2551 name => "mapmap",
2375 x => 0, 2552 x => 0,
2376 y => $FONTSIZE + 8, 2553 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2377 border_bg => [1, 1, 1, 192/255], 2554 border_bg => [1, 1, 1, 192/255],
2378 bg => [1, 1, 1, 0], 2555 bg => [1, 1, 1, 0],
2379 child => ($MAPMAP = new DC::MapWidget::MapMap 2556 child => ($MAPMAP = new DC::MapWidget::MapMap
2380 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2557 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2381 ), 2558 ),
2410 $METASERVER = metaserver_dialog; 2587 $METASERVER = metaserver_dialog;
2411 # the name is changed to not conflict with the older name as users could have hidden it 2588 # the name is changed to not conflict with the older name as users could have hidden it
2412 $MESSAGE_WINDOW = new DC::UI::Dockbar 2589 $MESSAGE_WINDOW = new DC::UI::Dockbar
2413 name => "message_window2", 2590 name => "message_window2",
2414 title => 'Messages', 2591 title => 'Messages',
2592 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2415 force_w => $::WIDTH * 0.6, 2593 force_w => $::WIDTH * 0.6,
2416 force_h => $::HEIGHT * 0.25, 2594 force_h => $::HEIGHT * 0.25,
2417 ; 2595 ;
2418 2596
2419 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2597 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2439 . "After pressing the combo the binding will be saved automatically and the " 2617 . "After pressing the combo the binding will be saved automatically and the "
2440 . "binding editor closes"); 2618 . "binding editor closes");
2441 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2619 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2442 "Some debuggin' options. Do not ask."); 2620 "Some debuggin' options. Do not ask.");
2443 2621
2444 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2622 make_help_window;
2623 make_menubar;
2445 2624
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2447 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2448
2449# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2450# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2451
2452 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
2453
2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2455 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2456
2457 $BUTTONBAR->add (new DC::UI::Button
2458 text => "Save Config",
2459 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2460 on_activate => sub {
2461 $::CFG->{layout} = DC::UI::get_layout;
2462 DC::write_cfg;
2463 status "Configuration Saved";
2464 0
2465 },
2466 );
2467
2468 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2469 tooltip => "View Documentation");
2470
2471 $BUTTONBAR->add (new DC::UI::Button
2472 text => "Quit",
2473 tooltip => "Terminates the program",
2474 on_activate => sub {
2475 if ($CONN) {
2476 open_quit_dialog;
2477 } else {
2478 EV::unloop EV::UNLOOP_ALL;
2479 }
2480 0
2481 },
2482 );
2483
2484 $BUTTONBAR->show;
2485 $SETUP_DIALOG->show; 2625 $SETUP_DIALOG->show;
2486 $MESSAGE_WINDOW->show; 2626 $MESSAGE_WINDOW->show;
2487 } 2627 }
2488 2628
2489 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2629 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2490 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2630 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2491 2631
2492 $CAVEAT_LABEL->set_text ("None :)"); 2632 $CAVEAT_LABEL->set_text ("None :)");
2633 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2634 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2493 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2635 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2494 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2636 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2495 2637
2496 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2638 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2497} 2639}
2507my $animate_timer; 2649my $animate_timer;
2508 2650
2509my $fps = 9; 2651my $fps = 9;
2510 2652
2511sub force_refresh { 2653sub force_refresh {
2512 if ($ENV{CFPLUS_DEBUG} & 4) { 2654 if ($DELIANTRA_DEBUG & 4) {
2513 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2655 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2514 debug sprintf "%3.2f", $fps; 2656 debug sprintf "%3.2f", $fps;
2515 } 2657 }
2516 2658
2517 undef $WANT_REFRESH; 2659 undef $WANT_REFRESH;
2525my $want_refresh = EV::prepare_ns \&force_refresh; 2667my $want_refresh = EV::prepare_ns \&force_refresh;
2526 2668
2527my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2669my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2528 $NOW = EV::now; 2670 $NOW = EV::now;
2529 2671
2530 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2672 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2531 for DC::poll_events; 2673 for DC::poll_events;
2532 2674
2533 if (%animate_object) { 2675 if (%animate_object) {
2534 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2676 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2535 $WANT_REFRESH = 1; 2677 $WANT_REFRESH = 1;
2547sub animation_stop { 2689sub animation_stop {
2548 my ($widget) = @_; 2690 my ($widget) = @_;
2549 delete $animate_object{$widget}; 2691 delete $animate_object{$widget};
2550} 2692}
2551 2693
2552%SDL_CB = (
2553 DC::SDL_QUIT => sub { 2694$SDL_CB[DC::SDL_QUIT] = sub {
2554 crash "SDL_QUIT"; 2695 crash "SDL_QUIT";
2555 EV::unloop EV::UNLOOP_ALL; 2696 EV::unloop EV::UNLOOP_ALL;
2556 }, 2697};
2557 DC::SDL_VIDEORESIZE => sub { 2698$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2558 },
2559 DC::SDL_VIDEOEXPOSE => sub { 2699$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2560 DC::UI::full_refresh; 2700 DC::UI::full_refresh;
2561 }, 2701};
2562 DC::SDL_ACTIVEEVENT => sub { 2702$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2563# not useful, as APPACTIVE includes only iconified state, not unmapped 2703# not useful, as APPACTIVE includes only iconified state, not unmapped
2564# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2704# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2565# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2705# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2566# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2706# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2567# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2707# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2568# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2708# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2569 }, 2709};
2570 DC::SDL_KEYDOWN => sub { 2710$SDL_CB[DC::SDL_KEYDOWN] = sub {
2571 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2711 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2572 # alt-enter 2712 # alt-enter
2573 video_shutdown; 2713 video_shutdown;
2574 $FULLSCREEN_ENABLE->toggle; 2714 $FULLSCREEN_ENABLE->toggle;
2575 video_init; 2715 video_init;
2576 } else { 2716 } else {
2577 &DC::UI::feed_sdl_key_down_event; 2717 &DC::UI::feed_sdl_key_down_event;
2578 } 2718 }
2579 update_modbox; 2719 update_modbox;
2580 }, 2720};
2581 DC::SDL_KEYUP => sub { 2721$SDL_CB[DC::SDL_KEYUP] = sub {
2582 &DC::UI::feed_sdl_key_up_event; 2722 &DC::UI::feed_sdl_key_up_event;
2583 update_modbox; 2723 update_modbox;
2584 }, 2724};
2585 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2725$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2586 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2726$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2587 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2727$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2588 DC::SDL_USEREVENT => sub { 2728$SDL_CB[DC::SDL_USEREVENT] = sub {
2589 if ($_[0]{code} == 1) { 2729 if ($_[0]{code} == 1) {
2590 audio_channel_finished $_[0]{data1}; 2730 audio_channel_finished $_[0]{data1};
2591 } elsif ($_[0]{code} == 0) { 2731 } elsif ($_[0]{code} == 0) {
2592 audio_music_finished; 2732 audio_music_finished;
2593 }
2594 }, 2733 }
2595); 2734};
2596 2735
2597############################################################################# 2736#############################################################################
2598 2737
2599$SIG{INT} = $SIG{TERM} = sub { 2738$SIG{INT} = $SIG{TERM} = sub {
2600 EV::unloop; 2739 EV::unloop;
2601 #d# TODO calling exit here hangs the process in some futex 2740 #d# TODO calling exit here hangs the process in some futex
2602}; 2741};
2603 2742
2604# due to mac os x + sdl combined briandamage, we need this contortion 2743# due to mac os x + sdl combined braindamage, we need this contortion
2605sub main { 2744sub main {
2606 { 2745 {
2607 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2746 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2608 2747
2609 if (-e "$Deliantra::VARDIR/client.cf") { 2748 if (-e "$Deliantra::VARDIR/client.cf") {
2626 DC::DB::open_db; 2765 DC::DB::open_db;
2627 2766
2628 DC::UI::set_layout ($::CFG->{layout}); 2767 DC::UI::set_layout ($::CFG->{layout});
2629 2768
2630 my %DEF_CFG = ( 2769 my %DEF_CFG = (
2770 config_autosave => 1,
2631 sdl_mode => undef, 2771 sdl_mode => undef,
2632 fullscreen => 1, 2772 fullscreen => 1,
2633 fast => 0, 2773 fast => 0,
2634 force_opengl11 => undef, 2774 force_opengl11 => undef,
2635 disable_alpha => 0, 2775 disable_alpha => 0,
2636 smooth_movement => 1, 2776 smooth_movement => 1,
2777 smooth_transitions => 1,
2637 texture_compression => 1, 2778 texture_compression => 1,
2638 map_scale => 1, 2779 map_scale => 1,
2639 fow_enable => 1, 2780 fow_enable => 1,
2640 fow_intensity => 0, 2781 fow_intensity => 0,
2782 fow_texture => 0,
2641 map_smoothing => 1, 2783 map_smoothing => 1,
2642 gui_fontsize => 1, 2784 gui_fontsize => 1,
2643 log_fontsize => 0.7, 2785 log_fontsize => 0.7,
2644 gauge_fontsize => 1, 2786 gauge_fontsize => 1,
2645 gauge_size => 0.35, 2787 gauge_size => 0.35,
2653 effects_enable => 1, 2795 effects_enable => 1,
2654 effects_volume => 1, 2796 effects_volume => 1,
2655 bgm_enable => 1, 2797 bgm_enable => 1,
2656 bgm_volume => 0.5, 2798 bgm_volume => 0.5,
2657 output_rate => "", 2799 output_rate => "",
2658 pickup => 0, 2800 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2659 inv_sort => "mtime", 2801 inv_sort => "mtime",
2660 default => "profile", # default profile 2802 default => "profile", # default profile
2661 show_tips => 1, 2803 show_tips => 1,
2662 logview_max_par => 1000, 2804 logview_max_par => 1000,
2663 shift_fire_stop => 0, 2805 shift_fire_stop => 0,
2664 uitheme => "wood", 2806 uitheme => "wood",
2665 ); 2807 map_shift_x => -24, # arbitrary
2808 map_shift_y => +24, # arbitrary
2666 2809 );
2810
2667 while (my ($k, $v) = each %DEF_CFG) { 2811 while (my ($k, $v) = each %DEF_CFG) {
2668 $CFG->{$k} = $v unless exists $CFG->{$k}; 2812 $CFG->{$k} = $v unless exists $CFG->{$k};
2669 } 2813 }
2670 2814
2671 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2815 my @args = @ARGV;
2816
2817 my $profile = 'default';
2818
2819 for (my $i = 0; $i < @args; $i++) {
2820 if ($args[$i] =~ /^--?profile$/) {
2821 $profile = $args[$i + 1];
2822 splice @args, $i, 2, ();
2823 $i = 0;
2824 } elsif ($args[$i] =~ /^--?h/) {
2825 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2826 exit 0;
2827 }
2828 }
2829
2830 $CFG->{profile}{$profile} ||= {};
2672 $PROFILE = $CFG->{profile}{default}; 2831 $PROFILE = $CFG->{profile}{$profile};
2832 $PROFILE->{host} ||= "gameserver.deliantra.net";
2833
2834 $PROFILE->{host} = $args[0] if @args > 0;
2835 $PROFILE->{user} = $args[1] if @args > 1;
2836 $PROFILE->{password} = $args[2] if @args > 2;
2673 2837
2674 # convert old bindings (only default profile matters) 2838 # convert old bindings (only default profile matters)
2675 if (my $bindings = delete $PROFILE->{bindings}) { 2839 if (my $bindings = delete $PROFILE->{bindings}) {
2676 while (my ($mod, $syms) = each %$bindings) { 2840 while (my ($mod, $syms) = each %$bindings) {
2677 while (my ($sym, $cmds) = each %$syms) { 2841 while (my ($sym, $cmds) = each %$syms) {
2683 } 2847 }
2684 } 2848 }
2685 2849
2686 sdl_init; 2850 sdl_init;
2687 2851
2852 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2853 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2854
2688 { 2855 {
2689 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2856 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2690 DejaVuSans.ttf 2857 DejaVuSans.ttf
2691 DejaVuSansMono.ttf 2858 DejaVuSansMono.ttf
2692 DejaVuSans-Bold.ttf 2859 DejaVuSans-Bold.ttf
2693 DejaVuSansMono-Bold.ttf 2860 DejaVuSansMono-Bold.ttf
2694 DejaVuSans-Oblique.ttf 2861 DejaVuSans-Oblique.ttf
2695 DejaVuSansMono-Oblique.ttf 2862 DejaVuSansMono-Oblique.ttf
2696 DejaVuSans-BoldOblique.ttf 2863 DejaVuSans-BoldOblique.ttf
2697 DejaVuSansMono-BoldOblique.ttf 2864 DejaVuSansMono-BoldOblique.ttf
2865 mona.ttf
2698 ); 2866 );
2699 2867
2700 DC::add_font $_ for @fonts; 2868 DC::add_font $_ for @fonts;
2701 2869
2702 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2870 $FONT_PROP = new_from_file DC::Font $fonts[0];
2703 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2871 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2704 2872
2705 $FONT_PROP->make_default; 2873 $FONT_PROP->make_default;
2706 2874
2729 our $STARTUP_CANCEL = EV::idle sub { 2897 our $STARTUP_CANCEL = EV::idle sub {
2730 undef $::STARTUP_CANCEL; 2898 undef $::STARTUP_CANCEL;
2731 $startup_done->(); 2899 $startup_done->();
2732 }; 2900 };
2733 2901
2902 debug_toggle 0;
2903
2734 delete $SIG{__DIE__}; 2904 delete $SIG{__DIE__};
2735 EV::loop; 2905 EV::loop;
2736 2906
2907 DC::write_cfg if $CFG->{config_autosave};
2908
2737#video_shutdown; 2909 #video_shutdown;
2738#audio_shutdown; 2910 #audio_shutdown;
2911
2739 DC::OpenGL::quit; 2912 DC::OpenGL::quit;
2740 DC::SDL_Quit; 2913 DC::SDL_Quit;
2741 DC::DB::Server::stop; 2914 DC::DB::Server::stop;
2742} 2915}
2743 2916
2747 2920
2748deliantra - A Deliantra MORPG game client 2921deliantra - A Deliantra MORPG game client
2749 2922
2750=head1 SYNOPSIS 2923=head1 SYNOPSIS
2751 2924
2752Just run it - no commandline arguments are supported. 2925 deliantra [--profile name] [host [user [password]]]
2926 deliantra --help
2753 2927
2754=head1 USAGE 2928=head1 USAGE
2755 2929
2756deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2930The deliantra client utilises OpenGL for all UI elements and the game. It
2757be used in fullscreen mode and interactively. 2931is supposed to be used in fullscreen mode and interactively.
2758 2932
2759=head1 DEBUGGING 2933=head1 DEBUGGING
2760 2934
2761
2762CFPLUS_DEBUG - environment variable 2935DELIANTRA_DEBUG - environment variable
2763 2936
2764 1 draw borders around widgets 2937 1 draw borders around widgets
2765 2 add low-level widget info to tooltips 2938 2 add low-level widget info to tooltips
2766 4 show fps 2939 4 show fps
2767 8 suppress tooltips 2940 8 suppress tooltips
2941 16 show bandwidth downstream
2768 2942
2769=head1 AUTHOR 2943=head1 AUTHOR
2770 2944
2771Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2945Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2772 2946

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines