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.57 by root, Wed Jul 23 03:38:34 2008 UTC vs.
Revision 1.67 by root, Mon Sep 1 10:00:29 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
… …
90 97
91# need to do it again because that pile of garbage called PAR nukes it before main 98# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 99unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 100 if %PAR::LibCache;
94 101
95use Time::HiRes 'time';
96use EV; 102use EV;
103BEGIN { *time = \&EV::time }
104
97use List::Util qw(max min); 105use List::Util qw(max min);
98 106
99use Deliantra; 107use Deliantra;
100use Deliantra::Protocol::Constants; 108use Deliantra::Protocol::Constants;
101 109
110use AnyEvent::Util ();
102use AnyEvent::DNS; 111use AnyEvent::DNS;
103use AnyEvent::Socket (); 112use AnyEvent::Socket ();
104 113
105use Compress::LZF; 114use Compress::LZF;
115use JSON::XS;
106 116
107use DC; 117use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 118
119sub crash($;$) {
120 # nop during compiletime
121}
122
123BEGIN {
124 $SIG{__DIE__} = sub {
125 return if $^S;
126 crash ("CRASH/DIE: $_[0]" => 1);
127 DC::fatal Carp::longmess "$_[0]";
128 }
129}
130
109use DC::OpenGL (); 131use DC::OpenGL ();
110use DC::Protocol; 132use DC::Protocol;
111use DC::DB; 133use DC::DB;
112use DC::UI; 134use DC::UI;
113use DC::UI::Canvas; 135use DC::UI::Canvas;
114use DC::UI::Inventory; 136use DC::UI::Inventory;
115use DC::UI::SpellList; 137use DC::UI::SpellList;
116use DC::UI::Dockable; 138use DC::UI::Dockable;
117use DC::UI::Dockbar; 139use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 140use DC::UI::ChatView;
120use DC::MessageDistributor; 141use DC::MessageDistributor;
121use DC::Pod; 142use DC::Pod;
122use DC::MapWidget; 143use DC::MapWidget;
123use DC::Macro; 144use DC::Macro;
124 145
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 146$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 147$SIG{PIPE} = 'IGNORE';
127 148
128$EV::DIED = sub { 149$EV::DIED = sub {
150 crash ("CRASH/EV::DIED: $@" => 1);
129 DC::fatal Carp::longmess $@; 151 DC::fatal Carp::longmess $@;
130}; 152};
131 153
132my $MAX_FPS = 60; 154my $MAX_FPS = 60;
133 155
… …
135 157
136our $LAST_REFRESH; 158our $LAST_REFRESH;
137our $NOW; 159our $NOW;
138 160
139our $CFG; 161our $CFG;
140our $CONN;
141our $PROFILE; # current profile 162our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 163our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 164
144our $WANT_REFRESH; 165our $WANT_REFRESH;
145 166
… …
153our $FULLSCREEN; 174our $FULLSCREEN;
154our $FONTSIZE; 175our $FONTSIZE;
155 176
156our $FONT_PROP; 177our $FONT_PROP;
157our $FONT_FIXED; 178our $FONT_FIXED;
179
180our $CONN;
158 181
159our $MAP; 182our $MAP;
160our $MAPMAP; 183our $MAPMAP;
161our $MAPWIDGET; 184our $MAPWIDGET;
162our $COMPLETER; 185our $COMPLETER;
… …
204our $DEBUG_STATUS; 227our $DEBUG_STATUS;
205 228
206our $INV; 229our $INV;
207our $INVR; 230our $INVR;
208our $INVR_HB; 231our $INVR_HB;
232
233#############################################################################
234
235# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) {
238 my ($msg, $backtrace) = @_;
239
240 return unless $CONN;
241
242 my $fh = $CONN->{fh}
243 or return;
244
245 my $buf = delete $CONN->{wbuf};
246
247 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
248
249 AnyEvent::Util::fh_nonblocking $fh, 0;
250
251 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1;
253
254 $msg =~ s/\s+$//;
255
256 # backtrace as second step, in case it crashes, too
257 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
258 if $backtrace;
259};
209 260
210############################################################################# 261#############################################################################
211 262
212sub status { 263sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
800 dc_connect $host, $port; 851 dc_connect $host, $port;
801 } 852 }
802} 853}
803 854
804sub stop_game { 855sub stop_game {
856 crash "stop_game";
857
805 $LOGIN_BUTTON->set_text ("Login / Register"); 858 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 859 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 860 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 861 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 862 $SPELL_LIST->clear_spells;
… …
829 882
830 my $row = 0; 883 my $row = 0;
831 884
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 886 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 887 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 889
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 891 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 892 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 893 tooltip => "This field shows any known issues with your config or driver, such as "
… …
903 956
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 959 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 961 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 962 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 963 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 965 );
913 966
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
1589 1 1642 1
1590 }, 1643 },
1591 ); 1644 );
1592 1645
1593 $vbox->add (new DC::UI::FancyFrame 1646 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1647 label => "How to Play",
1595 min_h => 200, 1648 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1649 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1650 markup =>
1651 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1652 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1653 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1654 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1655 ),
1601 ); 1656 );
1602 1657
1603 $vbox 1658 $vbox
… …
1749 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1804 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1750 ["Ignore cursed" => PICKUP_NOT_CURSED], 1805 ["Ignore cursed" => PICKUP_NOT_CURSED],
1751 ["Jewelery" => PICKUP_JEWELS], 1806 ["Jewelery" => PICKUP_JEWELS],
1752 ["Flesh" => PICKUP_FLESH], 1807 ["Flesh" => PICKUP_FLESH],
1753 ], 1808 ],
1754 ["Weight/Value ratio", 2, 17] 1809 ["Value/Weight ratio", 2, 17]
1755 ) 1810 )
1756 { 1811 {
1757 my ($title, $x, $y, @bits) = @$_; 1812 my ($title, $x, $y, @bits) = @$_;
1758 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1813 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1759 1814
… …
1784 } 1839 }
1785 1840
1786 $table->add_at (2, 18, new DC::UI::ValSlider 1841 $table->add_at (2, 18, new DC::UI::ValSlider
1787 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1842 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1788 template => ">= 99", 1843 template => ">= 99",
1844 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1789 to_value => sub { ">= " . 5 * $_[0] }, 1845 to_value => sub { ">= " . 5 * $_[0] },
1790 on_changed => sub { 1846 on_changed => sub {
1791 my ($slider, $value) = @_; 1847 my ($slider, $value) = @_;
1792 1848
1793 $::CFG->{pickup} &= ~0xF; 1849 $::CFG->{pickup} &= ~0xF;
… …
1849 $::CFG->{inv_sort} = $_[1]; 1905 $::CFG->{inv_sort} = $_[1];
1850 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1906 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1851 }, 1907 },
1852 ); 1908 );
1853 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1909 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1854 #TODO# update to weigh/maxweight 1910 #TODO# update to weight/maxweight
1855 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1911 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1856 1912
1857 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1913 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1858 $sw1->add ($INV = new DC::UI::Inventory); 1914 $sw1->add ($INV = new DC::UI::Inventory);
1859 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1915 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2123 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2124 ); 2180 );
2125 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2126 text => "Quit anyway", 2182 text => "Quit anyway",
2127 expand => 1, 2183 expand => 1,
2128 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2129 ); 2188 );
2130 } 2189 }
2131 2190
2132 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2133 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2201 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2260 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2202 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2261 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2203 2262
2204 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2205 2264
2206 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2207 $CFG->{sdl_mode} = 0; 2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2208 for (reverse 0 .. $#SDL_MODES) { 2269 for (0 .. $#SDL_MODES) {
2209 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_;
2272 }
2210 } 2273 }
2211 } 2274 }
2212 2275
2213 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2214 2277
2215 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2278 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2216 $FULLSCREEN = $CFG->{fullscreen}; 2279 $FULLSCREEN = $CFG->{fullscreen};
2217 $FAST = $CFG->{fast}; 2280 $FAST = $CFG->{fast};
2218 2281
2282 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2219 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2283 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2284 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2220 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2285 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2221 2286
2222 $SDL_ACTIVE = 1; 2287 $SDL_ACTIVE = 1;
2223 $LAST_REFRESH = time - 0.01; 2288 $LAST_REFRESH = time - 0.01;
2224 2289
… …
2465 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2466} 2531}
2467 2532
2468%SDL_CB = ( 2533%SDL_CB = (
2469 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2470 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2471 }, 2537 },
2472 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2473 }, 2539 },
2474 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2514$SIG{INT} = $SIG{TERM} = sub { 2580$SIG{INT} = $SIG{TERM} = sub {
2515 EV::unloop; 2581 EV::unloop;
2516 #d# TODO calling exit here hangs the process in some futex 2582 #d# TODO calling exit here hangs the process in some futex
2517}; 2583};
2518 2584
2519{ 2585# due to mac os x + sdl combined briandamage, we need this contortion
2586sub main {
2587 {
2520 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2521 2589
2522 if (-e "$Deliantra::VARDIR/client.cf") { 2590 if (-e "$Deliantra::VARDIR/client.cf") {
2523 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2591 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2524 } else { 2592 } else {
2525 #TODO: compatibility cruft 2593 #TODO: compatibility cruft
2526 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2594 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2527 print STDERR "INFO: used old configuration file\n"; 2595 print STDERR "INFO: used old configuration file\n";
2528 } 2596 }
2529 2597
2530 DC::DB::Server::run; 2598 DC::DB::Server::run;
2531 2599
2532 if ($CFG->{db_schema} < 1) { 2600 if ($CFG->{db_schema} < 1) {
2533 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2601 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2534 DC::DB::nuke_db; 2602 DC::DB::nuke_db;
2535 $CFG->{db_schema} = 1; 2603 $CFG->{db_schema} = 1;
2536 DC::write_cfg; 2604 DC::write_cfg;
2537 } 2605 }
2538 2606
2539 DC::DB::open_db; 2607 DC::DB::open_db;
2540 2608
2541 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2542 2610
2543 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2544 sdl_mode => 0, 2612 sdl_mode => undef,
2545 fullscreen => 1, 2613 fullscreen => 1,
2546 fast => 0, 2614 fast => 0,
2547 force_opengl11 => undef, 2615 force_opengl11 => undef,
2548 disable_alpha => 0, 2616 disable_alpha => 0,
2549 smooth_movement => 1, 2617 smooth_movement => 1,
2550 texture_compression => 1, 2618 texture_compression => 1,
2551 map_scale => 1, 2619 map_scale => 1,
2552 fow_enable => 1, 2620 fow_enable => 1,
2553 fow_intensity => 0, 2621 fow_intensity => 0,
2554 map_smoothing => 1, 2622 map_smoothing => 1,
2555 gui_fontsize => 1, 2623 gui_fontsize => 1,
2556 log_fontsize => 0.7, 2624 log_fontsize => 0.7,
2557 gauge_fontsize => 1, 2625 gauge_fontsize => 1,
2558 gauge_size => 0.35, 2626 gauge_size => 0.35,
2559 stat_fontsize => 0.7, 2627 stat_fontsize => 0.7,
2560 mapsize => 100, 2628 mapsize => 100,
2561 audio_enable => 1, 2629 audio_enable => 1,
2562 audio_hw_channels => 0, 2630 audio_hw_channels => 0,
2563 audio_hw_frequency => 0, 2631 audio_hw_frequency => 0,
2564 audio_hw_chunksize => 0, 2632 audio_hw_chunksize => 0,
2565 audio_mix_channels => 8, 2633 audio_mix_channels => 8,
2566 effects_enable => 1, 2634 effects_enable => 1,
2567 effects_volume => 1, 2635 effects_volume => 1,
2568 bgm_enable => 1, 2636 bgm_enable => 1,
2569 bgm_volume => 0.5, 2637 bgm_volume => 0.5,
2570 output_rate => "", 2638 output_rate => "",
2571 pickup => 0, 2639 pickup => 0,
2572 inv_sort => "mtime", 2640 inv_sort => "mtime",
2573 default => "profile", # default profile 2641 default => "profile", # default profile
2574 show_tips => 1, 2642 show_tips => 1,
2575 logview_max_par => 1000, 2643 logview_max_par => 1000,
2576 shift_fire_stop => 0, 2644 shift_fire_stop => 0,
2577 ); 2645 );
2578 2646
2579 while (my ($k, $v) = each %DEF_CFG) { 2647 while (my ($k, $v) = each %DEF_CFG) {
2580 $CFG->{$k} = $v unless exists $CFG->{$k}; 2648 $CFG->{$k} = $v unless exists $CFG->{$k};
2581 } 2649 }
2582 2650
2583 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2584 $PROFILE = $CFG->{profile}{default}; 2652 $PROFILE = $CFG->{profile}{default};
2585 2653
2586 # convert old bindings (only default profile matters) 2654 # convert old bindings (only default profile matters)
2587 if (my $bindings = delete $PROFILE->{bindings}) { 2655 if (my $bindings = delete $PROFILE->{bindings}) {
2588 while (my ($mod, $syms) = each %$bindings) { 2656 while (my ($mod, $syms) = each %$bindings) {
2589 while (my ($sym, $cmds) = each %$syms) { 2657 while (my ($sym, $cmds) = each %$syms) {
2590 push @{ $PROFILE->{macro} }, { 2658 push @{ $PROFILE->{macro} }, {
2591 accelkey => [$mod*1, $sym*1], 2659 accelkey => [$mod*1, $sym*1],
2592 action => $cmds, 2660 action => $cmds,
2661 };
2593 }; 2662 }
2594 } 2663 }
2595 } 2664 }
2596 }
2597 2665
2598 sdl_init; 2666 sdl_init;
2599 2667
2600 { 2668 {
2601 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2669 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2602 DejaVuSans.ttf 2670 DejaVuSans.ttf
2603 DejaVuSansMono.ttf 2671 DejaVuSansMono.ttf
2604 DejaVuSans-Bold.ttf 2672 DejaVuSans-Bold.ttf
2605 DejaVuSansMono-Bold.ttf 2673 DejaVuSansMono-Bold.ttf
2606 DejaVuSans-Oblique.ttf 2674 DejaVuSans-Oblique.ttf
2607 DejaVuSansMono-Oblique.ttf 2675 DejaVuSansMono-Oblique.ttf
2608 DejaVuSans-BoldOblique.ttf 2676 DejaVuSans-BoldOblique.ttf
2609 DejaVuSansMono-BoldOblique.ttf 2677 DejaVuSansMono-BoldOblique.ttf
2610 ); 2678 );
2611 2679
2612 DC::add_font $_ for @fonts; 2680 DC::add_font $_ for @fonts;
2613 2681
2614 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2682 $FONT_PROP = new_from_file DC::Font $fonts[0];
2615 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2683 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2616 2684
2617 $FONT_PROP->make_default; 2685 $FONT_PROP->make_default;
2618 2686
2619 DC::pango_init; 2687 DC::pango_init;
2620 } 2688 }
2621 2689
2622# compare mono (ft) vs. rgba (cairo) 2690# compare mono (ft) vs. rgba (cairo)
2623# ft - 1.8s, cairo 3s, even in alpha-only mode 2691# ft - 1.8s, cairo 3s, even in alpha-only mode
2624# for my $rgba (0..1) { 2692# for my $rgba (0..1) {
2625# my $t1 = Time::HiRes::time; 2693# my $t1 = Time::HiRes::time;
… …
2630# } 2698# }
2631# my $t2 = Time::HiRes::time; 2699# my $t2 = Time::HiRes::time;
2632# warn $t2-$t1; 2700# warn $t2-$t1;
2633# } 2701# }
2634 2702
2635 video_init; 2703 video_init;
2636 audio_init; 2704 audio_init;
2637} 2705 }
2638 2706
2639show_tip_of_the_day if $CFG->{show_tips}; 2707 show_tip_of_the_day if $CFG->{show_tips};
2640 2708
2641our $STARTUP_CANCEL = EV::idle sub { 2709 our $STARTUP_CANCEL = EV::idle sub {
2642 undef $::STARTUP_CANCEL; 2710 undef $::STARTUP_CANCEL;
2643 $startup_done->(); 2711 $startup_done->();
2644}; 2712 };
2645 2713
2646delete $SIG{__DIE__}; 2714 delete $SIG{__DIE__};
2647EV::loop; 2715 EV::loop;
2648 2716
2649#video_shutdown; 2717#video_shutdown;
2650#audio_shutdown; 2718#audio_shutdown;
2651DC::OpenGL::quit; 2719 DC::OpenGL::quit;
2652DC::SDL_Quit; 2720 DC::SDL_Quit;
2653DC::DB::Server::stop; 2721 DC::DB::Server::stop;
2722}
2723
2724DC::SDL_braino; # see sub above
2654 2725
2655=head1 NAME 2726=head1 NAME
2656 2727
2657deliantra - A Deliantra MORPG game client 2728deliantra - A Deliantra MORPG game client
2658 2729

Diff Legend

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