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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5package App::Deliantra; # try to reserve namespace
6}
2 7
3if ($ENV{DELIANTRA_CORO_DEBUG}) { 8if ($ENV{DELIANTRA_CORO_DEBUG}) {
4 eval ' 9 eval '
5 use Coro; 10 use Coro;
6 use Coro::EV; 11 use Coro::EV;
… …
97use List::Util qw(max min); 102use List::Util qw(max min);
98 103
99use Deliantra; 104use Deliantra;
100use Deliantra::Protocol::Constants; 105use Deliantra::Protocol::Constants;
101 106
107use AnyEvent::DNS;
108
102use Compress::LZF; 109use Compress::LZF;
103 110
104use DC; 111use DC;
112BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 113use DC::OpenGL ();
106use DC::Protocol; 114use DC::Protocol;
107use DC::DB; 115use DC::DB;
108use DC::UI; 116use DC::UI;
109use DC::UI::Canvas; 117use DC::UI::Canvas;
… …
232 240
233 $markup .= $mod & DC::KMOD_NUM 241 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]" 242 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]"; 243 : "[<span foreground='#888'>num</span>]";
236 244
245 # <tt> around next statement works around some bug that keeps the
246 # "font =>" from being used on windows
237 $MODBOX->set_markup ($markup); 247 $MODBOX->set_markup ("<tt>$markup</tt>");
238} 248}
239 249
240############################################################################# 250#############################################################################
241#TODO: maybe move into own audio module... 251#TODO: maybe move into own audio module...
242 252
… …
662 # right: accept 672 # right: accept
663 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
664 text => "Accept", 674 text => "Accept",
665 on_activate => sub { 675 on_activate => sub {
666 $conn->send ("reply n"); 676 $conn->send ("reply n");
667 $STATS_PAGE->hide;
668 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
669 0 678 0
670 }, 679 },
671 ); 680 );
672 681
… …
724 733
725 $vbox->add (@dialog); 734 $vbox->add (@dialog);
726 $dialog->show; 735 $dialog->show;
727} 736}
728 737
729sub start_game { 738sub dc_connect {
730 status "logging in..."; 739 my ($host, $port) = @_;
731
732 $LOGIN_BUTTON->set_text ("Logout");
733 $SETUP_DIALOG->hide;
734 740
735 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
736 742
737 my ($host, $port) = split /:/, $PROFILE->{host};
738
739 $MAP = new DC::Map;
740
741 $CONN = eval { 743 $CONN =
742 new DC::Protocol 744 new DC::Protocol
743 host => $host, 745 host => $host,
744 port => $port || 13327, 746 port => $port || 13327,
745 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
746 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
… …
756 query => \&server_query, 758 query => \&server_query,
757 759
758 setup_req => { 760 setup_req => {
759 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
760 }, 762 },
761 };
762 763
763 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
764 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
765 767
766 status "login successful"; 768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
775 ;
776}
777
778sub start_game {
779 status "logging in...";
780
781 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = split /:/, $PROFILE->{host};
785
786 $MAP = new DC::Map;
787
788 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl
793 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95";
795 }
796
797 dc_connect $host, $port;
798 };
767 } else { 799 } else {
768 status "unable to connect"; 800 dc_connect $host, $port;
769 stop_game();
770 } 801 }
771} 802}
772 803
773sub stop_game { 804sub stop_game {
774 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
1618 $CFG->{show_tips} = $value; 1649 $CFG->{show_tips} = $value;
1619 0 1650 0
1620 } 1651 }
1621 ); 1652 );
1622 1653
1623 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1654 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1655 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1625 text => $CFG->{logview_max_par}, 1656 text => $CFG->{logview_max_par},
1626 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1657 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627 . "sends more messages than this number, older messages get removed to save memory and " 1658 . "sends more messages than this number, older messages get removed to save memory and "
1628 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1659 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629 on_changed => sub { 1660 on_changed => sub {
1630 my ($self, $value) = @_; 1661 my ($self, $value) = @_;
1631 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1662 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1740 1771
1741 $r 1772 $r
1742} 1773}
1743 1774
1744my %SORT_ORDER = ( 1775my %SORT_ORDER = (
1745 type => undef, 1776 type => sub {
1777 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1778 },
1746 mtime => sub { 1779 mtime => sub {
1747 my $NOW = time; 1780 my $NOW = time;
1748 sort { 1781 sort {
1749 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1782 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1783 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1972 my @path = DC::Pod::full_path_of $node; 2005 my @path = DC::Pod::full_path_of $node;
1973 pop @path; # drop current node 2006 pop @path; # drop current node
1974 2007
1975 for my $node (@path) { 2008 for my $node (@path) {
1976 $buttons->add (new DC::UI::Button 2009 $buttons->add (new DC::UI::Button
1977 text => $node->{kw}[0], 2010 text => $node->[DC::Pod::N_KW][0],
1978 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2011 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979 on_activate => sub { 2012 on_activate => sub {
1980 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2013 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981 $load_node->($node); 2014 $load_node->($node);
1982 }, 2015 },
1983 ); 2016 );
1984 $buttons->add (new DC::UI::Label text => "/"); 2017 $buttons->add (new DC::UI::Label text => "/");
1985 } 2018 }
1986 2019
1987 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2020 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988 2021
1989 $curnode = $node; 2022 $curnode = $node;
1990 2023
1991 $viewer->clear; 2024 $viewer->clear;
1992 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2025 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2178 can_events => 1, 2211 can_events => 1,
2179 can_hover => 1, 2212 can_hover => 1,
2180 markup => "", 2213 markup => "",
2181 align => 0, 2214 align => 0,
2182 font => $FONT_FIXED, 2215 font => $FONT_FIXED,
2183 tooltip => "#modifier_box"; 2216 tooltip => "#modifier_box",
2217 tooltip_width => 0.67,
2218 ;
2184 2219
2185 update_modbox; 2220 update_modbox;
2186 2221
2187 (new DC::UI::Frame 2222 (new DC::UI::Frame
2188 bg => [0, 0, 0, 0.4], 2223 bg => [0, 0, 0, 0.4],
… …
2237 force_h => $::HEIGHT * 0.6, 2272 force_h => $::HEIGHT * 0.6,
2238 has_close_button => 1, 2273 has_close_button => 1,
2239 ; 2274 ;
2240 2275
2241 $METASERVER = metaserver_dialog; 2276 $METASERVER = metaserver_dialog;
2242 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2277 # the name is changed to not conflict with the older name as users could have hidden it
2278 $MESSAGE_WINDOW = new DC::UI::Dockbar
2279 name => "message_window2",
2280 title => 'Messages',
2281 force_w => $::WIDTH * 0.6,
2282 force_h => $::HEIGHT * 0.25,
2283 ;
2284
2243 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2285 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244 2286
2245 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2287 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2288 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247 2289
2248 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2290 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249 "Configure the server to play on, your username and password."); 2291 "Configure the server to play on, your username and password.");
2250 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2292 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2268 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2310 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2269 2311
2270 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2312 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2313 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272 2314
2273 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2315# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2316# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275 2317
2276 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 2318 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
2277 2319
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2320 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2321 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2281 $BUTTONBAR->add (new DC::UI::Button 2323 $BUTTONBAR->add (new DC::UI::Button
2282 text => "Save Config", 2324 text => "Save Config",
2283 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2325 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284 on_activate => sub { 2326 on_activate => sub {
2285 $::CFG->{layout} = DC::UI::get_layout; 2327 $::CFG->{layout} = DC::UI::get_layout;
2286 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2328 DC::write_cfg;
2287 status "Configuration Saved"; 2329 status "Configuration Saved";
2288 0 2330 0
2289 }, 2331 },
2290 ); 2332 );
2291 2333
2292 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2334 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293 tooltip => "View Documentation"); 2335 tooltip => "View Documentation");
2294
2295 2336
2296 $BUTTONBAR->add (new DC::UI::Button 2337 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Quit", 2338 text => "Quit",
2298 tooltip => "Terminates the program", 2339 tooltip => "Terminates the program",
2299 on_activate => sub { 2340 on_activate => sub {
… …
2416 EV::unloop; 2457 EV::unloop;
2417 #d# TODO calling exit here hangs the process in some futex 2458 #d# TODO calling exit here hangs the process in some futex
2418}; 2459};
2419 2460
2420{ 2461{
2462 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2463
2421 if (-e "$Deliantra::VARDIR/client.cf") { 2464 if (-e "$Deliantra::VARDIR/client.cf") {
2422 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2465 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423 } else { 2466 } else {
2424 #TODO: compatibility cruft 2467 #TODO: compatibility cruft
2425 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2468 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426 print STDERR "INFO: used old configuration file\n"; 2469 print STDERR "INFO: used old configuration file\n";
2427 } 2470 }
2428 2471
2429 DC::DB::Server::run; 2472 DC::DB::Server::run;
2473
2474 if ($CFG->{db_schema} < 1) {
2475 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2476 DC::DB::nuke_db;
2477 $CFG->{db_schema} = 1;
2478 DC::write_cfg;
2479 }
2480
2481 DC::DB::open_db;
2430 2482
2431 DC::UI::set_layout ($::CFG->{layout}); 2483 DC::UI::set_layout ($::CFG->{layout});
2432 2484
2433 my %DEF_CFG = ( 2485 my %DEF_CFG = (
2434 sdl_mode => 0, 2486 sdl_mode => 0,
… …
2459 pickup => 0, 2511 pickup => 0,
2460 inv_sort => "mtime", 2512 inv_sort => "mtime",
2461 default => "profile", # default profile 2513 default => "profile", # default profile
2462 show_tips => 1, 2514 show_tips => 1,
2463 logview_max_par => 1000, 2515 logview_max_par => 1000,
2516 shift_fire_stop => 0,
2464 ); 2517 );
2465 2518
2466 while (my ($k, $v) = each %DEF_CFG) { 2519 while (my ($k, $v) = each %DEF_CFG) {
2467 $CFG->{$k} = $v unless exists $CFG->{$k}; 2520 $CFG->{$k} = $v unless exists $CFG->{$k};
2468 } 2521 }
… …
2504 DejaVuSansMono-BoldOblique.ttf 2557 DejaVuSansMono-BoldOblique.ttf
2505 ); 2558 );
2506 2559
2507 DC::add_font $_ for @fonts; 2560 DC::add_font $_ for @fonts;
2508 2561
2509 DC::pango_init;
2510
2511 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2562 $FONT_PROP = new_from_file DC::Font $fonts[0];
2512 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2563 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2513 2564
2514 $FONT_PROP->make_default; 2565 $FONT_PROP->make_default;
2566
2567 DC::pango_init;
2515 } 2568 }
2516 2569
2517# compare mono (ft) vs. rgba (cairo) 2570# compare mono (ft) vs. rgba (cairo)
2518# ft - 1.8s, cairo 3s, even in alpha-only mode 2571# ft - 1.8s, cairo 3s, even in alpha-only mode
2519# for my $rgba (0..1) { 2572# for my $rgba (0..1) {
… …
2536our $STARTUP_CANCEL = EV::idle sub { 2589our $STARTUP_CANCEL = EV::idle sub {
2537 undef $::STARTUP_CANCEL; 2590 undef $::STARTUP_CANCEL;
2538 $startup_done->(); 2591 $startup_done->();
2539}; 2592};
2540 2593
2594delete $SIG{__DIE__};
2541EV::loop; 2595EV::loop;
2542 2596
2543#video_shutdown; 2597#video_shutdown;
2544#audio_shutdown; 2598#audio_shutdown;
2545DC::OpenGL::quit; 2599DC::OpenGL::quit;

Diff Legend

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