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.27 by root, Fri Jan 25 14:30:09 2008 UTC vs.
Revision 1.43 by root, Wed May 21 23:35:55 2008 UTC

… …
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use Compress::LZF; 102use Compress::LZF;
103 103
104use DC; 104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 105use DC::OpenGL ();
106use DC::Protocol; 106use DC::Protocol;
107use DC::DB; 107use DC::DB;
108use DC::UI; 108use DC::UI;
109use DC::UI::Canvas; 109use DC::UI::Canvas;
… …
190our $SDL_ACTIVE; 190our $SDL_ACTIVE;
191our %SDL_CB; 191our %SDL_CB;
192 192
193our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
195our $DEBUG_STATUS; 196our $DEBUG_STATUS;
196 197
197our $INV; 198our $INV;
198our $INVR; 199our $INVR;
199our $INVR_HB; 200our $INVR_HB;
… …
208 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
209} 210}
210 211
211sub message { 212sub message {
212 $MESSAGE_DIST->message (@_); 213 $MESSAGE_DIST->message (@_);
214}
215
216sub update_modbox {
217 my $mod = DC::SDL_GetModState;
218
219 my $markup;
220
221 $markup .= $mod & DC::KMOD_CTRL
222 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
223 : "[<span foreground='#888'> once </span>]";
224
225 $markup .= $mod & DC::KMOD_SHIFT
226 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
227 : "[<span foreground='#888'>move</span>]";
228
229 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
230 ? "[ALT]"
231 : "[<span foreground='#888'>alt</span>]";
232
233 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]";
236
237 # <tt> around next statement works around some bug that keeps the
238 # "font =>" from being used on windows
239 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 240}
214 241
215############################################################################# 242#############################################################################
216#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
217 244
… …
637 # right: accept 664 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 665 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 666 text => "Accept",
640 on_activate => sub { 667 on_activate => sub {
641 $conn->send ("reply n"); 668 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 669 destroy_query_dialog $conn;
644 0 670 0
645 }, 671 },
646 ); 672 );
647 673
… …
712 my ($host, $port) = split /:/, $PROFILE->{host}; 738 my ($host, $port) = split /:/, $PROFILE->{host};
713 739
714 $MAP = new DC::Map; 740 $MAP = new DC::Map;
715 741
716 $CONN = eval { 742 $CONN = eval {
743 local $SIG{__DIE__};
744
717 new DC::Protocol 745 new DC::Protocol
718 host => $host, 746 host => $host,
719 port => $port || 13327, 747 port => $port || 13327,
720 user => $PROFILE->{user}, 748 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 749 pass => $PROFILE->{password},
… …
738 if ($CONN) { 766 if ($CONN) {
739 DC::lowdelay fileno $CONN->{fh}; 767 DC::lowdelay fileno $CONN->{fh};
740 768
741 status "login successful"; 769 status "login successful";
742 } else { 770 } else {
771 warn $@;
743 status "unable to connect"; 772 status "unable to connect";
744 stop_game(); 773 stop_game();
745 } 774 }
746} 775}
747 776
… …
1528 1557
1529 $vbox->add ( 1558 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1559 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1560 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1561 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1562 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1563 on_changed => sub {
1535 my ($self, $value) = @_; 1564 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1565 $CFG->{profile}{default}{host} = $value;
1537 1 1566 1
1538 } 1567 }
… …
1541 if (0) { #d# disabled 1570 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1571 $vbox->add (new DC::UI::Button
1543 expand => 1, 1572 expand => 1,
1544 text => "Server List", 1573 text => "Server List",
1545 other => $METASERVER, 1574 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1575 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1576 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1577 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1578 );
1550 }#d# 1579 }#d#
1551 } 1580 }
… …
1593 $CFG->{show_tips} = $value; 1622 $CFG->{show_tips} = $value;
1594 0 1623 0
1595 } 1624 }
1596 ); 1625 );
1597 1626
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1627 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1628 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1629 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1630 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1631 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1632 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1633 on_changed => sub {
1605 my ($self, $value) = @_; 1634 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1635 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1636 0
1608 }, 1637 },
1609 ); 1638 );
1610 1639
1611 $table 1640 $table
… …
1715 1744
1716 $r 1745 $r
1717} 1746}
1718 1747
1719my %SORT_ORDER = ( 1748my %SORT_ORDER = (
1720 type => undef, 1749 type => sub {
1750 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1751 },
1721 mtime => sub { 1752 mtime => sub {
1722 my $NOW = time; 1753 my $NOW = time;
1723 sort { 1754 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1755 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1756 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1947 my @path = DC::Pod::full_path_of $node; 1978 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 1979 pop @path; # drop current node
1949 1980
1950 for my $node (@path) { 1981 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 1982 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 1983 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1984 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 1985 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1986 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 1987 $load_node->($node);
1957 }, 1988 },
1958 ); 1989 );
1959 $buttons->add (new DC::UI::Label text => "/"); 1990 $buttons->add (new DC::UI::Label text => "/");
1960 } 1991 }
1961 1992
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1993 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 1994
1964 $curnode = $node; 1995 $curnode = $node;
1965 1996
1966 $viewer->clear; 1997 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1998 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2146 force_x => "max", 2177 force_x => "max",
2147 force_y => 0; 2178 force_y => 0;
2148 $DEBUG_STATUS->show; 2179 $DEBUG_STATUS->show;
2149 2180
2150 $STATUSBOX = new DC::UI::Statusbox; 2181 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2182
2183 $MODBOX = new DC::UI::Label
2184 can_events => 1,
2185 can_hover => 1,
2186 markup => "",
2187 align => 0,
2188 font => $FONT_FIXED,
2189 tooltip => "#modifier_box",
2190 tooltip_width => 0.67,
2191 ;
2192
2193 update_modbox;
2152 2194
2153 (new DC::UI::Frame 2195 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2196 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2197 force_x => 0,
2156 force_y => "max", 2198 force_y => "max",
2157 child => $STATUSBOX, 2199 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2200 )->show;
2201
2202 $LR->add ($STATUSBOX);
2203 $LR->add ($MODBOX);
2204 $LR->add (new DC::UI::Label
2205 align => 0,
2206 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2207 fontsize => 0.5,
2208 fg => [1, 1, 0, 0.7],
2209 );
2159 2210
2160 DC::UI::Toplevel->new ( 2211 DC::UI::Toplevel->new (
2161 title => "Minimap", 2212 title => "Minimap",
2162 name => "mapmap", 2213 name => "mapmap",
2163 x => 0, 2214 x => 0,
… …
2194 force_h => $::HEIGHT * 0.6, 2245 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2246 has_close_button => 1,
2196 ; 2247 ;
2197 2248
2198 $METASERVER = metaserver_dialog; 2249 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2250 # the name is changed to not conflict with the older name as users could have hidden it
2251 $MESSAGE_WINDOW = new DC::UI::Dockbar
2252 name => "message_window2",
2253 title => 'Messages',
2254 force_w => $::WIDTH * 0.6,
2255 force_h => $::HEIGHT * 0.25,
2256 ;
2257
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2258 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2259
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2260 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2261 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2262
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2263 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2264 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2265 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2283 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2284
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2285 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2286 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2287
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2288# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2289# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2290
2233 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 2291 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
2234 2292
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2293 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2294 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2296 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2297 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2298 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2299 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2300 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2301 DC::write_cfg;
2244 status "Configuration Saved"; 2302 status "Configuration Saved";
2245 0 2303 0
2246 }, 2304 },
2247 ); 2305 );
2248 2306
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2307 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2308 tooltip => "View Documentation");
2251
2252 2309
2253 $BUTTONBAR->add (new DC::UI::Button 2310 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2311 text => "Quit",
2255 tooltip => "Terminates the program", 2312 tooltip => "Terminates the program",
2256 on_activate => sub { 2313 on_activate => sub {
… …
2345 # alt-enter 2402 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2403 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2404 video_shutdown;
2348 video_init; 2405 video_init;
2349 } else { 2406 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2407 &DC::UI::feed_sdl_key_down_event;
2351 } 2408 }
2409 update_modbox;
2352 }, 2410 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2411 DC::SDL_KEYUP => sub {
2412 &DC::UI::feed_sdl_key_up_event;
2413 update_modbox;
2414 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2415 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2416 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2417 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2418 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2419 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2430 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2431 #d# TODO calling exit here hangs the process in some futex
2371}; 2432};
2372 2433
2373{ 2434{
2435 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2436
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2437 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2438 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2439 } else {
2377 #TODO: compatibility cruft 2440 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2441 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuration file\n"; 2442 print STDERR "INFO: used old configuration file\n";
2380 } 2443 }
2381 2444
2382 DC::DB::Server::run; 2445 DC::DB::Server::run;
2446
2447 if ($CFG->{db_schema} < 1) {
2448 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2449 DC::DB::nuke_db;
2450 $CFG->{db_schema} = 1;
2451 DC::write_cfg;
2452 }
2453
2454 DC::DB::open_db;
2383 2455
2384 DC::UI::set_layout ($::CFG->{layout}); 2456 DC::UI::set_layout ($::CFG->{layout});
2385 2457
2386 my %DEF_CFG = ( 2458 my %DEF_CFG = (
2387 sdl_mode => 0, 2459 sdl_mode => 0,
… …
2412 pickup => 0, 2484 pickup => 0,
2413 inv_sort => "mtime", 2485 inv_sort => "mtime",
2414 default => "profile", # default profile 2486 default => "profile", # default profile
2415 show_tips => 1, 2487 show_tips => 1,
2416 logview_max_par => 1000, 2488 logview_max_par => 1000,
2489 shift_fire_stop => 0,
2417 ); 2490 );
2418 2491
2419 while (my ($k, $v) = each %DEF_CFG) { 2492 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2493 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2494 }
… …
2457 DejaVuSansMono-BoldOblique.ttf 2530 DejaVuSansMono-BoldOblique.ttf
2458 ); 2531 );
2459 2532
2460 DC::add_font $_ for @fonts; 2533 DC::add_font $_ for @fonts;
2461 2534
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2535 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2536 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2537
2467 $FONT_PROP->make_default; 2538 $FONT_PROP->make_default;
2539
2540 DC::pango_init;
2468 } 2541 }
2469 2542
2470# compare mono (ft) vs. rgba (cairo) 2543# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2544# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2545# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2562our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2563 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2564 $startup_done->();
2492}; 2565};
2493 2566
2567delete $SIG{__DIE__};
2494EV::loop; 2568EV::loop;
2495 2569
2496#video_shutdown; 2570#video_shutdown;
2497#audio_shutdown; 2571#audio_shutdown;
2498DC::OpenGL::quit; 2572DC::OpenGL::quit;

Diff Legend

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