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.59 by root, Tue Aug 19 17:38:30 2008 UTC vs.
Revision 1.73 by root, Wed Sep 3 06:07:39 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 syswrite $fh, $buf;
251 AnyEvent::Util::fh_nonblocking $fh, 1;
252
253 $msg =~ s/\s+$//;
254
255 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace;
258};
209 259
210############################################################################# 260#############################################################################
211 261
212sub status { 262sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
800 dc_connect $host, $port; 850 dc_connect $host, $port;
801 } 851 }
802} 852}
803 853
804sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
805 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
829 881
830 my $row = 0; 882 my $row = 0;
831 883
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 884 $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, 885 $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, 886 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 888
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 889 $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, 890 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 891 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 892 tooltip => "This field shows any known issues with your config or driver, such as "
… …
903 955
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 957 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 958 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 959 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 " 960 . "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 " 961 . "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.", 962 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 964 );
913 965
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
1589 1 1641 1
1590 }, 1642 },
1591 ); 1643 );
1592 1644
1593 $vbox->add (new DC::UI::FancyFrame 1645 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1646 label => "How to Play",
1595 min_h => 200, 1647 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1648 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1649 markup =>
1650 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1651 . "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 " 1652 . "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.", 1653 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1654 ),
1601 ); 1655 );
1602 1656
1603 $vbox 1657 $vbox
… …
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2178 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2179 );
2126 $hb->add (new DC::UI::Button 2180 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2181 text => "Quit anyway",
2128 expand => 1, 2182 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2183 on_activate => sub {
2184 crash "Quit anyway";
2185 EV::unloop EV::UNLOOP_ALL;
2186 },
2130 ); 2187 );
2131 } 2188 }
2132 2189
2133 $QUIT_DIALOG->show; 2190 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2191 $QUIT_DIALOG->grab_focus;
… …
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2250 and die "SDL::Init failed!\n";
2194} 2251}
2195 2252
2196sub video_init { 2253sub video_init {
2254 DC::set_theme $CFG->{theme};
2255
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2256 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2257 $SDL_REINIT = 0;
2199 2258
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2259 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2260 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2261 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2203 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2262 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2263
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2264 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2265
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2266 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2267 $CFG->{sdl_mode} = 0; # lowest resolution by default
2268
2269 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2270 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2271 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2272 $CFG->{sdl_mode} = $_;
2273 }
2211 } 2274 }
2212 } 2275 }
2213 2276
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2277 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2278
… …
2403 $BUTTONBAR->show; 2466 $BUTTONBAR->show;
2404 $SETUP_DIALOG->show; 2467 $SETUP_DIALOG->show;
2405 $MESSAGE_WINDOW->show; 2468 $MESSAGE_WINDOW->show;
2406 } 2469 }
2407 2470
2408 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2471 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2409 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2472 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2410 2473
2411 $CAVEAT_LABEL->set_text ("None :)"); 2474 $CAVEAT_LABEL->set_text ("None :)");
2412 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2475 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2413 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2476 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
… …
2468 delete $animate_object{$widget}; 2531 delete $animate_object{$widget};
2469} 2532}
2470 2533
2471%SDL_CB = ( 2534%SDL_CB = (
2472 DC::SDL_QUIT => sub { 2535 DC::SDL_QUIT => sub {
2536 crash "SDL_QUIT";
2473 EV::unloop EV::UNLOOP_ALL; 2537 EV::unloop EV::UNLOOP_ALL;
2474 }, 2538 },
2475 DC::SDL_VIDEORESIZE => sub { 2539 DC::SDL_VIDEORESIZE => sub {
2476 }, 2540 },
2477 DC::SDL_VIDEOEXPOSE => sub { 2541 DC::SDL_VIDEOEXPOSE => sub {
… …
2544 DC::DB::open_db; 2608 DC::DB::open_db;
2545 2609
2546 DC::UI::set_layout ($::CFG->{layout}); 2610 DC::UI::set_layout ($::CFG->{layout});
2547 2611
2548 my %DEF_CFG = ( 2612 my %DEF_CFG = (
2549 sdl_mode => 0, 2613 sdl_mode => undef,
2550 fullscreen => 1, 2614 fullscreen => 1,
2551 fast => 0, 2615 fast => 0,
2552 force_opengl11 => undef, 2616 force_opengl11 => undef,
2553 disable_alpha => 0, 2617 disable_alpha => 0,
2554 smooth_movement => 1, 2618 smooth_movement => 1,
… …
2577 inv_sort => "mtime", 2641 inv_sort => "mtime",
2578 default => "profile", # default profile 2642 default => "profile", # default profile
2579 show_tips => 1, 2643 show_tips => 1,
2580 logview_max_par => 1000, 2644 logview_max_par => 1000,
2581 shift_fire_stop => 0, 2645 shift_fire_stop => 0,
2646 theme => "wood",
2582 ); 2647 );
2583 2648
2584 while (my ($k, $v) = each %DEF_CFG) { 2649 while (my ($k, $v) = each %DEF_CFG) {
2585 $CFG->{$k} = $v unless exists $CFG->{$k}; 2650 $CFG->{$k} = $v unless exists $CFG->{$k};
2586 } 2651 }

Diff Legend

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