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.25 by elmex, Sun Jan 6 17:40:45 2008 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

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

Diff Legend

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