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.35 by root, Sun Mar 30 06:05:53 2008 UTC vs.
Revision 1.60 by root, Tue Aug 19 21:48:28 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}
… …
97use List::Util qw(max min); 104use List::Util qw(max min);
98 105
99use Deliantra; 106use Deliantra;
100use Deliantra::Protocol::Constants; 107use Deliantra::Protocol::Constants;
101 108
109use AnyEvent::DNS;
110use AnyEvent::Socket ();
111
102use Compress::LZF; 112use Compress::LZF;
103 113
104use DC; 114use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } }
105use DC::OpenGL (); 116use DC::OpenGL ();
106use DC::Protocol; 117use DC::Protocol;
107use DC::DB; 118use DC::DB;
108use DC::UI; 119use DC::UI;
109use DC::UI::Canvas; 120use DC::UI::Canvas;
… …
137our $PROFILE; # current profile 148our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 149our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 150
140our $WANT_REFRESH; 151our $WANT_REFRESH;
141 152
153our $MODE_SLIDER;
154our $CAVEAT_LABEL;
155
142our @SDL_MODES; 156our @SDL_MODES;
157our $SDL_REINIT = 1;
143our $WIDTH; 158our $WIDTH;
144our $HEIGHT; 159our $HEIGHT;
145our $FULLSCREEN; 160our $FULLSCREEN;
146our $FONTSIZE; 161our $FONTSIZE;
147 162
… …
664 # right: accept 679 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 680 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 681 text => "Accept",
667 on_activate => sub { 682 on_activate => sub {
668 $conn->send ("reply n"); 683 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 684 destroy_query_dialog $conn;
671 0 685 0
672 }, 686 },
673 ); 687 );
674 688
… …
726 740
727 $vbox->add (@dialog); 741 $vbox->add (@dialog);
728 $dialog->show; 742 $dialog->show;
729} 743}
730 744
731sub start_game { 745sub dc_connect {
732 status "logging in..."; 746 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 747
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 748 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
738 749
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 750 $CONN =
744 new DC::Protocol 751 new DC::Protocol
745 host => $host, 752 host => $host,
746 port => $port || 13327, 753 port => $port,
747 user => $PROFILE->{user}, 754 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 755 pass => $PROFILE->{password},
749 mapw => $mapsize, 756 mapw => $mapsize,
750 maph => $mapsize, 757 maph => $mapsize,
751 758
… …
758 query => \&server_query, 765 query => \&server_query,
759 766
760 setup_req => { 767 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 768 smoothing => $CFG->{map_smoothing}*1,
762 }, 769 },
763 };
764 770
765 if ($CONN) { 771 on_connect => sub {
772 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 773 DC::lowdelay fileno $CONN->{fh};
767 774
768 status "login successful"; 775 status "login successful";
776 } else {
777 undef $CONN;
778 status "unable to connect: $!";
779 stop_game();
780 }
781 },
782 ;
783}
784
785sub start_game {
786 status "logging in...";
787
788 $LOGIN_BUTTON->set_text ("Logout");
789 $SETUP_DIALOG->hide;
790
791 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
792
793 $MAP = new DC::Map;
794
795 # hack to make SURE we find the IP address all right
796 # can be removed once AnyEvent::DNS is proven stable.
797 if ($host eq "gameserver.deliantra.net") {
798 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
799 if ($_[0] ne "80.101.114.108") { # Perl
800 status "dns failure, using hardcoded address";
801 $host = "129.13.162.95";
802 }
803
804 dc_connect $host, $port;
805 };
769 } else { 806 } else {
770 warn $@; 807 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 808 }
774} 809}
775 810
776sub stop_game { 811sub stop_game {
777 $LOGIN_BUTTON->set_text ("Login / Register"); 812 $LOGIN_BUTTON->set_text ("Login / Register");
… …
804 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 839 $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, 840 $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, 841 can_events => 1,
807 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 842 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
808 843
844 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
845 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
846 can_events => 1,
847 tooltip => "This field shows any known issues with your config or driver, such as "
848 . "a non-accelerated display format. You can try to work around these issues "
849 . "by selecting a different video mode, changing the settings below or "
850 . "by installing the right driver for your graphics card.");
851
809 my $vidmode_tooltip = 852 my $vidmode_tooltip =
810 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 853 "<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>."; 854 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
812 855
813 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 856 $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); 857 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
815 858
816 $hbox->add (my $mode_slider = new DC::UI::Slider 859 $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], 860 force_w => $WIDTH * 0.1, expand => 1,
861 range => [ ($CFG->{sdl_mode}) x 3 ],
818 tooltip => $vidmode_tooltip); 862 tooltip => $vidmode_tooltip);
819 $hbox->add (my $mode_label = new DC::UI::Label 863 $hbox->add (my $mode_label = new DC::UI::Label
820 height => 0.8, template => "9999x9999@9+9", 864 height => 0.8, template => "9999x9999@9+9",
821 can_events => 1, tooltip => $vidmode_tooltip); 865 can_events => 1, tooltip => $vidmode_tooltip);
822 866
823 $mode_slider->connect (changed => sub { 867 $MODE_SLIDER->connect (changed => sub {
824 my ($self, $value) = @_; 868 my ($self, $value) = @_;
825 869
826 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 870 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
827 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 871 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
828 }); 872 });
829 $mode_slider->emit (changed => $mode_slider->{range}[0]); 873 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
830 874
831 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 875 $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 876 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
833 state => $CFG->{fullscreen}, 877 state => $CFG->{fullscreen},
834 tooltip => "Bring the client into fullscreen mode.", 878 tooltip => "Bring the client into fullscreen mode.",
… …
840 state => $CFG->{force_opengl11}, 884 state => $CFG->{force_opengl11},
841 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 885 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 " 886 . "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. " 887 . "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, " 888 . "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 " 889 . "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>", 890 . "<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 } 891 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
892 );
893
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
895 $table->add_at (1, $row++, new DC::UI::CheckBox
896 state => $CFG->{disable_alpha},
897 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
898 . "by disabling a number of textures and transparency effects. Normally, these "
899 . "effects do not cost a lot of resources, but some graphics cards might fall "
900 . "back to etxremely slow rendering if this is enabled. If disabling this option "
901 . "noticably improves the framerate of the client please report this! "
902 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
903 on_changed => sub {
904 my ($self, $value) = @_;
905 $CFG->{disable_alpha} = $value;
906 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
907 0
908 }
848 ); 909 );
849 910
850 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
851 $table->add_at (1, $row++, new DC::UI::CheckBox 912 $table->add_at (1, $row++, new DC::UI::CheckBox
852 state => $CFG->{texture_compression}, 913 state => $CFG->{texture_compression},
… …
877 on_activate => sub { 938 on_activate => sub {
878 video_shutdown (); 939 video_shutdown ();
879 video_init (); 940 video_init ();
880 0 941 0
881 } 942 }
943 );
944
945 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
946 $table->add_at (1, $row++, new DC::UI::CheckBox
947 state => $CFG->{smooth_movement},
948 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
949 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
950 . "then disable this option. Changes take effect immdiately.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
882 ); 952 );
883 953
884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
885 $table->add_at (1, $row++, new DC::UI::Slider 955 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 956 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
… …
1621 $CFG->{show_tips} = $value; 1691 $CFG->{show_tips} = $value;
1622 0 1692 0
1623 } 1693 }
1624 ); 1694 );
1625 1695
1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1696 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1627 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1697 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1628 text => $CFG->{logview_max_par}, 1698 text => $CFG->{logview_max_par},
1629 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1699 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1630 . "sends more messages than this number, older messages get removed to save memory and " 1700 . "sends more messages than this number, older messages get removed to save memory and "
1631 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1701 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1632 on_changed => sub { 1702 on_changed => sub {
1633 my ($self, $value) = @_; 1703 my ($self, $value) = @_;
1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1704 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1686 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1756 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1687 ["Ignore cursed" => PICKUP_NOT_CURSED], 1757 ["Ignore cursed" => PICKUP_NOT_CURSED],
1688 ["Jewelery" => PICKUP_JEWELS], 1758 ["Jewelery" => PICKUP_JEWELS],
1689 ["Flesh" => PICKUP_FLESH], 1759 ["Flesh" => PICKUP_FLESH],
1690 ], 1760 ],
1691 ["Weight/Value ratio", 2, 17] 1761 ["Value/Weight ratio", 2, 17]
1692 ) 1762 )
1693 { 1763 {
1694 my ($title, $x, $y, @bits) = @$_; 1764 my ($title, $x, $y, @bits) = @$_;
1695 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1765 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1696 1766
… …
1721 } 1791 }
1722 1792
1723 $table->add_at (2, 18, new DC::UI::ValSlider 1793 $table->add_at (2, 18, new DC::UI::ValSlider
1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1794 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1725 template => ">= 99", 1795 template => ">= 99",
1796 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1726 to_value => sub { ">= " . 5 * $_[0] }, 1797 to_value => sub { ">= " . 5 * $_[0] },
1727 on_changed => sub { 1798 on_changed => sub {
1728 my ($slider, $value) = @_; 1799 my ($slider, $value) = @_;
1729 1800
1730 $::CFG->{pickup} &= ~0xF; 1801 $::CFG->{pickup} &= ~0xF;
… …
1743 1814
1744 $r 1815 $r
1745} 1816}
1746 1817
1747my %SORT_ORDER = ( 1818my %SORT_ORDER = (
1748 type => undef, 1819 type => sub {
1820 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1821 },
1749 mtime => sub { 1822 mtime => sub {
1750 my $NOW = time; 1823 my $NOW = time;
1751 sort { 1824 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1825 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; 1826 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1784 $::CFG->{inv_sort} = $_[1]; 1857 $::CFG->{inv_sort} = $_[1];
1785 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1858 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1786 }, 1859 },
1787 ); 1860 );
1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1861 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1789 #TODO# update to weigh/maxweight 1862 #TODO# update to weight/maxweight
1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1863 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1791 1864
1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1865 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1793 $sw1->add ($INV = new DC::UI::Inventory); 1866 $sw1->add ($INV = new DC::UI::Inventory);
1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1867 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2121 $dialog->show; 2194 $dialog->show;
2122 }; 2195 };
2123} 2196}
2124 2197
2125sub sdl_init { 2198sub sdl_init {
2126 DC::SDL_Init 2199 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2200 and die "SDL::Init failed!\n";
2128} 2201}
2129 2202
2130sub video_init { 2203sub video_init {
2204 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2205 $SDL_REINIT = 0;
2206
2207 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2208 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2209 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2210 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2211
2212 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2213
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2214 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2215 $CFG->{sdl_mode} = 0;
2216 for (reverse 0 .. $#SDL_MODES) {
2217 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600;
2218 }
2219 }
2132 2220
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2221 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2222
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2223 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2224 $FULLSCREEN = $CFG->{fullscreen};
2137 $FAST = $CFG->{fast}; 2225 $FAST = $CFG->{fast};
2138 2226
2227 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2139 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2228 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2229 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2140 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2230 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2141 2231
2142 $SDL_ACTIVE = 1; 2232 $SDL_ACTIVE = 1;
2143 $LAST_REFRESH = time - 0.01; 2233 $LAST_REFRESH = time - 0.01;
2144 2234
… …
2242 force_h => $::HEIGHT * 0.6, 2332 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2333 has_close_button => 1,
2244 ; 2334 ;
2245 2335
2246 $METASERVER = metaserver_dialog; 2336 $METASERVER = metaserver_dialog;
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2337 # the name is changed to not conflict with the older name as users could have hidden it
2338 $MESSAGE_WINDOW = new DC::UI::Dockbar
2339 name => "message_window2",
2340 title => 'Messages',
2341 force_w => $::WIDTH * 0.6,
2342 force_h => $::HEIGHT * 0.25,
2343 ;
2344
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2345 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2346
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2347 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2348 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2349
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2350 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2351 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2352 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2370 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2274 2371
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2372 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2276 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2373 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277 2374
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2375# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2279 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2376# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280 2377
2281 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2378 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2282 2379
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2380 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2381 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2294 }, 2391 },
2295 ); 2392 );
2296 2393
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2394 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2395 tooltip => "View Documentation");
2299
2300 2396
2301 $BUTTONBAR->add (new DC::UI::Button 2397 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2398 text => "Quit",
2303 tooltip => "Terminates the program", 2399 tooltip => "Terminates the program",
2304 on_activate => sub { 2400 on_activate => sub {
… …
2314 $BUTTONBAR->show; 2410 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2411 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2412 $MESSAGE_WINDOW->show;
2317 } 2413 }
2318 2414
2415 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2416 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2417
2418 $CAVEAT_LABEL->set_text ("None :)");
2419 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2420 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2421
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2422 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2423}
2321 2424
2322sub video_shutdown { 2425sub video_shutdown {
2323 DC::OpenGL::shutdown; 2426 DC::OpenGL::shutdown;
2427 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2428
2325 undef $SDL_ACTIVE; 2429 undef $SDL_ACTIVE;
2326} 2430}
2327 2431
2328my %animate_object; 2432my %animate_object;
… …
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2493# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2494 },
2391 DC::SDL_KEYDOWN => sub { 2495 DC::SDL_KEYDOWN => sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2496 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2497 # alt-enter
2498 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2499 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2500 video_init;
2397 } else { 2501 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2502 &DC::UI::feed_sdl_key_down_event;
2399 } 2503 }
2400 update_modbox; 2504 update_modbox;
… …
2420$SIG{INT} = $SIG{TERM} = sub { 2524$SIG{INT} = $SIG{TERM} = sub {
2421 EV::unloop; 2525 EV::unloop;
2422 #d# TODO calling exit here hangs the process in some futex 2526 #d# TODO calling exit here hangs the process in some futex
2423}; 2527};
2424 2528
2425{ 2529# due to mac os x + sdl combined briandamage, we need this contortion
2530sub main {
2531 {
2426 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2532 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2427 2533
2428 if (-e "$Deliantra::VARDIR/client.cf") { 2534 if (-e "$Deliantra::VARDIR/client.cf") {
2429 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2535 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2430 } else { 2536 } else {
2431 #TODO: compatibility cruft 2537 #TODO: compatibility cruft
2432 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2538 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2433 print STDERR "INFO: used old configuration file\n"; 2539 print STDERR "INFO: used old configuration file\n";
2434 } 2540 }
2435 2541
2436 DC::DB::Server::run; 2542 DC::DB::Server::run;
2437 2543
2438 if ($CFG->{db_schema} < 1) { 2544 if ($CFG->{db_schema} < 1) {
2439 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2545 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2440 DC::DB::nuke_db; 2546 DC::DB::nuke_db;
2441 $CFG->{db_schema} = 1; 2547 $CFG->{db_schema} = 1;
2442 DC::write_cfg; 2548 DC::write_cfg;
2443 } 2549 }
2444 2550
2445 DC::DB::open_db; 2551 DC::DB::open_db;
2446 2552
2447 DC::UI::set_layout ($::CFG->{layout}); 2553 DC::UI::set_layout ($::CFG->{layout});
2448 2554
2449 my %DEF_CFG = ( 2555 my %DEF_CFG = (
2450 sdl_mode => 0, 2556 sdl_mode => 0,
2451 fullscreen => 1, 2557 fullscreen => 1,
2452 fast => 0, 2558 fast => 0,
2453 force_opengl11 => undef, 2559 force_opengl11 => undef,
2560 disable_alpha => 0,
2561 smooth_movement => 1,
2454 texture_compression => 1, 2562 texture_compression => 1,
2455 map_scale => 1, 2563 map_scale => 1,
2456 fow_enable => 1, 2564 fow_enable => 1,
2457 fow_intensity => 0, 2565 fow_intensity => 0,
2458 map_smoothing => 1, 2566 map_smoothing => 1,
2459 gui_fontsize => 1, 2567 gui_fontsize => 1,
2460 log_fontsize => 0.7, 2568 log_fontsize => 0.7,
2461 gauge_fontsize => 1, 2569 gauge_fontsize => 1,
2462 gauge_size => 0.35, 2570 gauge_size => 0.35,
2463 stat_fontsize => 0.7, 2571 stat_fontsize => 0.7,
2464 mapsize => 100, 2572 mapsize => 100,
2465 audio_enable => 1, 2573 audio_enable => 1,
2466 audio_hw_channels => 0, 2574 audio_hw_channels => 0,
2467 audio_hw_frequency => 0, 2575 audio_hw_frequency => 0,
2468 audio_hw_chunksize => 0, 2576 audio_hw_chunksize => 0,
2469 audio_mix_channels => 8, 2577 audio_mix_channels => 8,
2470 effects_enable => 1, 2578 effects_enable => 1,
2471 effects_volume => 1, 2579 effects_volume => 1,
2472 bgm_enable => 1, 2580 bgm_enable => 1,
2473 bgm_volume => 0.5, 2581 bgm_volume => 0.5,
2474 output_rate => "", 2582 output_rate => "",
2475 pickup => 0, 2583 pickup => 0,
2476 inv_sort => "mtime", 2584 inv_sort => "mtime",
2477 default => "profile", # default profile 2585 default => "profile", # default profile
2478 show_tips => 1, 2586 show_tips => 1,
2479 logview_max_par => 1000, 2587 logview_max_par => 1000,
2588 shift_fire_stop => 0,
2480 ); 2589 );
2481 2590
2482 while (my ($k, $v) = each %DEF_CFG) { 2591 while (my ($k, $v) = each %DEF_CFG) {
2483 $CFG->{$k} = $v unless exists $CFG->{$k}; 2592 $CFG->{$k} = $v unless exists $CFG->{$k};
2484 } 2593 }
2485 2594
2486 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2595 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2487 $PROFILE = $CFG->{profile}{default}; 2596 $PROFILE = $CFG->{profile}{default};
2488 2597
2489 # convert old bindings (only default profile matters) 2598 # convert old bindings (only default profile matters)
2490 if (my $bindings = delete $PROFILE->{bindings}) { 2599 if (my $bindings = delete $PROFILE->{bindings}) {
2491 while (my ($mod, $syms) = each %$bindings) { 2600 while (my ($mod, $syms) = each %$bindings) {
2492 while (my ($sym, $cmds) = each %$syms) { 2601 while (my ($sym, $cmds) = each %$syms) {
2493 push @{ $PROFILE->{macro} }, { 2602 push @{ $PROFILE->{macro} }, {
2494 accelkey => [$mod*1, $sym*1], 2603 accelkey => [$mod*1, $sym*1],
2495 action => $cmds, 2604 action => $cmds,
2605 };
2496 }; 2606 }
2497 } 2607 }
2498 } 2608 }
2499 }
2500 2609
2501 sdl_init; 2610 sdl_init;
2502 2611
2503 @SDL_MODES = DC::SDL_ListModes 8, 8; 2612 {
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
2511 {
2512 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2613 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2513 DejaVuSans.ttf 2614 DejaVuSans.ttf
2514 DejaVuSansMono.ttf 2615 DejaVuSansMono.ttf
2515 DejaVuSans-Bold.ttf 2616 DejaVuSans-Bold.ttf
2516 DejaVuSansMono-Bold.ttf 2617 DejaVuSansMono-Bold.ttf
2517 DejaVuSans-Oblique.ttf 2618 DejaVuSans-Oblique.ttf
2518 DejaVuSansMono-Oblique.ttf 2619 DejaVuSansMono-Oblique.ttf
2519 DejaVuSans-BoldOblique.ttf 2620 DejaVuSans-BoldOblique.ttf
2520 DejaVuSansMono-BoldOblique.ttf 2621 DejaVuSansMono-BoldOblique.ttf
2521 ); 2622 );
2522 2623
2523 DC::add_font $_ for @fonts; 2624 DC::add_font $_ for @fonts;
2524 2625
2525 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2626 $FONT_PROP = new_from_file DC::Font $fonts[0];
2526 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2627 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2527 2628
2528 $FONT_PROP->make_default; 2629 $FONT_PROP->make_default;
2529 2630
2530 DC::pango_init; 2631 DC::pango_init;
2531 } 2632 }
2532 2633
2533# compare mono (ft) vs. rgba (cairo) 2634# compare mono (ft) vs. rgba (cairo)
2534# ft - 1.8s, cairo 3s, even in alpha-only mode 2635# ft - 1.8s, cairo 3s, even in alpha-only mode
2535# for my $rgba (0..1) { 2636# for my $rgba (0..1) {
2536# my $t1 = Time::HiRes::time; 2637# my $t1 = Time::HiRes::time;
… …
2541# } 2642# }
2542# my $t2 = Time::HiRes::time; 2643# my $t2 = Time::HiRes::time;
2543# warn $t2-$t1; 2644# warn $t2-$t1;
2544# } 2645# }
2545 2646
2546 video_init; 2647 video_init;
2547 audio_init; 2648 audio_init;
2548} 2649 }
2549 2650
2550show_tip_of_the_day if $CFG->{show_tips}; 2651 show_tip_of_the_day if $CFG->{show_tips};
2551 2652
2552our $STARTUP_CANCEL = EV::idle sub { 2653 our $STARTUP_CANCEL = EV::idle sub {
2553 undef $::STARTUP_CANCEL; 2654 undef $::STARTUP_CANCEL;
2554 $startup_done->(); 2655 $startup_done->();
2555}; 2656 };
2556 2657
2658 delete $SIG{__DIE__};
2557EV::loop; 2659 EV::loop;
2558 2660
2559#video_shutdown; 2661#video_shutdown;
2560#audio_shutdown; 2662#audio_shutdown;
2561DC::OpenGL::quit; 2663 DC::OpenGL::quit;
2562DC::SDL_Quit; 2664 DC::SDL_Quit;
2563DC::DB::Server::stop; 2665 DC::DB::Server::stop;
2666}
2667
2668DC::SDL_braino; # see sub above
2564 2669
2565=head1 NAME 2670=head1 NAME
2566 2671
2567deliantra - A Deliantra MORPG game client 2672deliantra - A Deliantra MORPG game client
2568 2673
… …
2585 4 show fps 2690 4 show fps
2586 8 suppress tooltips 2691 8 suppress tooltips
2587 2692
2588=head1 AUTHOR 2693=head1 AUTHOR
2589 2694
2590Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2695Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2591 2696
2592 2697
2593 2698

Diff Legend

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