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

Diff Legend

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