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.83 by root, Sun Jan 4 10:22:19 2009 UTC vs.
Revision 1.97 by root, Thu Nov 26 07:19:12 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 {
… …
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 # OS X 60 # 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"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
59 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
60 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
61 } 64 }
62 65
63 unshift @INC, $root; 66 unshift @INC, $root;
64 } 67 }
65} 68}
66 69
67# prepend private library directory 70# prepend private library directory and prepare env
68BEGIN { 71BEGIN {
69 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
70 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
71 if (-d $path) { 74 if (-d $path) {
72 unshift @INC, $path; 75 unshift @INC, $path;
… …
86 89
87use Deliantra; 90use Deliantra;
88use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
89 92
90use AnyEvent::Util (); 93use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket (); 94use AnyEvent::Socket ();
93use AnyEvent::DNS (); 95use AnyEvent::DNS ();
94 96
95use Compress::LZF; 97use Compress::LZF;
96use JSON::XS; 98use JSON::XS;
… …
162 164
163our $MAP; 165our $MAP;
164our $MAPMAP; 166our $MAPMAP;
165our $MAPWIDGET; 167our $MAPWIDGET;
166our $COMPLETER; 168our $COMPLETER;
167our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
168our $METASERVER; 173our $METASERVER;
169our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
170our $QUIT_DIALOG; 175our $QUIT_DIALOG;
171our $HOST_ENTRY; 176our $HOST_ENTRY;
172our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
198our $FLOORBOX; 203our $FLOORBOX;
199our $GAUGES; 204our $GAUGES;
200our $STATWIDS; 205our $STATWIDS;
201 206
202our $SDL_ACTIVE; 207our $SDL_ACTIVE;
203our %SDL_CB; 208our @SDL_CB;
204 209
205our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
206our $STATUSBOX; 211our $STATUSBOX;
207our $MODBOX; 212our $MODBOX;
208our $DEBUG_STATUS; 213our $DEBUG_STATUS;
… …
339 or return; 344 or return;
340 345
341 $meta->{data} 346 $meta->{data}
342 or return; 347 or return;
343 348
344 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
345 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
346 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
347 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
348 &audio_music_push ($face); 353 &audio_music_push ($face);
349 } 354 }
350 } else { 355 } else {
351 # fetch from database 356 # fetch from database
352 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
353 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
354 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
355 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
356 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
357 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
358 363
359 audio_sound_push ($face); 364 audio_sound_push ($face);
360 }; 365 };
… …
407 412
408 audio_music_update_volume; 413 audio_music_update_volume;
409 414
410 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
411 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
412 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
413 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
414 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
415 423
416 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
417 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
418 426
… …
540 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
541 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
542 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
543 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
544 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
545 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
546 undef $SDL_MIXER; 556 undef $SDL_MIXER;
547} 557}
548 558
549############################################################################# 559#############################################################################
… …
808 818
809 on_connect => sub { 819 on_connect => sub {
810 if ($_[0]) { 820 if ($_[0]) {
811 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
812 822
813 status "login successful"; 823 status "successfully connected to the server";
814 } else { 824 } else {
815 undef $CONN; 825 undef $CONN;
816 status "unable to connect: $!"; 826 status "unable to connect: $!";
817 stop_game(); 827 stop_game();
818 } 828 }
… …
833 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
834 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
835 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
836 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
837 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
838 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
839 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
840 } 854 }
841 855
842 dc_connect $host, $port; 856 dc_connect $host, $port;
843 }; 857 };
844 } else { 858 } else {
… …
911 925
912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
913 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
914 928
915 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
930 c_rescale => 1,
916 force_w => $WIDTH * 0.1, expand => 1, 931 force_w => $WIDTH * 0.1, expand => 1,
917 range => [ ($CFG->{sdl_mode}) x 3 ], 932 range => [ ($CFG->{sdl_mode}) x 3 ],
918 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
919 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
920 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
… …
1244} 1259}
1245 1260
1246sub make_gauge_window { 1261sub make_gauge_window {
1247 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1248 1263
1249 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1250 force_x => 0, 1265 force_x => 0,
1251 force_y => "max", 1266 force_y => "max",
1252 force_w => $WIDTH, 1267 force_w => $WIDTH,
1253 force_h => $gh, 1268 force_h => $gh,
1254 ); 1269 );
… …
1270 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1271 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1272 ], 1287 ],
1273 ); 1288 );
1274 1289
1275 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1276 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1291 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1277 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1292 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1278 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1293 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1279
1280 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1281 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1282 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1283 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1284
1285 $GAUGES = {
1286 exp => $exp, prg => $prg, sklprg => $sklprg,
1287 win => $win, range => $rng,
1288 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1289 };
1290 1294
1291 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1292 1296
1293 $win 1297 $win
1294} 1298}
… …
1636 ); 1640 );
1637 1641
1638 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1639 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1640 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1641 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1642 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1643 ); 1647 );
1644 1648
1645 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1646 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1748 1752
1749 my $row = 0; 1753 my $row = 0;
1750 1754
1751 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1752 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1753 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1754 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1755 on_changed => sub { 1760 on_changed => sub {
1756 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1757 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1759 } 1764 }
1760 ); 1765 );
1761 1766
1762 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1763 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1764 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1766 . "sends more messages than this number, older messages get removed to save memory and " 1772 . "sends more messages than this number, older messages get removed to save memory and "
1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1768 on_changed => sub { 1774 on_changed => sub {
… …
1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1771 0 1777 0
1772 }, 1778 },
1773 ); 1779 );
1774 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1775 $table 1803 $table
1776} 1804}
1777 1805
1778sub autopickup_setup { 1806sub autopickup_setup {
1779 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1785 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1786 ); 1814 );
1787 1815
1788 for ( 1816 for (
1789 ["General", 0, 0, 1817 ["General", 0, 0,
1790 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1791 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1792 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1793 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1794 ], 1821 ],
1795 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1796 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1844 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1845 } else { 1872 } else {
1846 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1847 } 1874 }
1848 1875
1849 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1850 if defined $::CONN; 1877 if defined $::CONN;
1851 1878
1852 0 1879 0
1853 }); 1880 });
1854 1881
… …
1871 }); 1898 });
1872 1899
1873 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1874 text => "set", 1901 text => "set",
1875 on_activate => sub { 1902 on_activate => sub {
1876 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1877 if defined $::CONN; 1904 if defined $::CONN;
1878 0 1905 0
1879 }); 1906 });
1880 1907
1881 $r 1908 $r
… …
1994 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1995 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1996 } 2023 }
1997} 2024}
1998 2025
1999sub player_window { 2026sub make_playerbook {
2000 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
2001 x => "center", 2028 x => "center",
2002 y => "center", 2029 y => "center",
2003 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
2004 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
2038 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
2039 2066
2040 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
2041 2068
2042 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
2043 $plwin
2044} 2070}
2045 2071
2046sub keyboard_setup { 2072sub keyboard_setup {
2047 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
2048} 2074}
2049 2075
2050sub help_window { 2076sub make_help_window {
2051 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
2052 x => 'center', 2078 x => 'center',
2053 y => 'center', 2079 y => 'center',
2054 z => 4, 2080 z => 4,
2055 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2144 2170
2145 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2146 $win->show; 2172 $win->show;
2147 }; 2173 };
2148 2174
2149 $win 2175 $HELP_WINDOW = $win;
2150}
2151
2152sub open_string_query {
2153 my ($title, $cb, $txt, $tooltip) = @_;
2154 my $dialog = new DC::UI::Toplevel
2155 x => "center",
2156 y => "center",
2157 z => 50,
2158 force_w => $WIDTH * 4/5,
2159 title => $title;
2160
2161 $dialog->add (
2162 my $e = new DC::UI::Entry
2163 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2164 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2165 tooltip => $tooltip
2166 );
2167
2168 $e->grab_focus;
2169 $e->set_text ($txt) if $txt;
2170 $dialog->show;
2171} 2176}
2172 2177
2173sub open_quit_dialog { 2178sub open_quit_dialog {
2174 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2175 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2208 2213
2209 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2210 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2211} 2216}
2212 2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # 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
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2324}
2325
2213sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2214 # find all tips 2327 # find all tips
2215 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
2216 2329
2217 DC::DB::get state => "tip_of_the_day", sub { 2330 DC::DB::get state => "tip_of_the_day", sub {
… …
2356 2469
2357 (new DC::UI::Frame 2470 (new DC::UI::Frame
2358 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2359 force_x => 0, 2472 force_x => 0,
2360 force_y => "max", 2473 force_y => "max",
2361 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2362 )->show; 2475 )->show;
2363 2476
2364 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2365 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2366 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2367 align => 0, 2480 align => 0,
2368 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2369 fontsize => 0.5, 2482 fontsize => 0.5,
2370 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2371 ); 2484 );
2372 2485
2373 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2374 title => "Minimap", 2487 title => "Minimap",
2375 name => "mapmap", 2488 name => "mapmap",
2376 x => 0, 2489 x => 0,
2377 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2378 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2379 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2380 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2381 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2382 ), 2495 ),
… …
2411 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2412 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2413 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2414 name => "message_window2", 2527 name => "message_window2",
2415 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2416 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2417 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2418 ; 2532 ;
2419 2533
2420 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2440 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2441 . "binding editor closes"); 2555 . "binding editor closes");
2442 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2443 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2444 2558
2445 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2446 2561
2447 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2448 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2449
2450# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2451# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2452
2453 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
2454
2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2456 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2457
2458 $BUTTONBAR->add (new DC::UI::Button
2459 text => "Save Config",
2460 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2461 on_activate => sub {
2462 $::CFG->{layout} = DC::UI::get_layout;
2463 DC::write_cfg;
2464 status "Configuration Saved";
2465 0
2466 },
2467 );
2468
2469 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2470 tooltip => "View Documentation");
2471
2472 $BUTTONBAR->add (new DC::UI::Button
2473 text => "Quit",
2474 tooltip => "Terminates the program",
2475 on_activate => sub {
2476 if ($CONN) {
2477 open_quit_dialog;
2478 } else {
2479 EV::unloop EV::UNLOOP_ALL;
2480 }
2481 0
2482 },
2483 );
2484
2485 $BUTTONBAR->show;
2486 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2487 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2488 } 2564 }
2489 2565
2490 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2491 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2492 2568
2493 $CAVEAT_LABEL->set_text ("None :)"); 2569 $CAVEAT_LABEL->set_text ("None :)");
2570 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2571 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2494 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2572 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2495 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2573 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2496 2574
2497 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2575 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2498} 2576}
… …
2526my $want_refresh = EV::prepare_ns \&force_refresh; 2604my $want_refresh = EV::prepare_ns \&force_refresh;
2527 2605
2528my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2606my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2529 $NOW = EV::now; 2607 $NOW = EV::now;
2530 2608
2531 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2609 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2532 for DC::poll_events; 2610 for DC::poll_events;
2533 2611
2534 if (%animate_object) { 2612 if (%animate_object) {
2535 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2613 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2536 $WANT_REFRESH = 1; 2614 $WANT_REFRESH = 1;
… …
2548sub animation_stop { 2626sub animation_stop {
2549 my ($widget) = @_; 2627 my ($widget) = @_;
2550 delete $animate_object{$widget}; 2628 delete $animate_object{$widget};
2551} 2629}
2552 2630
2553%SDL_CB = (
2554 DC::SDL_QUIT => sub { 2631$SDL_CB[DC::SDL_QUIT] = sub {
2555 crash "SDL_QUIT"; 2632 crash "SDL_QUIT";
2556 EV::unloop EV::UNLOOP_ALL; 2633 EV::unloop EV::UNLOOP_ALL;
2557 }, 2634};
2558 DC::SDL_VIDEORESIZE => sub { 2635$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2559 },
2560 DC::SDL_VIDEOEXPOSE => sub { 2636$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2561 DC::UI::full_refresh; 2637 DC::UI::full_refresh;
2562 }, 2638};
2563 DC::SDL_ACTIVEEVENT => sub { 2639$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2564# not useful, as APPACTIVE includes only iconified state, not unmapped 2640# not useful, as APPACTIVE includes only iconified state, not unmapped
2565# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2641# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2566# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2642# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2567# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2643# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2568# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2644# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2569# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2645# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2570 }, 2646};
2571 DC::SDL_KEYDOWN => sub { 2647$SDL_CB[DC::SDL_KEYDOWN] = sub {
2572 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2648 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2573 # alt-enter 2649 # alt-enter
2574 video_shutdown; 2650 video_shutdown;
2575 $FULLSCREEN_ENABLE->toggle; 2651 $FULLSCREEN_ENABLE->toggle;
2576 video_init; 2652 video_init;
2577 } else { 2653 } else {
2578 &DC::UI::feed_sdl_key_down_event; 2654 &DC::UI::feed_sdl_key_down_event;
2579 } 2655 }
2580 update_modbox; 2656 update_modbox;
2581 }, 2657};
2582 DC::SDL_KEYUP => sub { 2658$SDL_CB[DC::SDL_KEYUP] = sub {
2583 &DC::UI::feed_sdl_key_up_event; 2659 &DC::UI::feed_sdl_key_up_event;
2584 update_modbox; 2660 update_modbox;
2585 }, 2661};
2586 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2662$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2587 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2663$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2588 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2664$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2589 DC::SDL_USEREVENT => sub { 2665$SDL_CB[DC::SDL_USEREVENT] = sub {
2590 if ($_[0]{code} == 1) { 2666 if ($_[0]{code} == 1) {
2591 audio_channel_finished $_[0]{data1}; 2667 audio_channel_finished $_[0]{data1};
2592 } elsif ($_[0]{code} == 0) { 2668 } elsif ($_[0]{code} == 0) {
2593 audio_music_finished; 2669 audio_music_finished;
2594 }
2595 }, 2670 }
2596); 2671};
2597 2672
2598############################################################################# 2673#############################################################################
2599 2674
2600$SIG{INT} = $SIG{TERM} = sub { 2675$SIG{INT} = $SIG{TERM} = sub {
2601 EV::unloop; 2676 EV::unloop;
2602 #d# TODO calling exit here hangs the process in some futex 2677 #d# TODO calling exit here hangs the process in some futex
2603}; 2678};
2604
2605# initialise the resolver now, as vista forces us back to the desktop
2606# when doing this.
2607AnyEvent::DNS::resolver;
2608 2679
2609# due to mac os x + sdl combined braindamage, we need this contortion 2680# due to mac os x + sdl combined braindamage, we need this contortion
2610sub main { 2681sub main {
2611 { 2682 {
2612 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2683 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
… …
2631 DC::DB::open_db; 2702 DC::DB::open_db;
2632 2703
2633 DC::UI::set_layout ($::CFG->{layout}); 2704 DC::UI::set_layout ($::CFG->{layout});
2634 2705
2635 my %DEF_CFG = ( 2706 my %DEF_CFG = (
2707 config_autosave => 1,
2636 sdl_mode => undef, 2708 sdl_mode => undef,
2637 fullscreen => 1, 2709 fullscreen => 1,
2638 fast => 0, 2710 fast => 0,
2639 force_opengl11 => undef, 2711 force_opengl11 => undef,
2640 disable_alpha => 0, 2712 disable_alpha => 0,
… …
2658 effects_enable => 1, 2730 effects_enable => 1,
2659 effects_volume => 1, 2731 effects_volume => 1,
2660 bgm_enable => 1, 2732 bgm_enable => 1,
2661 bgm_volume => 0.5, 2733 bgm_volume => 0.5,
2662 output_rate => "", 2734 output_rate => "",
2663 pickup => 0, 2735 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2664 inv_sort => "mtime", 2736 inv_sort => "mtime",
2665 default => "profile", # default profile 2737 default => "profile", # default profile
2666 show_tips => 1, 2738 show_tips => 1,
2667 logview_max_par => 1000, 2739 logview_max_par => 1000,
2668 shift_fire_stop => 0, 2740 shift_fire_stop => 0,
2669 uitheme => "wood", 2741 uitheme => "wood",
2742 map_shift_x => -24, # arbitrary
2743 map_shift_y => +24, # arbitrary
2670 ); 2744 );
2671 2745
2672 while (my ($k, $v) = each %DEF_CFG) { 2746 while (my ($k, $v) = each %DEF_CFG) {
2673 $CFG->{$k} = $v unless exists $CFG->{$k}; 2747 $CFG->{$k} = $v unless exists $CFG->{$k};
2674 } 2748 }
… …
2688 } 2762 }
2689 } 2763 }
2690 2764
2691 sdl_init; 2765 sdl_init;
2692 2766
2767 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2768 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2769
2693 { 2770 {
2694 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2771 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2695 DejaVuSans.ttf 2772 DejaVuSans.ttf
2696 DejaVuSansMono.ttf 2773 DejaVuSansMono.ttf
2697 DejaVuSans-Bold.ttf 2774 DejaVuSans-Bold.ttf
2698 DejaVuSansMono-Bold.ttf 2775 DejaVuSansMono-Bold.ttf
2699 DejaVuSans-Oblique.ttf 2776 DejaVuSans-Oblique.ttf
2700 DejaVuSansMono-Oblique.ttf 2777 DejaVuSansMono-Oblique.ttf
2701 DejaVuSans-BoldOblique.ttf 2778 DejaVuSans-BoldOblique.ttf
2702 DejaVuSansMono-BoldOblique.ttf 2779 DejaVuSansMono-BoldOblique.ttf
2780 mona.ttf
2703 ); 2781 );
2704 2782
2705 DC::add_font $_ for @fonts; 2783 DC::add_font $_ for @fonts;
2706 2784
2707 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2785 $FONT_PROP = new_from_file DC::Font $fonts[0];
… …
2737 }; 2815 };
2738 2816
2739 delete $SIG{__DIE__}; 2817 delete $SIG{__DIE__};
2740 EV::loop; 2818 EV::loop;
2741 2819
2820 DC::write_cfg if $CFG->{config_autosave};
2821
2742#video_shutdown; 2822 #video_shutdown;
2743#audio_shutdown; 2823 #audio_shutdown;
2824
2744 DC::OpenGL::quit; 2825 DC::OpenGL::quit;
2745 DC::SDL_Quit; 2826 DC::SDL_Quit;
2746 DC::DB::Server::stop; 2827 DC::DB::Server::stop;
2747} 2828}
2748 2829

Diff Legend

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