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.77 by root, Fri Sep 26 04:45:48 2008 UTC vs.
Revision 1.92 by root, Wed Jan 14 00:00:47 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
49 } 54 }
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 59 } else {
75 # OS X 60 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?! 61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?! 62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 63 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 64 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 65 chdir $root; # for pango modules, maybe other things
81 } 66 }
82 67
… …
106 91
107use Deliantra; 92use Deliantra;
108use Deliantra::Protocol::Constants; 93use Deliantra::Protocol::Constants;
109 94
110use AnyEvent::Util (); 95use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket (); 96use AnyEvent::Socket ();
97use AnyEvent::DNS ();
113 98
114use Compress::LZF; 99use Compress::LZF;
115use JSON::XS; 100use JSON::XS;
116 101
117use DC; 102use DC;
… …
145 130
146$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 131$SIG{QUIT} = sub { Carp::cluck "QUIT" };
147$SIG{PIPE} = 'IGNORE'; 132$SIG{PIPE} = 'IGNORE';
148 133
149$EV::DIED = sub { 134$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1; 135 crash "CRASH/EV::DIED: $@" => 0;
151 DC::fatal Carp::longmess $@; 136 DC::fatal Carp::longmess $@;
152}; 137};
153 138
154my $MAX_FPS = 60; 139my $MAX_FPS = 60;
155 140
… …
181 166
182our $MAP; 167our $MAP;
183our $MAPMAP; 168our $MAPMAP;
184our $MAPWIDGET; 169our $MAPWIDGET;
185our $COMPLETER; 170our $COMPLETER;
186our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
187our $METASERVER; 175our $METASERVER;
188our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
189our $QUIT_DIALOG; 177our $QUIT_DIALOG;
190our $HOST_ENTRY; 178our $HOST_ENTRY;
191our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
… …
217our $FLOORBOX; 205our $FLOORBOX;
218our $GAUGES; 206our $GAUGES;
219our $STATWIDS; 207our $STATWIDS;
220 208
221our $SDL_ACTIVE; 209our $SDL_ACTIVE;
222our %SDL_CB; 210our @SDL_CB;
223 211
224our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
225our $STATUSBOX; 213our $STATUSBOX;
226our $MODBOX; 214our $MODBOX;
227our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
235# write a crash message blockingly to the socket, if possible 223# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy. 224# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) { 225*crash = sub($;$) {
238 my ($msg, $backtrace) = @_; 226 my ($msg, $backtrace) = @_;
239 227
228 warn $msg;
229
240 return unless $CONN; 230 return unless $CONN;
241 231
242 my $fh = $CONN->{fh} 232 my $fh = $CONN->{fh}
243 or return; 233 or return;
244 234
… …
254 244
255 # backtrace as second step, in case it crashes, too 245 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated" 246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace; 247 if $backtrace;
258}; 248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
259 260
260############################################################################# 261#############################################################################
261 262
262sub status { 263sub status {
263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
345 or return; 346 or return;
346 347
347 $meta->{data} 348 $meta->{data}
348 or return; 349 or return;
349 350
350 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
351 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
352 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
353 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
354 &audio_music_push ($face); 355 &audio_music_push ($face);
355 } 356 }
356 } else { 357 } else {
357 # fetch from database 358 # fetch from database
358 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
359 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
360 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
361 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;
362 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
363 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
364 365
365 audio_sound_push ($face); 366 audio_sound_push ($face);
366 }; 367 };
… …
413 414
414 audio_music_update_volume; 415 audio_music_update_volume;
415 416
416 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
417 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
418 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
419 ? 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
420 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
421 425
422 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
423 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
424 428
425 my $NOW = time; 429 my $NOW = time;
426 430
427 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
428 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
786} 790}
787 791
788sub dc_connect { 792sub dc_connect {
789 my ($host, $port) = @_; 793 my ($host, $port) = @_;
790 794
791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
792 797
793 $CONN = 798 $CONN =
794 new DC::Protocol 799 new DC::Protocol
795 host => $host, 800 host => $host,
796 port => $port, 801 port => $port,
797 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
798 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
799 mapw => $mapsize, 804 mapw => $mapw,
800 maph => $mapsize, 805 maph => $maph,
801 806
802 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
803 808
804 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
805 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
916 921
917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 922 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
918 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
919 924
920 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
926 c_rescale => 1,
921 force_w => $WIDTH * 0.1, expand => 1, 927 force_w => $WIDTH * 0.1, expand => 1,
922 range => [ ($CFG->{sdl_mode}) x 3 ], 928 range => [ ($CFG->{sdl_mode}) x 3 ],
923 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
924 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
925 height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
… …
953 ); 959 );
954 960
955 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha"); 961 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
956 $table->add_at (1, $row++, new DC::UI::CheckBox 962 $table->add_at (1, $row++, new DC::UI::CheckBox
957 state => $CFG->{disable_alpha}, 963 state => $CFG->{disable_alpha},
958 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse " 964 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
959 . "by disabling a number of textures and transparency effects. Normally, these " 965 . "by disabling a number of textures and transparency effects. Normally, these "
960 . "effects do not cost a lot of resources, but some graphics cards might fall " 966 . "effects do not cost a lot of resources, but some graphics cards might fall "
961 . "back to extremely slow rendering if this is enabled. If disabling this option " 967 . "back to extremely slow rendering if this is enabled. If disabling this option "
962 . "noticably improves the framerate of the client please report this! " 968 . "noticably improves the framerate of the client please report this! "
963 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>", 969 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
… …
1249} 1255}
1250 1256
1251sub make_gauge_window { 1257sub make_gauge_window {
1252 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1253 1259
1254 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1255 force_x => 0, 1261 force_x => 0,
1256 force_y => "max", 1262 force_y => "max",
1257 force_w => $WIDTH, 1263 force_w => $WIDTH,
1258 force_h => $gh, 1264 force_h => $gh,
1259 ); 1265 );
… …
1275 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1276 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1277 ], 1283 ],
1278 ); 1284 );
1279 1285
1280 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1286 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1281 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1287 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1282 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1288 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1283 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1289 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1284
1285 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1286 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1287 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1288 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1289
1290 $GAUGES = {
1291 exp => $exp, prg => $prg, sklprg => $sklprg,
1292 win => $win, range => $rng,
1293 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1294 };
1295 1290
1296 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1297 1292
1298 $win 1293 $win
1299} 1294}
… …
1641 ); 1636 );
1642 1637
1643 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1644 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1645 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1646 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1647 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1648 ); 1643 );
1649 1644
1650 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1651 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
… …
1753 1748
1754 my $row = 0; 1749 my $row = 0;
1755 1750
1756 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1757 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1758 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1759 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1755 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1760 on_changed => sub { 1756 on_changed => sub {
1761 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1762 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
… …
1764 } 1760 }
1765 ); 1761 );
1766 1762
1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1763 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1764 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1765 c_colspan => 2,
1769 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1770 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1767 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1771 . "sends more messages than this number, older messages get removed to save memory and " 1768 . "sends more messages than this number, older messages get removed to save memory and "
1772 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1769 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1773 on_changed => sub { 1770 on_changed => sub {
… …
1775 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1776 0 1773 0
1777 }, 1774 },
1778 ); 1775 );
1779 1776
1777 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1778 $table->add_at (1, $row, new DC::UI::CheckBox
1779 state => $CFG->{config_autosave},
1780 tooltip => "Normally, configuration settings and the user interface layout "
1781 . "are saved on client exit. You can disable this behaviour by "
1782 . "unchecking this checkbox.",
1783 on_changed => sub {
1784 my ($self, $value) = @_;
1785 $CFG->{config_autosave} = $value;
1786 0
1787 }
1788 );
1789 $table->add_at (2, $row++, new DC::UI::Button
1790 text => "Save Now",
1791 tooltip => "Use this to manually save configuration and UI layout when "
1792 . "autosave is disabled.",
1793 on_activate => sub {
1794 DC::write_cfg;
1795 0
1796 }
1797 );
1798
1780 $table 1799 $table
1781} 1800}
1782 1801
1783sub autopickup_setup { 1802sub autopickup_setup {
1784 my $r = new DC::UI::ScrolledWindow ( 1803 my $r = new DC::UI::ScrolledWindow (
… …
1790 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1791 ); 1810 );
1792 1811
1793 for ( 1812 for (
1794 ["General", 0, 0, 1813 ["General", 0, 0,
1795 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1796 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814# ["Inhibit autopickup" => PICKUP_INHIBIT],
1797 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1798 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1799 ], 1817 ],
1800 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
1801 ["All weapons" => PICKUP_ALLWEAPON], 1819 ["All weapons" => PICKUP_ALLWEAPON],
… …
1849 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1850 } else { 1868 } else {
1851 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1852 } 1870 }
1853 1871
1854 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1855 if defined $::CONN; 1873 if defined $::CONN;
1856 1874
1857 0 1875 0
1858 }); 1876 });
1859 1877
… …
1876 }); 1894 });
1877 1895
1878 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1879 text => "set", 1897 text => "set",
1880 on_activate => sub { 1898 on_activate => sub {
1881 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1882 if defined $::CONN; 1900 if defined $::CONN;
1883 0 1901 0
1884 }); 1902 });
1885 1903
1886 $r 1904 $r
… …
1999 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
2000 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
2001 } 2019 }
2002} 2020}
2003 2021
2004sub player_window { 2022sub make_playerbook {
2005 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2006 x => "center", 2024 x => "center",
2007 y => "center", 2025 y => "center",
2008 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
2009 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
… …
2043 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
2044 2062
2045 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
2046 2064
2047 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
2048 $plwin
2049} 2066}
2050 2067
2051sub keyboard_setup { 2068sub keyboard_setup {
2052 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
2053} 2070}
2054 2071
2055sub help_window { 2072sub make_help_window {
2056 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
2057 x => 'center', 2074 x => 'center',
2058 y => 'center', 2075 y => 'center',
2059 z => 4, 2076 z => 4,
2060 name => 'doc_browser', 2077 name => 'doc_browser',
… …
2149 2166
2150 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
2151 $win->show; 2168 $win->show;
2152 }; 2169 };
2153 2170
2154 $win 2171 $HELP_WINDOW = $win;
2155}
2156
2157sub open_string_query {
2158 my ($title, $cb, $txt, $tooltip) = @_;
2159 my $dialog = new DC::UI::Toplevel
2160 x => "center",
2161 y => "center",
2162 z => 50,
2163 force_w => $WIDTH * 4/5,
2164 title => $title;
2165
2166 $dialog->add (
2167 my $e = new DC::UI::Entry
2168 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2169 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2170 tooltip => $tooltip
2171 );
2172
2173 $e->grab_focus;
2174 $e->set_text ($txt) if $txt;
2175 $dialog->show;
2176} 2172}
2177 2173
2178sub open_quit_dialog { 2174sub open_quit_dialog {
2179 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2180 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2213 2209
2214 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2215 $QUIT_DIALOG->grab_focus; 2211 $QUIT_DIALOG->grab_focus;
2216} 2212}
2217 2213
2214sub make_menubar {
2215 $MENUFRAME = new DC::UI::Toplevel
2216 border => 0,
2217 force_x => 0,
2218 force_y => 0,
2219 force_w => $::WIDTH,
2220 child => ($MENUBAR = new DC::UI::HBox),
2221 ;
2222
2223 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2224
2225 # 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
2226 make_gauge_window->show;
2227
2228# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2229# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2230
2231 make_playerbook;
2232
2233 $MENUPOPUP = DC::UI::Menu->new (items => [
2234 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2235 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2236 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2237 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2238 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2239 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2240 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2241 ["Quit…" , sub {
2242 if ($CONN) {
2243 open_quit_dialog;
2244 } else {
2245 EV::unloop EV::UNLOOP_ALL;
2246 }
2247 }],
2248 ]);
2249
2250 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2251 tooltip => "Shows the main menu",
2252 on_button_down => sub {
2253 my ($self, $ev) = @_;
2254 local $ev->{x} = 0;
2255 local $ev->{y} = 0;
2256 $MENUPOPUP->popup ($ev);
2257 },
2258 );
2259
2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2261 padding_x => 6,
2262 padding_y => 3,
2263 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2264 template => " Exp: 888,888,888,888 (lvl 188) ",
2265 );
2266
2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2269 . "will automatically pick up items as defined by your item pickup settings "
2270 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2271 . "disable autopickup by disabling this checkbox.",
2272 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2273 on_changed => sub {
2274 my ($self, $value) = @_;
2275 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2276 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2277 $CONN->send_pickup ($CFG->{pickup})
2278 if $CONN;
2279 },
2280 );
2281
2282 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2283 c_rescale => 1,
2284 padding_x => 6,
2285 padding_y => 3,
2286 force_w => $::WIDTH * 0.2,
2287 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2288 template => "two handed weapons 99%",
2289 );
2290
2291 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2292 expand => 1,
2293 align => 1, can_hover => 1, can_events => 1,
2294 text => "Range and Combat Slots",
2295 tooltip => "#stat_ranged",
2296 );
2297
2298 $MENUFRAME->show;
2299}
2300
2301sub open_string_query {
2302 my ($title, $cb, $txt, $tooltip) = @_;
2303 my $dialog = new DC::UI::Toplevel
2304 x => "center",
2305 y => "center",
2306 z => 50,
2307 force_w => $WIDTH * 4/5,
2308 title => $title;
2309
2310 $dialog->add (
2311 my $e = new DC::UI::Entry
2312 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2313 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2314 tooltip => $tooltip
2315 );
2316
2317 $e->grab_focus;
2318 $e->set_text ($txt) if $txt;
2319 $dialog->show;
2320}
2321
2218sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2219 # find all tips 2323 # find all tips
2220 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
2221 2325
2222 DC::DB::get state => "tip_of_the_day", sub { 2326 DC::DB::get state => "tip_of_the_day", sub {
… …
2361 2465
2362 (new DC::UI::Frame 2466 (new DC::UI::Frame
2363 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2364 force_x => 0, 2468 force_x => 0,
2365 force_y => "max", 2469 force_y => "max",
2366 child => (my $LR = new DC::UI::VBox), 2470 child => (my $LL = new DC::UI::VBox),
2367 )->show; 2471 )->show;
2368 2472
2369 $LR->add ($STATUSBOX); 2473 $LL->add ($STATUSBOX);
2370 $LR->add ($MODBOX); 2474 $LL->add ($MODBOX);
2371 $LR->add (new DC::UI::Label 2475 $LL->add (new DC::UI::Label
2372 align => 0, 2476 align => 0,
2373 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2477 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2374 fontsize => 0.5, 2478 fontsize => 0.5,
2375 fg => [1, 1, 0, 0.7], 2479 fg => [1, 1, 0, 0.7],
2376 ); 2480 );
2377 2481
2378 DC::UI::Toplevel->new ( 2482 DC::UI::Toplevel->new (
2379 title => "Minimap", 2483 title => "Minimap",
2380 name => "mapmap", 2484 name => "mapmap",
2381 x => 0, 2485 x => 0,
2382 y => $FONTSIZE + 8, 2486 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2383 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2384 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2385 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 child => ($MAPMAP = new DC::MapWidget::MapMap
2386 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2387 ), 2491 ),
… …
2416 $METASERVER = metaserver_dialog; 2520 $METASERVER = metaserver_dialog;
2417 # the name is changed to not conflict with the older name as users could have hidden it 2521 # the name is changed to not conflict with the older name as users could have hidden it
2418 $MESSAGE_WINDOW = new DC::UI::Dockbar 2522 $MESSAGE_WINDOW = new DC::UI::Dockbar
2419 name => "message_window2", 2523 name => "message_window2",
2420 title => 'Messages', 2524 title => 'Messages',
2525 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2421 force_w => $::WIDTH * 0.6, 2526 force_w => $::WIDTH * 0.6,
2422 force_h => $::HEIGHT * 0.25, 2527 force_h => $::HEIGHT * 0.25,
2423 ; 2528 ;
2424 2529
2425 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2530 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2445 . "After pressing the combo the binding will be saved automatically and the " 2550 . "After pressing the combo the binding will be saved automatically and the "
2446 . "binding editor closes"); 2551 . "binding editor closes");
2447 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2552 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2448 "Some debuggin' options. Do not ask."); 2553 "Some debuggin' options. Do not ask.");
2449 2554
2450 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2555 make_help_window;
2556 make_menubar;
2451 2557
2452 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2453 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2454
2455# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2456# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2457
2458 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
2459
2460 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2461 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2462
2463 $BUTTONBAR->add (new DC::UI::Button
2464 text => "Save Config",
2465 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2466 on_activate => sub {
2467 $::CFG->{layout} = DC::UI::get_layout;
2468 DC::write_cfg;
2469 status "Configuration Saved";
2470 0
2471 },
2472 );
2473
2474 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2475 tooltip => "View Documentation");
2476
2477 $BUTTONBAR->add (new DC::UI::Button
2478 text => "Quit",
2479 tooltip => "Terminates the program",
2480 on_activate => sub {
2481 if ($CONN) {
2482 open_quit_dialog;
2483 } else {
2484 EV::unloop EV::UNLOOP_ALL;
2485 }
2486 0
2487 },
2488 );
2489
2490 $BUTTONBAR->show;
2491 $SETUP_DIALOG->show; 2558 $SETUP_DIALOG->show;
2492 $MESSAGE_WINDOW->show; 2559 $MESSAGE_WINDOW->show;
2493 } 2560 }
2494 2561
2495 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2562 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
… …
2531my $want_refresh = EV::prepare_ns \&force_refresh; 2598my $want_refresh = EV::prepare_ns \&force_refresh;
2532 2599
2533my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2600my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2534 $NOW = EV::now; 2601 $NOW = EV::now;
2535 2602
2536 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2603 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2537 for DC::poll_events; 2604 for DC::poll_events;
2538 2605
2539 if (%animate_object) { 2606 if (%animate_object) {
2540 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2607 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2541 $WANT_REFRESH = 1; 2608 $WANT_REFRESH = 1;
… …
2553sub animation_stop { 2620sub animation_stop {
2554 my ($widget) = @_; 2621 my ($widget) = @_;
2555 delete $animate_object{$widget}; 2622 delete $animate_object{$widget};
2556} 2623}
2557 2624
2558%SDL_CB = (
2559 DC::SDL_QUIT => sub { 2625$SDL_CB[DC::SDL_QUIT] = sub {
2560 crash "SDL_QUIT"; 2626 crash "SDL_QUIT";
2561 EV::unloop EV::UNLOOP_ALL; 2627 EV::unloop EV::UNLOOP_ALL;
2562 }, 2628};
2563 DC::SDL_VIDEORESIZE => sub { 2629$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2564 },
2565 DC::SDL_VIDEOEXPOSE => sub { 2630$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2566 DC::UI::full_refresh; 2631 DC::UI::full_refresh;
2567 }, 2632};
2568 DC::SDL_ACTIVEEVENT => sub { 2633$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2569# not useful, as APPACTIVE includes only iconified state, not unmapped 2634# not useful, as APPACTIVE includes only iconified state, not unmapped
2570# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2635# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2571# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2636# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2572# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2637# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2573# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2638# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2574# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2639# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2575 }, 2640};
2576 DC::SDL_KEYDOWN => sub { 2641$SDL_CB[DC::SDL_KEYDOWN] = sub {
2577 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2642 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2578 # alt-enter 2643 # alt-enter
2579 video_shutdown; 2644 video_shutdown;
2580 $FULLSCREEN_ENABLE->toggle; 2645 $FULLSCREEN_ENABLE->toggle;
2581 video_init; 2646 video_init;
2582 } else { 2647 } else {
2583 &DC::UI::feed_sdl_key_down_event; 2648 &DC::UI::feed_sdl_key_down_event;
2584 } 2649 }
2585 update_modbox; 2650 update_modbox;
2586 }, 2651};
2587 DC::SDL_KEYUP => sub { 2652$SDL_CB[DC::SDL_KEYUP] = sub {
2588 &DC::UI::feed_sdl_key_up_event; 2653 &DC::UI::feed_sdl_key_up_event;
2589 update_modbox; 2654 update_modbox;
2590 }, 2655};
2591 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2656$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2592 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2657$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2593 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2658$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2594 DC::SDL_USEREVENT => sub { 2659$SDL_CB[DC::SDL_USEREVENT] = sub {
2595 if ($_[0]{code} == 1) { 2660 if ($_[0]{code} == 1) {
2596 audio_channel_finished $_[0]{data1}; 2661 audio_channel_finished $_[0]{data1};
2597 } elsif ($_[0]{code} == 0) { 2662 } elsif ($_[0]{code} == 0) {
2598 audio_music_finished; 2663 audio_music_finished;
2599 }
2600 }, 2664 }
2601); 2665};
2602 2666
2603############################################################################# 2667#############################################################################
2604 2668
2605$SIG{INT} = $SIG{TERM} = sub { 2669$SIG{INT} = $SIG{TERM} = sub {
2606 EV::unloop; 2670 EV::unloop;
2607 #d# TODO calling exit here hangs the process in some futex 2671 #d# TODO calling exit here hangs the process in some futex
2608}; 2672};
2609 2673
2610# due to mac os x + sdl combined briandamage, we need this contortion 2674# due to mac os x + sdl combined braindamage, we need this contortion
2611sub main { 2675sub main {
2612 { 2676 {
2613 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2677 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2614 2678
2615 if (-e "$Deliantra::VARDIR/client.cf") { 2679 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2632 DC::DB::open_db; 2696 DC::DB::open_db;
2633 2697
2634 DC::UI::set_layout ($::CFG->{layout}); 2698 DC::UI::set_layout ($::CFG->{layout});
2635 2699
2636 my %DEF_CFG = ( 2700 my %DEF_CFG = (
2701 config_autosave => 1,
2637 sdl_mode => undef, 2702 sdl_mode => undef,
2638 fullscreen => 1, 2703 fullscreen => 1,
2639 fast => 0, 2704 fast => 0,
2640 force_opengl11 => undef, 2705 force_opengl11 => undef,
2641 disable_alpha => 0, 2706 disable_alpha => 0,
… …
2659 effects_enable => 1, 2724 effects_enable => 1,
2660 effects_volume => 1, 2725 effects_volume => 1,
2661 bgm_enable => 1, 2726 bgm_enable => 1,
2662 bgm_volume => 0.5, 2727 bgm_volume => 0.5,
2663 output_rate => "", 2728 output_rate => "",
2664 pickup => 0, 2729 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2665 inv_sort => "mtime", 2730 inv_sort => "mtime",
2666 default => "profile", # default profile 2731 default => "profile", # default profile
2667 show_tips => 1, 2732 show_tips => 1,
2668 logview_max_par => 1000, 2733 logview_max_par => 1000,
2669 shift_fire_stop => 0, 2734 shift_fire_stop => 0,
2670 uitheme => "wood", 2735 uitheme => "wood",
2736 map_shift_x => -24, # arbitrary
2737 map_shift_y => +24, # arbitrary
2671 ); 2738 );
2672 2739
2673 while (my ($k, $v) = each %DEF_CFG) { 2740 while (my ($k, $v) = each %DEF_CFG) {
2674 $CFG->{$k} = $v unless exists $CFG->{$k}; 2741 $CFG->{$k} = $v unless exists $CFG->{$k};
2675 } 2742 }
… …
2738 }; 2805 };
2739 2806
2740 delete $SIG{__DIE__}; 2807 delete $SIG{__DIE__};
2741 EV::loop; 2808 EV::loop;
2742 2809
2810 DC::write_cfg if $CFG->{config_autosave};
2811
2743#video_shutdown; 2812 #video_shutdown;
2744#audio_shutdown; 2813 #audio_shutdown;
2814
2745 DC::OpenGL::quit; 2815 DC::OpenGL::quit;
2746 DC::SDL_Quit; 2816 DC::SDL_Quit;
2747 DC::DB::Server::stop; 2817 DC::DB::Server::stop;
2748} 2818}
2749 2819

Diff Legend

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