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.24 by root, Sun Jan 6 17:31:24 2008 UTC vs.
Revision 1.47 by root, Mon Jul 7 05:02:03 2008 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3{
4package Deliantra::Client; # work around CPAN breakage
5}
2 6
3if ($ENV{DELIANTRA_CORO_DEBUG}) { 7if ($ENV{DELIANTRA_CORO_DEBUG}) {
4 eval ' 8 eval '
5 use Coro; 9 use Coro;
6 use Coro::EV; 10 use Coro::EV;
… …
97use List::Util qw(max min); 101use List::Util qw(max min);
98 102
99use Deliantra; 103use Deliantra;
100use Deliantra::Protocol::Constants; 104use Deliantra::Protocol::Constants;
101 105
106use AnyEvent::DNS;
107
102use Compress::LZF; 108use Compress::LZF;
103 109
104use DC; 110use DC;
111BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 112use DC::OpenGL ();
106use DC::Protocol; 113use DC::Protocol;
107use DC::DB; 114use DC::DB;
108use DC::UI; 115use DC::UI;
109use DC::UI::Canvas; 116use DC::UI::Canvas;
… …
190our $SDL_ACTIVE; 197our $SDL_ACTIVE;
191our %SDL_CB; 198our %SDL_CB;
192 199
193our $ALT_ENTER_MESSAGE; 200our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 201our $STATUSBOX;
202our $MODBOX;
195our $DEBUG_STATUS; 203our $DEBUG_STATUS;
196 204
197our $INV; 205our $INV;
198our $INVR; 206our $INVR;
199our $INVR_HB; 207our $INVR_HB;
… …
208 $DEBUG_STATUS->set_text ($_[0]); 216 $DEBUG_STATUS->set_text ($_[0]);
209} 217}
210 218
211sub message { 219sub message {
212 $MESSAGE_DIST->message (@_); 220 $MESSAGE_DIST->message (@_);
221}
222
223sub update_modbox {
224 my $mod = DC::SDL_GetModState;
225
226 my $markup;
227
228 $markup .= $mod & DC::KMOD_CTRL
229 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
230 : "[<span foreground='#888'> once </span>]";
231
232 $markup .= $mod & DC::KMOD_SHIFT
233 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
234 : "[<span foreground='#888'>move</span>]";
235
236 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
237 ? "[ALT]"
238 : "[<span foreground='#888'>alt</span>]";
239
240 $markup .= $mod & DC::KMOD_NUM
241 ? "[NUM]"
242 : "[<span foreground='#888'>num</span>]";
243
244 # <tt> around next statement works around some bug that keeps the
245 # "font =>" from being used on windows
246 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 247}
214 248
215############################################################################# 249#############################################################################
216#TODO: maybe move into own audio module... 250#TODO: maybe move into own audio module...
217 251
… …
637 # right: accept 671 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 672 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 673 text => "Accept",
640 on_activate => sub { 674 on_activate => sub {
641 $conn->send ("reply n"); 675 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 676 destroy_query_dialog $conn;
644 0 677 0
645 }, 678 },
646 ); 679 );
647 680
… …
699 732
700 $vbox->add (@dialog); 733 $vbox->add (@dialog);
701 $dialog->show; 734 $dialog->show;
702} 735}
703 736
704sub start_game { 737sub dc_connect {
705 status "logging in..."; 738 my ($host, $port) = @_;
706
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709 739
710 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 740 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
711 741
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 742 $CONN =
717 new DC::Protocol 743 new DC::Protocol
718 host => $host, 744 host => $host,
719 port => $port || 13327, 745 port => $port || 13327,
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,
731 query => \&server_query, 757 query => \&server_query,
732 758
733 setup_req => { 759 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 760 smoothing => $CFG->{map_smoothing}*1,
735 }, 761 },
736 };
737 762
738 if ($CONN) { 763 on_connect => sub {
764 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 765 DC::lowdelay fileno $CONN->{fh};
740 766
741 status "login successful"; 767 status "login successful";
768 } else {
769 undef $CONN;
770 status "unable to connect: $!";
771 stop_game();
772 }
773 },
774 ;
775}
776
777sub start_game {
778 status "logging in...";
779
780 $LOGIN_BUTTON->set_text ("Logout");
781 $SETUP_DIALOG->hide;
782
783 my ($host, $port) = split /:/, $PROFILE->{host};
784
785 $MAP = new DC::Map;
786
787 # hack to make SURE we find the IP address all right
788 # can be removed once AnyEvent::DNS is proven stable.
789 if ($host eq "gameserver.deliantra.net") {
790 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
791 if ($_[0] ne "80.101.114.108") { # Perl
792 status "dns failure, using hardcoded address";
793 $host = "129.13.162.95";
794 }
795
796 dc_connect $host, $port;
797 };
742 } else { 798 } else {
743 status "unable to connect"; 799 dc_connect $host, $port;
744 stop_game();
745 } 800 }
746} 801}
747 802
748sub stop_game { 803sub stop_game {
749 $LOGIN_BUTTON->set_text ("Login / Register"); 804 $LOGIN_BUTTON->set_text ("Login / Register");
… …
1528 1583
1529 $vbox->add ( 1584 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1585 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1586 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1587 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1588 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1589 on_changed => sub {
1535 my ($self, $value) = @_; 1590 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1591 $CFG->{profile}{default}{host} = $value;
1537 1 1592 1
1538 } 1593 }
… …
1541 if (0) { #d# disabled 1596 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1597 $vbox->add (new DC::UI::Button
1543 expand => 1, 1598 expand => 1,
1544 text => "Server List", 1599 text => "Server List",
1545 other => $METASERVER, 1600 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1601 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1602 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1603 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1604 );
1550 }#d# 1605 }#d#
1551 } 1606 }
… …
1593 $CFG->{show_tips} = $value; 1648 $CFG->{show_tips} = $value;
1594 0 1649 0
1595 } 1650 }
1596 ); 1651 );
1597 1652
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1653 $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 1654 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1655 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1656 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 " 1657 . "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.", 1658 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1659 on_changed => sub {
1605 my ($self, $value) = @_; 1660 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1661 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1662 0
1608 }, 1663 },
1609 ); 1664 );
1610 1665
1611 $table 1666 $table
… …
1715 1770
1716 $r 1771 $r
1717} 1772}
1718 1773
1719my %SORT_ORDER = ( 1774my %SORT_ORDER = (
1720 type => undef, 1775 type => sub {
1776 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1777 },
1721 mtime => sub { 1778 mtime => sub {
1722 my $NOW = time; 1779 my $NOW = time;
1723 sort { 1780 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1781 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; 1782 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1947 my @path = DC::Pod::full_path_of $node; 2004 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2005 pop @path; # drop current node
1949 2006
1950 for my $node (@path) { 2007 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2008 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2009 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2010 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2011 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2012 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2013 $load_node->($node);
1957 }, 2014 },
1958 ); 2015 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2016 $buttons->add (new DC::UI::Label text => "/");
1960 } 2017 }
1961 2018
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2019 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2020
1964 $curnode = $node; 2021 $curnode = $node;
1965 2022
1966 $viewer->clear; 2023 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2024 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2146 force_x => "max", 2203 force_x => "max",
2147 force_y => 0; 2204 force_y => 0;
2148 $DEBUG_STATUS->show; 2205 $DEBUG_STATUS->show;
2149 2206
2150 $STATUSBOX = new DC::UI::Statusbox; 2207 $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]); 2208
2209 $MODBOX = new DC::UI::Label
2210 can_events => 1,
2211 can_hover => 1,
2212 markup => "",
2213 align => 0,
2214 font => $FONT_FIXED,
2215 tooltip => "#modifier_box",
2216 tooltip_width => 0.67,
2217 ;
2218
2219 update_modbox;
2152 2220
2153 (new DC::UI::Frame 2221 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2222 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2223 force_x => 0,
2156 force_y => "max", 2224 force_y => "max",
2157 child => $STATUSBOX, 2225 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2226 )->show;
2227
2228 $LR->add ($STATUSBOX);
2229 $LR->add ($MODBOX);
2230 $LR->add (new DC::UI::Label
2231 align => 0,
2232 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2233 fontsize => 0.5,
2234 fg => [1, 1, 0, 0.7],
2235 );
2159 2236
2160 DC::UI::Toplevel->new ( 2237 DC::UI::Toplevel->new (
2161 title => "Minimap", 2238 title => "Minimap",
2162 name => "mapmap", 2239 name => "mapmap",
2163 x => 0, 2240 x => 0,
… …
2194 force_h => $::HEIGHT * 0.6, 2271 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2272 has_close_button => 1,
2196 ; 2273 ;
2197 2274
2198 $METASERVER = metaserver_dialog; 2275 $METASERVER = metaserver_dialog;
2276 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar; 2277 $MESSAGE_WINDOW = new DC::UI::Dockbar
2278 name => "message_window2",
2279 title => 'Messages',
2280 force_w => $::WIDTH * 0.6,
2281 force_h => $::HEIGHT * 0.25,
2282 ;
2283
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2284 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2285
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2286 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2287 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2288
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2289 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2290 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2291 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2309 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2310
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2311 $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."); 2312 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2313
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2314# $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."); 2315# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2316
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 2317 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 2318
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2319 $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."); 2320 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2322 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2323 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.", 2324 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 { 2325 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2326 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2327 DC::write_cfg;
2244 status "Configuration Saved"; 2328 status "Configuration Saved";
2245 0 2329 0
2246 }, 2330 },
2247 ); 2331 );
2248 2332
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2333 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2334 tooltip => "View Documentation");
2251
2252 2335
2253 $BUTTONBAR->add (new DC::UI::Button 2336 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2337 text => "Quit",
2255 tooltip => "Terminates the program", 2338 tooltip => "Terminates the program",
2256 on_activate => sub { 2339 on_activate => sub {
… …
2345 # alt-enter 2428 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2429 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2430 video_shutdown;
2348 video_init; 2431 video_init;
2349 } else { 2432 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2433 &DC::UI::feed_sdl_key_down_event;
2351 } 2434 }
2435 update_modbox;
2352 }, 2436 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2437 DC::SDL_KEYUP => sub {
2438 &DC::UI::feed_sdl_key_up_event;
2439 update_modbox;
2440 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2441 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2442 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2443 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2444 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2445 if ($_[0]{code} == 1) {
… …
2369 EV::unloop; 2456 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2457 #d# TODO calling exit here hangs the process in some futex
2371}; 2458};
2372 2459
2373{ 2460{
2461 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2462
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2463 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2464 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2465 } else {
2377 #TODO: compatibility cruft 2466 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2467 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2468 print STDERR "INFO: used old configuration file\n";
2380 } 2469 }
2381 2470
2382 DC::DB::Server::run; 2471 DC::DB::Server::run;
2472
2473 if ($CFG->{db_schema} < 1) {
2474 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2475 DC::DB::nuke_db;
2476 $CFG->{db_schema} = 1;
2477 DC::write_cfg;
2478 }
2479
2480 DC::DB::open_db;
2383 2481
2384 DC::UI::set_layout ($::CFG->{layout}); 2482 DC::UI::set_layout ($::CFG->{layout});
2385 2483
2386 my %DEF_CFG = ( 2484 my %DEF_CFG = (
2387 sdl_mode => 0, 2485 sdl_mode => 0,
… …
2412 pickup => 0, 2510 pickup => 0,
2413 inv_sort => "mtime", 2511 inv_sort => "mtime",
2414 default => "profile", # default profile 2512 default => "profile", # default profile
2415 show_tips => 1, 2513 show_tips => 1,
2416 logview_max_par => 1000, 2514 logview_max_par => 1000,
2515 shift_fire_stop => 0,
2417 ); 2516 );
2418 2517
2419 while (my ($k, $v) = each %DEF_CFG) { 2518 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2519 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2520 }
… …
2457 DejaVuSansMono-BoldOblique.ttf 2556 DejaVuSansMono-BoldOblique.ttf
2458 ); 2557 );
2459 2558
2460 DC::add_font $_ for @fonts; 2559 DC::add_font $_ for @fonts;
2461 2560
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2561 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2562 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2563
2467 $FONT_PROP->make_default; 2564 $FONT_PROP->make_default;
2565
2566 DC::pango_init;
2468 } 2567 }
2469 2568
2470# compare mono (ft) vs. rgba (cairo) 2569# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2570# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2571# for my $rgba (0..1) {
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2588our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2589 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2590 $startup_done->();
2492}; 2591};
2493 2592
2593delete $SIG{__DIE__};
2494EV::loop; 2594EV::loop;
2495 2595
2496#video_shutdown; 2596#video_shutdown;
2497#audio_shutdown; 2597#audio_shutdown;
2498DC::OpenGL::quit; 2598DC::OpenGL::quit;

Diff Legend

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