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.44 by root, Mon May 26 03:34:02 2008 UTC

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

Diff Legend

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