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.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 "
… …
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
… …
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2180 );
2126 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2182 text => "Quit anyway",
2128 expand => 1, 2183 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2130 ); 2188 );
2131 } 2189 }
2132 2190
2133 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2260 @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)"; 2261 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2262
2205 @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;
2206 2264
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2269 for (0 .. $#SDL_MODES) {
2210 $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 }
2211 } 2273 }
2212 } 2274 }
2213 2275
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2277
… …
2468 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2469} 2531}
2470 2532
2471%SDL_CB = ( 2533%SDL_CB = (
2472 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2473 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2474 }, 2537 },
2475 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2476 }, 2539 },
2477 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2544 DC::DB::open_db; 2607 DC::DB::open_db;
2545 2608
2546 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2547 2610
2548 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2549 sdl_mode => 0, 2612 sdl_mode => undef,
2550 fullscreen => 1, 2613 fullscreen => 1,
2551 fast => 0, 2614 fast => 0,
2552 force_opengl11 => undef, 2615 force_opengl11 => undef,
2553 disable_alpha => 0, 2616 disable_alpha => 0,
2554 smooth_movement => 1, 2617 smooth_movement => 1,

Diff Legend

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