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.37 by root, Mon May 5 16:19:19 2008 UTC vs.
Revision 1.53 by root, Fri Jul 18 22:32:55 2008 UTC

… …
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;
103use AnyEvent::Socket ();
104
102use Compress::LZF; 105use Compress::LZF;
103 106
107use DC;
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 109use DC::OpenGL ();
106use DC::Protocol; 110use DC::Protocol;
107use DC::DB; 111use DC::DB;
108use DC::UI; 112use DC::UI;
109use DC::UI::Canvas; 113use DC::UI::Canvas;
… …
137our $PROFILE; # current profile 141our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 142our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 143
140our $WANT_REFRESH; 144our $WANT_REFRESH;
141 145
146our $MODE_SLIDER;
147our $CAVEAT_LABEL;
148
142our @SDL_MODES; 149our @SDL_MODES;
150our $SDL_REINIT = 1;
143our $WIDTH; 151our $WIDTH;
144our $HEIGHT; 152our $HEIGHT;
145our $FULLSCREEN; 153our $FULLSCREEN;
146our $FONTSIZE; 154our $FONTSIZE;
147 155
… …
664 # right: accept 672 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 673 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 674 text => "Accept",
667 on_activate => sub { 675 on_activate => sub {
668 $conn->send ("reply n"); 676 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 677 destroy_query_dialog $conn;
671 0 678 0
672 }, 679 },
673 ); 680 );
674 681
… …
726 733
727 $vbox->add (@dialog); 734 $vbox->add (@dialog);
728 $dialog->show; 735 $dialog->show;
729} 736}
730 737
731sub start_game { 738sub dc_connect {
732 status "logging in..."; 739 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 740
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
738 742
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 743 $CONN =
744 new DC::Protocol 744 new DC::Protocol
745 host => $host, 745 host => $host,
746 port => $port || 13327, 746 port => $port,
747 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
749 mapw => $mapsize, 749 mapw => $mapsize,
750 maph => $mapsize, 750 maph => $mapsize,
751 751
… …
758 query => \&server_query, 758 query => \&server_query,
759 759
760 setup_req => { 760 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
762 }, 762 },
763 };
764 763
765 if ($CONN) { 764 on_connect => sub {
765 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 766 DC::lowdelay fileno $CONN->{fh};
767 767
768 status "login successful"; 768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
775 ;
776}
777
778sub start_game {
779 status "logging in...";
780
781 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785
786 $MAP = new DC::Map;
787
788 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl
793 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95";
795 }
796
797 dc_connect $host, $port;
798 };
769 } else { 799 } else {
770 warn $@; 800 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 801 }
774} 802}
775 803
776sub stop_game { 804sub stop_game {
777 $LOGIN_BUTTON->set_text ("Login / Register"); 805 $LOGIN_BUTTON->set_text ("Login / Register");
… …
804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
805 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
806 can_events => 1, 834 can_events => 1,
807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
808 836
837 $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,
839 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card.");
844
809 my $vidmode_tooltip = 845 my $vidmode_tooltip =
810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
811 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
812 848
813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
814 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
815 851
816 $hbox->add (my $mode_slider = new DC::UI::Slider 852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
817 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 853 force_w => $WIDTH * 0.1, expand => 1,
818 tooltip => $vidmode_tooltip); 854 tooltip => $vidmode_tooltip);
819 $hbox->add (my $mode_label = new DC::UI::Label 855 $hbox->add (my $mode_label = new DC::UI::Label
820 height => 0.8, template => "9999x9999@9+9", 856 height => 0.8, template => "9999x9999@9+9",
821 can_events => 1, tooltip => $vidmode_tooltip); 857 can_events => 1, tooltip => $vidmode_tooltip);
822 858
823 $mode_slider->connect (changed => sub { 859 $MODE_SLIDER->connect (changed => sub {
824 my ($self, $value) = @_; 860 my ($self, $value) = @_;
825 861
826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
828 }); 864 });
829 $mode_slider->emit (changed => $mode_slider->{range}[0]); 865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
830 866
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
832 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
833 state => $CFG->{fullscreen}, 869 state => $CFG->{fullscreen},
834 tooltip => "Bring the client into fullscreen mode.", 870 tooltip => "Bring the client into fullscreen mode.",
… …
840 state => $CFG->{force_opengl11}, 876 state => $CFG->{force_opengl11},
841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
842 . "higher memory usage and slower performance. It will, however, help tremendously on " 878 . "higher memory usage and slower performance. It will, however, help tremendously on "
843 . "cards that claim to support a feature but fall back to software rendering. " 879 . "cards that claim to support a feature but fall back to software rendering. "
844 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
845 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
846 . "experience extremely low framerates and your card should do better, try this option.</b>", 882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
847 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884 );
885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
899 0
900 }
848 ); 901 );
849 902
850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
851 $table->add_at (1, $row++, new DC::UI::CheckBox 904 $table->add_at (1, $row++, new DC::UI::CheckBox
852 state => $CFG->{texture_compression}, 905 state => $CFG->{texture_compression},
… …
1743 1796
1744 $r 1797 $r
1745} 1798}
1746 1799
1747my %SORT_ORDER = ( 1800my %SORT_ORDER = (
1748 type => undef, 1801 type => sub {
1802 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1803 },
1749 mtime => sub { 1804 mtime => sub {
1750 my $NOW = time; 1805 my $NOW = time;
1751 sort { 1806 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1807 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1753 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1808 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
2121 $dialog->show; 2176 $dialog->show;
2122 }; 2177 };
2123} 2178}
2124 2179
2125sub sdl_init { 2180sub sdl_init {
2126 DC::SDL_Init 2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2182 and die "SDL::Init failed!\n";
2128} 2183}
2129 2184
2130sub video_init { 2185sub video_init {
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0;
2188
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @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)";
2193
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) {
2197 $CFG->{sdl_mode} = 0;
2198 for (reverse 0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2200 }
2201 }
2132 2202
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2204
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2206 $FULLSCREEN = $CFG->{fullscreen};
… …
2242 force_h => $::HEIGHT * 0.6, 2312 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2313 has_close_button => 1,
2244 ; 2314 ;
2245 2315
2246 $METASERVER = metaserver_dialog; 2316 $METASERVER = metaserver_dialog;
2317 # the name is changed to not conflict with the older name as users could have hidden it
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2318 $MESSAGE_WINDOW = new DC::UI::Dockbar
2319 name => "message_window2",
2320 title => 'Messages',
2321 force_w => $::WIDTH * 0.6,
2322 force_h => $::HEIGHT * 0.25,
2323 ;
2324
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2326
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2327 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2328 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2329
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2330 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2331 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2332 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2295 ); 2372 );
2296 2373
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2374 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2375 tooltip => "View Documentation");
2299 2376
2300
2301 $BUTTONBAR->add (new DC::UI::Button 2377 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2378 text => "Quit",
2303 tooltip => "Terminates the program", 2379 tooltip => "Terminates the program",
2304 on_activate => sub { 2380 on_activate => sub {
2305 if ($CONN) { 2381 if ($CONN) {
… …
2314 $BUTTONBAR->show; 2390 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2391 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2392 $MESSAGE_WINDOW->show;
2317 } 2393 }
2318 2394
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397
2398 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Non-accelerated video mode")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2403}
2321 2404
2322sub video_shutdown { 2405sub video_shutdown {
2323 DC::OpenGL::shutdown; 2406 DC::OpenGL::shutdown;
2407 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2408
2325 undef $SDL_ACTIVE; 2409 undef $SDL_ACTIVE;
2326} 2410}
2327 2411
2328my %animate_object; 2412my %animate_object;
… …
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2474 },
2391 DC::SDL_KEYDOWN => sub { 2475 DC::SDL_KEYDOWN => sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2477 # alt-enter
2478 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2479 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2480 video_init;
2397 } else { 2481 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2482 &DC::UI::feed_sdl_key_down_event;
2399 } 2483 }
2400 update_modbox; 2484 update_modbox;
… …
2449 my %DEF_CFG = ( 2533 my %DEF_CFG = (
2450 sdl_mode => 0, 2534 sdl_mode => 0,
2451 fullscreen => 1, 2535 fullscreen => 1,
2452 fast => 0, 2536 fast => 0,
2453 force_opengl11 => undef, 2537 force_opengl11 => undef,
2538 disable_alpha => 0,
2454 texture_compression => 1, 2539 texture_compression => 1,
2455 map_scale => 1, 2540 map_scale => 1,
2456 fow_enable => 1, 2541 fow_enable => 1,
2457 fow_intensity => 0, 2542 fow_intensity => 0,
2458 map_smoothing => 1, 2543 map_smoothing => 1,
… …
2475 pickup => 0, 2560 pickup => 0,
2476 inv_sort => "mtime", 2561 inv_sort => "mtime",
2477 default => "profile", # default profile 2562 default => "profile", # default profile
2478 show_tips => 1, 2563 show_tips => 1,
2479 logview_max_par => 1000, 2564 logview_max_par => 1000,
2565 shift_fire_stop => 0,
2480 ); 2566 );
2481 2567
2482 while (my ($k, $v) = each %DEF_CFG) { 2568 while (my ($k, $v) = each %DEF_CFG) {
2483 $CFG->{$k} = $v unless exists $CFG->{$k}; 2569 $CFG->{$k} = $v unless exists $CFG->{$k};
2484 } 2570 }
… …
2497 } 2583 }
2498 } 2584 }
2499 } 2585 }
2500 2586
2501 sdl_init; 2587 sdl_init;
2502
2503 @SDL_MODES = DC::SDL_ListModes 8, 8;
2504 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2505 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2506
2507 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2508
2509 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2510 2588
2511 { 2589 {
2512 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2590 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2513 DejaVuSans.ttf 2591 DejaVuSans.ttf
2514 DejaVuSansMono.ttf 2592 DejaVuSansMono.ttf

Diff Legend

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