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.22 by root, Sat Dec 29 13:44:31 2007 UTC vs.
Revision 1.41 by elmex, Mon May 5 20:51:36 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;
110use DC::UI::Inventory; 110use DC::UI::Inventory;
111use DC::UI::SpellList; 111use DC::UI::SpellList;
112use DC::UI::Dockable; 112use DC::UI::Dockable;
113use DC::UI::Dockbar;
113use DC::UI::MessageWindow; 114use DC::UI::MessageWindow;
114use DC::UI::ChatView; 115use DC::UI::ChatView;
116use DC::MessageDistributor;
115use DC::Pod; 117use DC::Pod;
116use DC::MapWidget; 118use DC::MapWidget;
117use DC::Macro; 119use DC::Macro;
118 120
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 121$SIG{QUIT} = sub { Carp::cluck "QUIT" };
178our $SPELL_PAGE; 180our $SPELL_PAGE;
179our $SPELL_LIST; 181our $SPELL_LIST;
180 182
181our $HELP_WINDOW; 183our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 184our $MESSAGE_WINDOW;
185our $MESSAGE_DIST;
183our $FLOORBOX; 186our $FLOORBOX;
184our $GAUGES; 187our $GAUGES;
185our $STATWIDS; 188our $STATWIDS;
186 189
187our $SDL_ACTIVE; 190our $SDL_ACTIVE;
188our %SDL_CB; 191our %SDL_CB;
189 192
190our $ALT_ENTER_MESSAGE; 193our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 194our $STATUSBOX;
195our $MODBOX;
192our $DEBUG_STATUS; 196our $DEBUG_STATUS;
193 197
194our $INV; 198our $INV;
195our $INVR; 199our $INVR;
196our $INVR_HB; 200our $INVR_HB;
204sub debug { 208sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 209 $DEBUG_STATUS->set_text ($_[0]);
206} 210}
207 211
208sub message { 212sub message {
209 $MESSAGE_WINDOW->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>");
210} 240}
211 241
212############################################################################# 242#############################################################################
213#TODO: maybe move into own audio module... 243#TODO: maybe move into own audio module...
214 244
634 # right: accept 664 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 665 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 666 text => "Accept",
637 on_activate => sub { 667 on_activate => sub {
638 $conn->send ("reply n"); 668 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 669 destroy_query_dialog $conn;
641 0 670 0
642 }, 671 },
643 ); 672 );
644 673
717 user => $PROFILE->{user}, 746 user => $PROFILE->{user},
718 pass => $PROFILE->{password}, 747 pass => $PROFILE->{password},
719 mapw => $mapsize, 748 mapw => $mapsize,
720 maph => $mapsize, 749 maph => $mapsize,
721 750
722 client => "cfplus $DC::VERSION $] $^O", 751 client => "$DC::VERSION $] $^O",
723 752
724 map_widget => $MAPWIDGET, 753 map_widget => $MAPWIDGET,
725 statusbox => $STATUSBOX, 754 statusbox => $STATUSBOX,
726 map => $MAP, 755 map => $MAP,
727 mapmap => $MAPMAP, 756 mapmap => $MAPMAP,
735 if ($CONN) { 764 if ($CONN) {
736 DC::lowdelay fileno $CONN->{fh}; 765 DC::lowdelay fileno $CONN->{fh};
737 766
738 status "login successful"; 767 status "login successful";
739 } else { 768 } else {
769 warn $@;
740 status "unable to connect"; 770 status "unable to connect";
741 stop_game(); 771 stop_game();
742 } 772 }
743} 773}
744 774
805 ); 835 );
806 836
807 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
808 $table->add_at (1, $row++, new DC::UI::CheckBox 838 $table->add_at (1, $row++, new DC::UI::CheckBox
809 state => $CFG->{force_opengl11}, 839 state => $CFG->{force_opengl11},
810 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
811 . "higher memory usage and slower performance. It will, however, help tremendously on " 841 . "higher memory usage and slower performance. It will, however, help tremendously on "
812 . "cards that claim to support a feature but fall back to software rendering. " 842 . "cards that claim to support a feature but fall back to software rendering. "
813 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
814 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
815 . "experience extremely low framerates and your card should do better, try this option.</b>", 845 . "experience extremely low framerates and your card should do better, try this option.</b>",
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
884 $table->add_at (1, $row++, new DC::UI::Slider 914 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
886 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
887 . "but you still need to press apply to correctly re-layout the widget.", 917 . "but you still need to press apply to correctly re-layout the widget.",
888 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
889 ); 919 );
890 920
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
892 $table->add_at (1, $row++, new DC::UI::Slider 922 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1525 1555
1526 $vbox->add ( 1556 $vbox->add (
1527 $HOST_ENTRY = new DC::UI::Entry 1557 $HOST_ENTRY = new DC::UI::Entry
1528 expand => 1, 1558 expand => 1,
1529 text => $CFG->{profile}{default}{host}, 1559 text => $CFG->{profile}{default}{host},
1530 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>)",
1531 on_changed => sub { 1561 on_changed => sub {
1532 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1533 $CFG->{profile}{default}{host} = $value; 1563 $CFG->{profile}{default}{host} = $value;
1534 1 1564 1
1535 } 1565 }
1538 if (0) { #d# disabled 1568 if (0) { #d# disabled
1539 $vbox->add (new DC::UI::Button 1569 $vbox->add (new DC::UI::Button
1540 expand => 1, 1570 expand => 1,
1541 text => "Server List", 1571 text => "Server List",
1542 other => $METASERVER, 1572 other => $METASERVER,
1543 tooltip => "Show a list of available crossfire servers", 1573 tooltip => "Show a list of available Deliantra servers",
1544 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1574 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1545 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1575 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1546 ); 1576 );
1547 }#d# 1577 }#d#
1548 } 1578 }
1590 $CFG->{show_tips} = $value; 1620 $CFG->{show_tips} = $value;
1591 0 1621 0
1592 } 1622 }
1593 ); 1623 );
1594 1624
1595 $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");
1596 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1597 text => $CFG->{logview_max_par}, 1627 text => $CFG->{logview_max_par},
1598 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 "
1599 . "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 "
1600 . "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.",
1601 on_changed => sub { 1631 on_changed => sub {
1602 my ($self, $value) = @_; 1632 my ($self, $value) = @_;
1603 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1604 0 1634 0
1605 }, 1635 },
1606 ); 1636 );
1607 1637
1608 $table 1638 $table
1712 1742
1713 $r 1743 $r
1714} 1744}
1715 1745
1716my %SORT_ORDER = ( 1746my %SORT_ORDER = (
1717 type => undef, 1747 type => sub {
1748 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1749 },
1718 mtime => sub { 1750 mtime => sub {
1719 my $NOW = time; 1751 my $NOW = time;
1720 sort { 1752 sort {
1721 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1753 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1722 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1754 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1944 my @path = DC::Pod::full_path_of $node; 1976 my @path = DC::Pod::full_path_of $node;
1945 pop @path; # drop current node 1977 pop @path; # drop current node
1946 1978
1947 for my $node (@path) { 1979 for my $node (@path) {
1948 $buttons->add (new DC::UI::Button 1980 $buttons->add (new DC::UI::Button
1949 text => $node->{kw}[0], 1981 text => $node->[DC::Pod::N_KW][0],
1950 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 1982 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1951 on_activate => sub { 1983 on_activate => sub {
1952 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1984 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1953 $load_node->($node); 1985 $load_node->($node);
1954 }, 1986 },
1955 ); 1987 );
1956 $buttons->add (new DC::UI::Label text => "/"); 1988 $buttons->add (new DC::UI::Label text => "/");
1957 } 1989 }
1958 1990
1959 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1991 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1960 1992
1961 $curnode = $node; 1993 $curnode = $node;
1962 1994
1963 $viewer->clear; 1995 $viewer->clear;
1964 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 1996 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
2143 force_x => "max", 2175 force_x => "max",
2144 force_y => 0; 2176 force_y => 0;
2145 $DEBUG_STATUS->show; 2177 $DEBUG_STATUS->show;
2146 2178
2147 $STATUSBOX = new DC::UI::Statusbox; 2179 $STATUSBOX = new DC::UI::Statusbox;
2148 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2180
2181 $MODBOX = new DC::UI::Label
2182 can_events => 1,
2183 can_hover => 1,
2184 markup => "",
2185 align => 0,
2186 font => $FONT_FIXED,
2187 tooltip => "#modifier_box",
2188 tooltip_width => 0.67,
2189 ;
2190
2191 update_modbox;
2149 2192
2150 (new DC::UI::Frame 2193 (new DC::UI::Frame
2151 bg => [0, 0, 0, 0.4], 2194 bg => [0, 0, 0, 0.4],
2152 force_x => 0, 2195 force_x => 0,
2153 force_y => "max", 2196 force_y => "max",
2154 child => $STATUSBOX, 2197 child => (my $LR = new DC::UI::VBox),
2155 )->show; 2198 )->show;
2199
2200 $LR->add ($STATUSBOX);
2201 $LR->add ($MODBOX);
2202 $LR->add (new DC::UI::Label
2203 align => 0,
2204 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2205 fontsize => 0.5,
2206 fg => [1, 1, 0, 0.7],
2207 );
2156 2208
2157 DC::UI::Toplevel->new ( 2209 DC::UI::Toplevel->new (
2158 title => "Minimap", 2210 title => "Minimap",
2159 name => "mapmap", 2211 name => "mapmap",
2160 x => 0, 2212 x => 0,
2168 2220
2169 $MAPWIDGET = new DC::MapWidget; 2221 $MAPWIDGET = new DC::MapWidget;
2170 $MAPWIDGET->connect (activate_console => sub { 2222 $MAPWIDGET->connect (activate_console => sub {
2171 my ($mapwidget, $preset) = @_; 2223 my ($mapwidget, $preset) = @_;
2172 2224
2173 $MESSAGE_WINDOW->activate_console ($preset) 2225 $MESSAGE_DIST->activate_console ($preset)
2174 if $MESSAGE_WINDOW; 2226 if $MESSAGE_DIST;
2175 }); 2227 });
2176 $MAPWIDGET->show; 2228 $MAPWIDGET->show;
2177 $MAPWIDGET->grab_focus; 2229 $MAPWIDGET->grab_focus;
2178 2230
2179 $COMPLETER = new DC::MapWidget::Command:: 2231 $COMPLETER = new DC::MapWidget::Command::
2191 force_h => $::HEIGHT * 0.6, 2243 force_h => $::HEIGHT * 0.6,
2192 has_close_button => 1, 2244 has_close_button => 1,
2193 ; 2245 ;
2194 2246
2195 $METASERVER = metaserver_dialog; 2247 $METASERVER = metaserver_dialog;
2248 # the name is changed to not conflict with the older name as users could have hidden it
2196 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2249 $MESSAGE_WINDOW = new DC::UI::Dockbar
2250 name => "message_window2",
2251 title => 'Messages',
2252 force_w => $::WIDTH * 0.6,
2253 force_h => $::HEIGHT * 0.25,
2254 ;
2197 2255
2256 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2257
2198 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2258 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2199 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2259 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2200 2260
2201 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2261 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2202 "Configure the server to play on, your username and password."); 2262 "Configure the server to play on, your username and password.");
2203 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2263 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2221 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2281 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2222 2282
2223 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2224 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2284 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2225 2285
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2286# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2287# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228 2288
2229 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 2289 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
2230 2290
2231 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2291 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2232 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2292 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2234 $BUTTONBAR->add (new DC::UI::Button 2294 $BUTTONBAR->add (new DC::UI::Button
2235 text => "Save Config", 2295 text => "Save Config",
2236 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2296 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2237 on_activate => sub { 2297 on_activate => sub {
2238 $::CFG->{layout} = DC::UI::get_layout; 2298 $::CFG->{layout} = DC::UI::get_layout;
2239 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2299 DC::write_cfg;
2240 status "Configuration Saved"; 2300 status "Configuration Saved";
2241 0 2301 0
2242 }, 2302 },
2243 ); 2303 );
2244 2304
2245 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2305 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2246 tooltip => "View Documentation"); 2306 tooltip => "View Documentation");
2247
2248 2307
2249 $BUTTONBAR->add (new DC::UI::Button 2308 $BUTTONBAR->add (new DC::UI::Button
2250 text => "Quit", 2309 text => "Quit",
2251 tooltip => "Terminates the program", 2310 tooltip => "Terminates the program",
2252 on_activate => sub { 2311 on_activate => sub {
2341 # alt-enter 2400 # alt-enter
2342 $FULLSCREEN_ENABLE->toggle; 2401 $FULLSCREEN_ENABLE->toggle;
2343 video_shutdown; 2402 video_shutdown;
2344 video_init; 2403 video_init;
2345 } else { 2404 } else {
2346 DC::UI::feed_sdl_key_down_event ($_[0]); 2405 &DC::UI::feed_sdl_key_down_event;
2347 } 2406 }
2407 update_modbox;
2348 }, 2408 },
2349 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2409 DC::SDL_KEYUP => sub {
2410 &DC::UI::feed_sdl_key_up_event;
2411 update_modbox;
2412 },
2350 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2413 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2351 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2414 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2352 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2415 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2353 DC::SDL_USEREVENT => sub { 2416 DC::SDL_USEREVENT => sub {
2354 if ($_[0]{code} == 1) { 2417 if ($_[0]{code} == 1) {
2365 EV::unloop; 2428 EV::unloop;
2366 #d# TODO calling exit here hangs the process in some futex 2429 #d# TODO calling exit here hangs the process in some futex
2367}; 2430};
2368 2431
2369{ 2432{
2433 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2434
2370 if (-e "$Deliantra::VARDIR/client.cf") { 2435 if (-e "$Deliantra::VARDIR/client.cf") {
2371 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2436 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2372 } else { 2437 } else {
2373 #TODO: compatibility cruft 2438 #TODO: compatibility cruft
2374 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2439 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2375 print STDERR "INFO: used old configuratrion file\n"; 2440 print STDERR "INFO: used old configuration file\n";
2376 } 2441 }
2377 2442
2378 DC::DB::Server::run; 2443 DC::DB::Server::run;
2444
2445 if ($CFG->{db_schema} < 1) {
2446 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2447 DC::DB::nuke_db;
2448 $CFG->{db_schema} = 1;
2449 DC::write_cfg;
2450 }
2451
2452 DC::DB::open_db;
2379 2453
2380 DC::UI::set_layout ($::CFG->{layout}); 2454 DC::UI::set_layout ($::CFG->{layout});
2381 2455
2382 my %DEF_CFG = ( 2456 my %DEF_CFG = (
2383 sdl_mode => 0, 2457 sdl_mode => 0,
2453 DejaVuSansMono-BoldOblique.ttf 2527 DejaVuSansMono-BoldOblique.ttf
2454 ); 2528 );
2455 2529
2456 DC::add_font $_ for @fonts; 2530 DC::add_font $_ for @fonts;
2457 2531
2458 DC::pango_init;
2459
2460 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2532 $FONT_PROP = new_from_file DC::Font $fonts[0];
2461 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2533 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2462 2534
2463 $FONT_PROP->make_default; 2535 $FONT_PROP->make_default;
2536
2537 DC::pango_init;
2464 } 2538 }
2465 2539
2466# compare mono (ft) vs. rgba (cairo) 2540# compare mono (ft) vs. rgba (cairo)
2467# ft - 1.8s, cairo 3s, even in alpha-only mode 2541# ft - 1.8s, cairo 3s, even in alpha-only mode
2468# for my $rgba (0..1) { 2542# for my $rgba (0..1) {
2485our $STARTUP_CANCEL = EV::idle sub { 2559our $STARTUP_CANCEL = EV::idle sub {
2486 undef $::STARTUP_CANCEL; 2560 undef $::STARTUP_CANCEL;
2487 $startup_done->(); 2561 $startup_done->();
2488}; 2562};
2489 2563
2564delete $SIG{__DIE__};
2490EV::loop; 2565EV::loop;
2491 2566
2492#video_shutdown; 2567#video_shutdown;
2493#audio_shutdown; 2568#audio_shutdown;
2494DC::OpenGL::quit; 2569DC::OpenGL::quit;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines