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.23 by elmex, Sun Jan 6 16:28:50 2008 UTC vs.
Revision 1.38 by root, Mon May 5 16:26:11 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
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
… …
720 user => $PROFILE->{user}, 746 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 747 pass => $PROFILE->{password},
722 mapw => $mapsize, 748 mapw => $mapsize,
723 maph => $mapsize, 749 maph => $mapsize,
724 750
725 client => "cfplus $DC::VERSION $] $^O", 751 client => "$DC::VERSION $] $^O",
726 752
727 map_widget => $MAPWIDGET, 753 map_widget => $MAPWIDGET,
728 statusbox => $STATUSBOX, 754 statusbox => $STATUSBOX,
729 map => $MAP, 755 map => $MAP,
730 mapmap => $MAPMAP, 756 mapmap => $MAPMAP,
… …
738 if ($CONN) { 764 if ($CONN) {
739 DC::lowdelay fileno $CONN->{fh}; 765 DC::lowdelay fileno $CONN->{fh};
740 766
741 status "login successful"; 767 status "login successful";
742 } else { 768 } else {
769 warn $@;
743 status "unable to connect"; 770 status "unable to connect";
744 stop_game(); 771 stop_game();
745 } 772 }
746} 773}
747 774
… …
1528 1555
1529 $vbox->add ( 1556 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1557 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1558 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1559 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1560 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1561 on_changed => sub {
1535 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1563 $CFG->{profile}{default}{host} = $value;
1537 1 1564 1
1538 } 1565 }
… …
1541 if (0) { #d# disabled 1568 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1569 $vbox->add (new DC::UI::Button
1543 expand => 1, 1570 expand => 1,
1544 text => "Server List", 1571 text => "Server List",
1545 other => $METASERVER, 1572 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1573 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1574 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1575 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1576 );
1550 }#d# 1577 }#d#
1551 } 1578 }
… …
1593 $CFG->{show_tips} = $value; 1620 $CFG->{show_tips} = $value;
1594 0 1621 0
1595 } 1622 }
1596 ); 1623 );
1597 1624
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1625 $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 1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1627 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1628 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 " 1629 . "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.", 1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1631 on_changed => sub {
1605 my ($self, $value) = @_; 1632 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1634 0
1608 }, 1635 },
1609 ); 1636 );
1610 1637
1611 $table 1638 $table
… …
1947 my @path = DC::Pod::full_path_of $node; 1974 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 1975 pop @path; # drop current node
1949 1976
1950 for my $node (@path) { 1977 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 1978 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 1979 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1980 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 1981 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1982 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 1983 $load_node->($node);
1957 }, 1984 },
1958 ); 1985 );
1959 $buttons->add (new DC::UI::Label text => "/"); 1986 $buttons->add (new DC::UI::Label text => "/");
1960 } 1987 }
1961 1988
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1989 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 1990
1964 $curnode = $node; 1991 $curnode = $node;
1965 1992
1966 $viewer->clear; 1993 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1994 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2146 force_x => "max", 2173 force_x => "max",
2147 force_y => 0; 2174 force_y => 0;
2148 $DEBUG_STATUS->show; 2175 $DEBUG_STATUS->show;
2149 2176
2150 $STATUSBOX = new DC::UI::Statusbox; 2177 $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]); 2178
2179 $MODBOX = new DC::UI::Label
2180 can_events => 1,
2181 can_hover => 1,
2182 markup => "",
2183 align => 0,
2184 font => $FONT_FIXED,
2185 tooltip => "#modifier_box",
2186 tooltip_width => 0.67,
2187 ;
2188
2189 update_modbox;
2152 2190
2153 (new DC::UI::Frame 2191 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2192 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2193 force_x => 0,
2156 force_y => "max", 2194 force_y => "max",
2157 child => $STATUSBOX, 2195 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2196 )->show;
2197
2198 $LR->add ($STATUSBOX);
2199 $LR->add ($MODBOX);
2200 $LR->add (new DC::UI::Label
2201 align => 0,
2202 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2203 fontsize => 0.5,
2204 fg => [1, 1, 0, 0.7],
2205 );
2159 2206
2160 DC::UI::Toplevel->new ( 2207 DC::UI::Toplevel->new (
2161 title => "Minimap", 2208 title => "Minimap",
2162 name => "mapmap", 2209 name => "mapmap",
2163 x => 0, 2210 x => 0,
… …
2194 force_h => $::HEIGHT * 0.6, 2241 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2242 has_close_button => 1,
2196 ; 2243 ;
2197 2244
2198 $METASERVER = metaserver_dialog; 2245 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar; 2246 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages');
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2247 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2248
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2249 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2250 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2251
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2252 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2253 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2254 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2272 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2273
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2274 $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."); 2275 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2276
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2277# $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."); 2278# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2279
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 2280 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 2281
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2282 $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."); 2283 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2285 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2286 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.", 2287 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 { 2288 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2289 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2290 DC::write_cfg;
2244 status "Configuration Saved"; 2291 status "Configuration Saved";
2245 0 2292 0
2246 }, 2293 },
2247 ); 2294 );
2248 2295
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2296 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2297 tooltip => "View Documentation");
2251
2252 2298
2253 $BUTTONBAR->add (new DC::UI::Button 2299 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2300 text => "Quit",
2255 tooltip => "Terminates the program", 2301 tooltip => "Terminates the program",
2256 on_activate => sub { 2302 on_activate => sub {
… …
2345 # alt-enter 2391 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2392 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2393 video_shutdown;
2348 video_init; 2394 video_init;
2349 } else { 2395 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2396 &DC::UI::feed_sdl_key_down_event;
2351 } 2397 }
2398 update_modbox;
2352 }, 2399 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2400 DC::SDL_KEYUP => sub {
2401 &DC::UI::feed_sdl_key_up_event;
2402 update_modbox;
2403 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2404 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2405 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2406 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2407 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2408 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2419 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2420 #d# TODO calling exit here hangs the process in some futex
2371}; 2421};
2372 2422
2373{ 2423{
2424 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2425
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2426 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2427 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2428 } else {
2377 #TODO: compatibility cruft 2429 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2431 print STDERR "INFO: used old configuration file\n";
2380 } 2432 }
2381 2433
2382 DC::DB::Server::run; 2434 DC::DB::Server::run;
2435
2436 if ($CFG->{db_schema} < 1) {
2437 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2438 DC::DB::nuke_db;
2439 $CFG->{db_schema} = 1;
2440 DC::write_cfg;
2441 }
2442
2443 DC::DB::open_db;
2383 2444
2384 DC::UI::set_layout ($::CFG->{layout}); 2445 DC::UI::set_layout ($::CFG->{layout});
2385 2446
2386 my %DEF_CFG = ( 2447 my %DEF_CFG = (
2387 sdl_mode => 0, 2448 sdl_mode => 0,
… …
2457 DejaVuSansMono-BoldOblique.ttf 2518 DejaVuSansMono-BoldOblique.ttf
2458 ); 2519 );
2459 2520
2460 DC::add_font $_ for @fonts; 2521 DC::add_font $_ for @fonts;
2461 2522
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2523 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2524 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2525
2467 $FONT_PROP->make_default; 2526 $FONT_PROP->make_default;
2527
2528 DC::pango_init;
2468 } 2529 }
2469 2530
2470# compare mono (ft) vs. rgba (cairo) 2531# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2532# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2533# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2550our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2551 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2552 $startup_done->();
2492}; 2553};
2493 2554
2555delete $SIG{__DIE__};
2494EV::loop; 2556EV::loop;
2495 2557
2496#video_shutdown; 2558#video_shutdown;
2497#audio_shutdown; 2559#audio_shutdown;
2498DC::OpenGL::quit; 2560DC::OpenGL::quit;

Diff Legend

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