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.53 by root, Fri Jul 18 22:32:55 2008 UTC vs.
Revision 1.69 by root, Mon Sep 1 15:08:15 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
81 symlink "libjpeg.62.dylib", "libjpeg.dylib";
74 } 82 }
75 83
76 unshift @INC, $root; 84 unshift @INC, $root;
77 } 85 }
78} 86}
… …
90 98
91# need to do it again because that pile of garbage called PAR nukes it before main 99# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 100unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 101 if %PAR::LibCache;
94 102
95use Time::HiRes 'time';
96use EV; 103use EV;
104BEGIN { *time = \&EV::time }
105
97use List::Util qw(max min); 106use List::Util qw(max min);
98 107
99use Deliantra; 108use Deliantra;
100use Deliantra::Protocol::Constants; 109use Deliantra::Protocol::Constants;
101 110
111use AnyEvent::Util ();
102use AnyEvent::DNS; 112use AnyEvent::DNS;
103use AnyEvent::Socket (); 113use AnyEvent::Socket ();
104 114
105use Compress::LZF; 115use Compress::LZF;
116use JSON::XS;
106 117
107use DC; 118use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 119
120sub crash($;$) {
121 # nop during compiletime
122}
123
124BEGIN {
125 $SIG{__DIE__} = sub {
126 return if $^S;
127 crash "CRASH/DIE: $_[0]" => 1;
128 DC::fatal Carp::longmess "$_[0]";
129 }
130}
131
109use DC::OpenGL (); 132use DC::OpenGL ();
110use DC::Protocol; 133use DC::Protocol;
111use DC::DB; 134use DC::DB;
112use DC::UI; 135use DC::UI;
113use DC::UI::Canvas; 136use DC::UI::Canvas;
114use DC::UI::Inventory; 137use DC::UI::Inventory;
115use DC::UI::SpellList; 138use DC::UI::SpellList;
116use DC::UI::Dockable; 139use DC::UI::Dockable;
117use DC::UI::Dockbar; 140use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 141use DC::UI::ChatView;
120use DC::MessageDistributor; 142use DC::MessageDistributor;
121use DC::Pod; 143use DC::Pod;
122use DC::MapWidget; 144use DC::MapWidget;
123use DC::Macro; 145use DC::Macro;
124 146
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 147$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 148$SIG{PIPE} = 'IGNORE';
127 149
128$EV::DIED = sub { 150$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1;
129 DC::fatal Carp::longmess $@; 152 DC::fatal Carp::longmess $@;
130}; 153};
131 154
132my $MAX_FPS = 60; 155my $MAX_FPS = 60;
133 156
… …
135 158
136our $LAST_REFRESH; 159our $LAST_REFRESH;
137our $NOW; 160our $NOW;
138 161
139our $CFG; 162our $CFG;
140our $CONN;
141our $PROFILE; # current profile 163our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 164our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 165
144our $WANT_REFRESH; 166our $WANT_REFRESH;
145 167
… …
153our $FULLSCREEN; 175our $FULLSCREEN;
154our $FONTSIZE; 176our $FONTSIZE;
155 177
156our $FONT_PROP; 178our $FONT_PROP;
157our $FONT_FIXED; 179our $FONT_FIXED;
180
181our $CONN;
158 182
159our $MAP; 183our $MAP;
160our $MAPMAP; 184our $MAPMAP;
161our $MAPWIDGET; 185our $MAPWIDGET;
162our $COMPLETER; 186our $COMPLETER;
… …
204our $DEBUG_STATUS; 228our $DEBUG_STATUS;
205 229
206our $INV; 230our $INV;
207our $INVR; 231our $INVR;
208our $INVR_HB; 232our $INVR_HB;
233
234#############################################################################
235
236# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) {
239 my ($msg, $backtrace) = @_;
240
241 return unless $CONN;
242
243 my $fh = $CONN->{fh}
244 or return;
245
246 my $buf = delete $CONN->{wbuf};
247
248 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
249
250 AnyEvent::Util::fh_nonblocking $fh, 0;
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 "
… …
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 904
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
853 force_w => $WIDTH * 0.1, expand => 1, 906 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ],
854 tooltip => $vidmode_tooltip); 908 tooltip => $vidmode_tooltip);
855 $hbox->add (my $mode_label = new DC::UI::Label 909 $hbox->add (my $mode_label = new DC::UI::Label
856 height => 0.8, template => "9999x9999@9+9", 910 height => 0.8, template => "9999x9999@9+9",
857 can_events => 1, tooltip => $vidmode_tooltip); 911 can_events => 1, tooltip => $vidmode_tooltip);
858 912
… …
902 956
903 $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");
904 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
905 state => $CFG->{texture_compression}, 959 state => $CFG->{texture_compression},
906 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 "
907 . "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). "
908 . "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 "
909 . "forced OpenGL 1.1 mode.", 963 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911 ); 965 );
912 966
913 $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");
914 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
930 on_activate => sub { 984 on_activate => sub {
931 video_shutdown (); 985 video_shutdown ();
932 video_init (); 986 video_init ();
933 0 987 0
934 } 988 }
989 );
990
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
995 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935 ); 998 );
936 999
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
938 $table->add_at (1, $row++, new DC::UI::Slider 1001 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1579 1 1642 1
1580 }, 1643 },
1581 ); 1644 );
1582 1645
1583 $vbox->add (new DC::UI::FancyFrame 1646 $vbox->add (new DC::UI::FancyFrame
1584 label => "Registering", 1647 label => "How to Play",
1585 min_h => 200, 1648 min_h => 240,
1586 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1649 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587 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). "
1588 "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 "
1589 . "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.",
1590 ), 1655 ),
1591 ); 1656 );
1592 1657
1593 $vbox 1658 $vbox
… …
1739 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1804 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740 ["Ignore cursed" => PICKUP_NOT_CURSED], 1805 ["Ignore cursed" => PICKUP_NOT_CURSED],
1741 ["Jewelery" => PICKUP_JEWELS], 1806 ["Jewelery" => PICKUP_JEWELS],
1742 ["Flesh" => PICKUP_FLESH], 1807 ["Flesh" => PICKUP_FLESH],
1743 ], 1808 ],
1744 ["Weight/Value ratio", 2, 17] 1809 ["Value/Weight ratio", 2, 17]
1745 ) 1810 )
1746 { 1811 {
1747 my ($title, $x, $y, @bits) = @$_; 1812 my ($title, $x, $y, @bits) = @$_;
1748 $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]);
1749 1814
… …
1774 } 1839 }
1775 1840
1776 $table->add_at (2, 18, new DC::UI::ValSlider 1841 $table->add_at (2, 18, new DC::UI::ValSlider
1777 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1842 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778 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).",
1779 to_value => sub { ">= " . 5 * $_[0] }, 1845 to_value => sub { ">= " . 5 * $_[0] },
1780 on_changed => sub { 1846 on_changed => sub {
1781 my ($slider, $value) = @_; 1847 my ($slider, $value) = @_;
1782 1848
1783 $::CFG->{pickup} &= ~0xF; 1849 $::CFG->{pickup} &= ~0xF;
… …
1839 $::CFG->{inv_sort} = $_[1]; 1905 $::CFG->{inv_sort} = $_[1];
1840 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1906 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1841 }, 1907 },
1842 ); 1908 );
1843 $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);
1844 #TODO# update to weigh/maxweight 1910 #TODO# update to weight/maxweight
1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1911 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846 1912
1847 $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);
1848 $sw1->add ($INV = new DC::UI::Inventory); 1914 $sw1->add ($INV = new DC::UI::Inventory);
1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1915 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2113 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114 ); 2180 );
2115 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2116 text => "Quit anyway", 2182 text => "Quit anyway",
2117 expand => 1, 2183 expand => 1,
2118 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2119 ); 2188 );
2120 } 2189 }
2121 2190
2122 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2123 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2260 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @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)";
2193 2262
2194 @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;
2195 2264
2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197 $CFG->{sdl_mode} = 0; 2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2198 for (reverse 0 .. $#SDL_MODES) { 2269 for (0 .. $#SDL_MODES) {
2199 $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 }
2200 } 2273 }
2201 } 2274 }
2202 2275
2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204 2277
2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2278 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206 $FULLSCREEN = $CFG->{fullscreen}; 2279 $FULLSCREEN = $CFG->{fullscreen};
2207 $FAST = $CFG->{fast}; 2280 $FAST = $CFG->{fast};
2208 2281
2282 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2209 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
2210 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2285 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211 2286
2212 $SDL_ACTIVE = 1; 2287 $SDL_ACTIVE = 1;
2213 $LAST_REFRESH = time - 0.01; 2288 $LAST_REFRESH = time - 0.01;
2214 2289
… …
2394 2469
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397 2472
2398 $CAVEAT_LABEL->set_text ("None :)"); 2473 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Non-accelerated video mode") 2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401 2476
2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2403} 2478}
2404 2479
… …
2455 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2456} 2531}
2457 2532
2458%SDL_CB = ( 2533%SDL_CB = (
2459 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2460 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2461 }, 2537 },
2462 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2463 }, 2539 },
2464 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2504$SIG{INT} = $SIG{TERM} = sub { 2580$SIG{INT} = $SIG{TERM} = sub {
2505 EV::unloop; 2581 EV::unloop;
2506 #d# TODO calling exit here hangs the process in some futex 2582 #d# TODO calling exit here hangs the process in some futex
2507}; 2583};
2508 2584
2509{ 2585# due to mac os x + sdl combined briandamage, we need this contortion
2586sub main {
2587 {
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511 2589
2512 if (-e "$Deliantra::VARDIR/client.cf") { 2590 if (-e "$Deliantra::VARDIR/client.cf") {
2513 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2591 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514 } else { 2592 } else {
2515 #TODO: compatibility cruft 2593 #TODO: compatibility cruft
2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2594 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517 print STDERR "INFO: used old configuration file\n"; 2595 print STDERR "INFO: used old configuration file\n";
2518 } 2596 }
2519 2597
2520 DC::DB::Server::run; 2598 DC::DB::Server::run;
2521 2599
2522 if ($CFG->{db_schema} < 1) { 2600 if ($CFG->{db_schema} < 1) {
2523 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";
2524 DC::DB::nuke_db; 2602 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1; 2603 $CFG->{db_schema} = 1;
2526 DC::write_cfg; 2604 DC::write_cfg;
2527 } 2605 }
2528 2606
2529 DC::DB::open_db; 2607 DC::DB::open_db;
2530 2608
2531 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2532 2610
2533 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2534 sdl_mode => 0, 2612 sdl_mode => undef,
2535 fullscreen => 1, 2613 fullscreen => 1,
2536 fast => 0, 2614 fast => 0,
2537 force_opengl11 => undef, 2615 force_opengl11 => undef,
2538 disable_alpha => 0, 2616 disable_alpha => 0,
2617 smooth_movement => 1,
2539 texture_compression => 1, 2618 texture_compression => 1,
2540 map_scale => 1, 2619 map_scale => 1,
2541 fow_enable => 1, 2620 fow_enable => 1,
2542 fow_intensity => 0, 2621 fow_intensity => 0,
2543 map_smoothing => 1, 2622 map_smoothing => 1,
2544 gui_fontsize => 1, 2623 gui_fontsize => 1,
2545 log_fontsize => 0.7, 2624 log_fontsize => 0.7,
2546 gauge_fontsize => 1, 2625 gauge_fontsize => 1,
2547 gauge_size => 0.35, 2626 gauge_size => 0.35,
2548 stat_fontsize => 0.7, 2627 stat_fontsize => 0.7,
2549 mapsize => 100, 2628 mapsize => 100,
2550 audio_enable => 1, 2629 audio_enable => 1,
2551 audio_hw_channels => 0, 2630 audio_hw_channels => 0,
2552 audio_hw_frequency => 0, 2631 audio_hw_frequency => 0,
2553 audio_hw_chunksize => 0, 2632 audio_hw_chunksize => 0,
2554 audio_mix_channels => 8, 2633 audio_mix_channels => 8,
2555 effects_enable => 1, 2634 effects_enable => 1,
2556 effects_volume => 1, 2635 effects_volume => 1,
2557 bgm_enable => 1, 2636 bgm_enable => 1,
2558 bgm_volume => 0.5, 2637 bgm_volume => 0.5,
2559 output_rate => "", 2638 output_rate => "",
2560 pickup => 0, 2639 pickup => 0,
2561 inv_sort => "mtime", 2640 inv_sort => "mtime",
2562 default => "profile", # default profile 2641 default => "profile", # default profile
2563 show_tips => 1, 2642 show_tips => 1,
2564 logview_max_par => 1000, 2643 logview_max_par => 1000,
2565 shift_fire_stop => 0, 2644 shift_fire_stop => 0,
2566 ); 2645 );
2567 2646
2568 while (my ($k, $v) = each %DEF_CFG) { 2647 while (my ($k, $v) = each %DEF_CFG) {
2569 $CFG->{$k} = $v unless exists $CFG->{$k}; 2648 $CFG->{$k} = $v unless exists $CFG->{$k};
2570 } 2649 }
2571 2650
2572 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2573 $PROFILE = $CFG->{profile}{default}; 2652 $PROFILE = $CFG->{profile}{default};
2574 2653
2575 # convert old bindings (only default profile matters) 2654 # convert old bindings (only default profile matters)
2576 if (my $bindings = delete $PROFILE->{bindings}) { 2655 if (my $bindings = delete $PROFILE->{bindings}) {
2577 while (my ($mod, $syms) = each %$bindings) { 2656 while (my ($mod, $syms) = each %$bindings) {
2578 while (my ($sym, $cmds) = each %$syms) { 2657 while (my ($sym, $cmds) = each %$syms) {
2579 push @{ $PROFILE->{macro} }, { 2658 push @{ $PROFILE->{macro} }, {
2580 accelkey => [$mod*1, $sym*1], 2659 accelkey => [$mod*1, $sym*1],
2581 action => $cmds, 2660 action => $cmds,
2661 };
2582 }; 2662 }
2583 } 2663 }
2584 } 2664 }
2585 }
2586 2665
2587 sdl_init; 2666 sdl_init;
2588 2667
2589 { 2668 {
2590 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2669 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591 DejaVuSans.ttf 2670 DejaVuSans.ttf
2592 DejaVuSansMono.ttf 2671 DejaVuSansMono.ttf
2593 DejaVuSans-Bold.ttf 2672 DejaVuSans-Bold.ttf
2594 DejaVuSansMono-Bold.ttf 2673 DejaVuSansMono-Bold.ttf
2595 DejaVuSans-Oblique.ttf 2674 DejaVuSans-Oblique.ttf
2596 DejaVuSansMono-Oblique.ttf 2675 DejaVuSansMono-Oblique.ttf
2597 DejaVuSans-BoldOblique.ttf 2676 DejaVuSans-BoldOblique.ttf
2598 DejaVuSansMono-BoldOblique.ttf 2677 DejaVuSansMono-BoldOblique.ttf
2599 ); 2678 );
2600 2679
2601 DC::add_font $_ for @fonts; 2680 DC::add_font $_ for @fonts;
2602 2681
2603 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2682 $FONT_PROP = new_from_file DC::Font $fonts[0];
2604 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2683 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2605 2684
2606 $FONT_PROP->make_default; 2685 $FONT_PROP->make_default;
2607 2686
2608 DC::pango_init; 2687 DC::pango_init;
2609 } 2688 }
2610 2689
2611# compare mono (ft) vs. rgba (cairo) 2690# compare mono (ft) vs. rgba (cairo)
2612# ft - 1.8s, cairo 3s, even in alpha-only mode 2691# ft - 1.8s, cairo 3s, even in alpha-only mode
2613# for my $rgba (0..1) { 2692# for my $rgba (0..1) {
2614# my $t1 = Time::HiRes::time; 2693# my $t1 = Time::HiRes::time;
… …
2619# } 2698# }
2620# my $t2 = Time::HiRes::time; 2699# my $t2 = Time::HiRes::time;
2621# warn $t2-$t1; 2700# warn $t2-$t1;
2622# } 2701# }
2623 2702
2624 video_init; 2703 video_init;
2625 audio_init; 2704 audio_init;
2626} 2705 }
2627 2706
2628show_tip_of_the_day if $CFG->{show_tips}; 2707 show_tip_of_the_day if $CFG->{show_tips};
2629 2708
2630our $STARTUP_CANCEL = EV::idle sub { 2709 our $STARTUP_CANCEL = EV::idle sub {
2631 undef $::STARTUP_CANCEL; 2710 undef $::STARTUP_CANCEL;
2632 $startup_done->(); 2711 $startup_done->();
2633}; 2712 };
2634 2713
2635delete $SIG{__DIE__}; 2714 delete $SIG{__DIE__};
2636EV::loop; 2715 EV::loop;
2637 2716
2638#video_shutdown; 2717#video_shutdown;
2639#audio_shutdown; 2718#audio_shutdown;
2640DC::OpenGL::quit; 2719 DC::OpenGL::quit;
2641DC::SDL_Quit; 2720 DC::SDL_Quit;
2642DC::DB::Server::stop; 2721 DC::DB::Server::stop;
2722}
2723
2724DC::SDL_braino; # see sub above
2643 2725
2644=head1 NAME 2726=head1 NAME
2645 2727
2646deliantra - A Deliantra MORPG game client 2728deliantra - A Deliantra MORPG game client
2647 2729
… …
2664 4 show fps 2746 4 show fps
2665 8 suppress tooltips 2747 8 suppress tooltips
2666 2748
2667=head1 AUTHOR 2749=head1 AUTHOR
2668 2750
2669Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2751Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670 2752
2671 2753
2672 2754

Diff Legend

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