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.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.61 by root, Fri Aug 22 18:20:17 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],
… …
1526 1 1596 1
1527 }, 1597 },
1528 ); 1598 );
1529 1599
1530 $vbox->add (new DC::UI::FancyFrame 1600 $vbox->add (new DC::UI::FancyFrame
1531 label => "Registering", 1601 label => "How to Play",
1532 min_h => 200, 1602 min_h => 200,
1533 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1603 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1534 markup => 1604 markup =>
1605 "First select a suitable video resolution in the Graphics tab, above.\n\n"
1606 . "Then register a new account (or use an existibg one if you have one). "
1535 "To register a new account, choose a username that hasn't been taken yet and " 1607 . "To register an account, choose a username that hasn't been taken yet and "
1536 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1608 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1537 ), 1609 ),
1538 ); 1610 );
1539 1611
1540 $vbox 1612 $vbox
… …
1621 $CFG->{show_tips} = $value; 1693 $CFG->{show_tips} = $value;
1622 0 1694 0
1623 } 1695 }
1624 ); 1696 );
1625 1697
1626 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1698 $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 1699 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1628 text => $CFG->{logview_max_par}, 1700 text => $CFG->{logview_max_par},
1629 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1701 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 " 1702 . "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.", 1703 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1632 on_changed => sub { 1704 on_changed => sub {
1633 my ($self, $value) = @_; 1705 my ($self, $value) = @_;
1634 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1706 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1686 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1758 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1687 ["Ignore cursed" => PICKUP_NOT_CURSED], 1759 ["Ignore cursed" => PICKUP_NOT_CURSED],
1688 ["Jewelery" => PICKUP_JEWELS], 1760 ["Jewelery" => PICKUP_JEWELS],
1689 ["Flesh" => PICKUP_FLESH], 1761 ["Flesh" => PICKUP_FLESH],
1690 ], 1762 ],
1691 ["Weight/Value ratio", 2, 17] 1763 ["Value/Weight ratio", 2, 17]
1692 ) 1764 )
1693 { 1765 {
1694 my ($title, $x, $y, @bits) = @$_; 1766 my ($title, $x, $y, @bits) = @$_;
1695 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1767 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1696 1768
… …
1721 } 1793 }
1722 1794
1723 $table->add_at (2, 18, new DC::UI::ValSlider 1795 $table->add_at (2, 18, new DC::UI::ValSlider
1724 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1796 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1725 template => ">= 99", 1797 template => ">= 99",
1798 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] }, 1799 to_value => sub { ">= " . 5 * $_[0] },
1727 on_changed => sub { 1800 on_changed => sub {
1728 my ($slider, $value) = @_; 1801 my ($slider, $value) = @_;
1729 1802
1730 $::CFG->{pickup} &= ~0xF; 1803 $::CFG->{pickup} &= ~0xF;
… …
1743 1816
1744 $r 1817 $r
1745} 1818}
1746 1819
1747my %SORT_ORDER = ( 1820my %SORT_ORDER = (
1748 type => undef, 1821 type => sub {
1822 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1823 },
1749 mtime => sub { 1824 mtime => sub {
1750 my $NOW = time; 1825 my $NOW = time;
1751 sort { 1826 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1827 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; 1828 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1784 $::CFG->{inv_sort} = $_[1]; 1859 $::CFG->{inv_sort} = $_[1];
1785 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1860 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1786 }, 1861 },
1787 ); 1862 );
1788 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1863 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1789 #TODO# update to weigh/maxweight 1864 #TODO# update to weight/maxweight
1790 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1865 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1791 1866
1792 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1867 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1793 $sw1->add ($INV = new DC::UI::Inventory); 1868 $sw1->add ($INV = new DC::UI::Inventory);
1794 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1869 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
2121 $dialog->show; 2196 $dialog->show;
2122 }; 2197 };
2123} 2198}
2124 2199
2125sub sdl_init { 2200sub sdl_init {
2126 DC::SDL_Init 2201 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2127 and die "SDL::Init failed!\n"; 2202 and die "SDL::Init failed!\n";
2128} 2203}
2129 2204
2130sub video_init { 2205sub video_init {
2206 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2207 $SDL_REINIT = 0;
2208
2209 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2210 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2211 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2212 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2213
2214 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2215
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2216 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2217 $CFG->{sdl_mode} = 0; # lowest resolution by default
2218
2219 # now choose biggets mode <= 1024x768
2220 for (0 .. $#SDL_MODES) {
2221 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2222 $CFG->{sdl_mode} = $_;
2223 }
2224 }
2225 }
2132 2226
2133 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2227 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2134 2228
2135 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2229 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2136 $FULLSCREEN = $CFG->{fullscreen}; 2230 $FULLSCREEN = $CFG->{fullscreen};
2137 $FAST = $CFG->{fast}; 2231 $FAST = $CFG->{fast};
2138 2232
2233 # 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 2234 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2235 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2140 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2236 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2141 2237
2142 $SDL_ACTIVE = 1; 2238 $SDL_ACTIVE = 1;
2143 $LAST_REFRESH = time - 0.01; 2239 $LAST_REFRESH = time - 0.01;
2144 2240
… …
2242 force_h => $::HEIGHT * 0.6, 2338 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2339 has_close_button => 1,
2244 ; 2340 ;
2245 2341
2246 $METASERVER = metaserver_dialog; 2342 $METASERVER = metaserver_dialog;
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2343 # the name is changed to not conflict with the older name as users could have hidden it
2344 $MESSAGE_WINDOW = new DC::UI::Dockbar
2345 name => "message_window2",
2346 title => 'Messages',
2347 force_w => $::WIDTH * 0.6,
2348 force_h => $::HEIGHT * 0.25,
2349 ;
2350
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2351 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2352
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2353 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2354 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2355
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2356 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2357 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2358 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2376 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2274 2377
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2378 $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."); 2379 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277 2380
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2381# $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."); 2382# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280 2383
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 2384 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 2385
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2386 $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."); 2387 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2286 $BUTTONBAR->add (new DC::UI::Button 2389 $BUTTONBAR->add (new DC::UI::Button
2287 text => "Save Config", 2390 text => "Save Config",
2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2391 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2289 on_activate => sub { 2392 on_activate => sub {
2290 $::CFG->{layout} = DC::UI::get_layout; 2393 $::CFG->{layout} = DC::UI::get_layout;
2291 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2394 DC::write_cfg;
2292 status "Configuration Saved"; 2395 status "Configuration Saved";
2293 0 2396 0
2294 }, 2397 },
2295 ); 2398 );
2296 2399
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2400 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2401 tooltip => "View Documentation");
2299
2300 2402
2301 $BUTTONBAR->add (new DC::UI::Button 2403 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2404 text => "Quit",
2303 tooltip => "Terminates the program", 2405 tooltip => "Terminates the program",
2304 on_activate => sub { 2406 on_activate => sub {
… …
2314 $BUTTONBAR->show; 2416 $BUTTONBAR->show;
2315 $SETUP_DIALOG->show; 2417 $SETUP_DIALOG->show;
2316 $MESSAGE_WINDOW->show; 2418 $MESSAGE_WINDOW->show;
2317 } 2419 }
2318 2420
2421 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2422 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2423
2424 $CAVEAT_LABEL->set_text ("None :)");
2425 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2426 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2427
2319 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2428 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2320} 2429}
2321 2430
2322sub video_shutdown { 2431sub video_shutdown {
2323 DC::OpenGL::shutdown; 2432 DC::OpenGL::shutdown;
2433 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2324 2434
2325 undef $SDL_ACTIVE; 2435 undef $SDL_ACTIVE;
2326} 2436}
2327 2437
2328my %animate_object; 2438my %animate_object;
… …
2389# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2499# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2390 }, 2500 },
2391 DC::SDL_KEYDOWN => sub { 2501 DC::SDL_KEYDOWN => sub {
2392 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2502 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2393 # alt-enter 2503 # alt-enter
2504 video_shutdown;
2394 $FULLSCREEN_ENABLE->toggle; 2505 $FULLSCREEN_ENABLE->toggle;
2395 video_shutdown;
2396 video_init; 2506 video_init;
2397 } else { 2507 } else {
2398 &DC::UI::feed_sdl_key_down_event; 2508 &DC::UI::feed_sdl_key_down_event;
2399 } 2509 }
2400 update_modbox; 2510 update_modbox;
… …
2420$SIG{INT} = $SIG{TERM} = sub { 2530$SIG{INT} = $SIG{TERM} = sub {
2421 EV::unloop; 2531 EV::unloop;
2422 #d# TODO calling exit here hangs the process in some futex 2532 #d# TODO calling exit here hangs the process in some futex
2423}; 2533};
2424 2534
2425{ 2535# due to mac os x + sdl combined briandamage, we need this contortion
2536sub main {
2537 {
2538 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2539
2426 if (-e "$Deliantra::VARDIR/client.cf") { 2540 if (-e "$Deliantra::VARDIR/client.cf") {
2427 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2541 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2428 } else { 2542 } else {
2429 #TODO: compatibility cruft 2543 #TODO: compatibility cruft
2430 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2544 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2431 print STDERR "INFO: used old configuration file\n"; 2545 print STDERR "INFO: used old configuration file\n";
2432 } 2546 }
2433 2547
2434 DC::DB::Server::run; 2548 DC::DB::Server::run;
2435 2549
2550 if ($CFG->{db_schema} < 1) {
2551 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2552 DC::DB::nuke_db;
2553 $CFG->{db_schema} = 1;
2554 DC::write_cfg;
2555 }
2556
2557 DC::DB::open_db;
2558
2436 DC::UI::set_layout ($::CFG->{layout}); 2559 DC::UI::set_layout ($::CFG->{layout});
2437 2560
2438 my %DEF_CFG = ( 2561 my %DEF_CFG = (
2439 sdl_mode => 0, 2562 sdl_mode => undef,
2440 fullscreen => 1, 2563 fullscreen => 1,
2441 fast => 0, 2564 fast => 0,
2442 force_opengl11 => undef, 2565 force_opengl11 => undef,
2566 disable_alpha => 0,
2567 smooth_movement => 1,
2443 texture_compression => 1, 2568 texture_compression => 1,
2444 map_scale => 1, 2569 map_scale => 1,
2445 fow_enable => 1, 2570 fow_enable => 1,
2446 fow_intensity => 0, 2571 fow_intensity => 0,
2447 map_smoothing => 1, 2572 map_smoothing => 1,
2448 gui_fontsize => 1, 2573 gui_fontsize => 1,
2449 log_fontsize => 0.7, 2574 log_fontsize => 0.7,
2450 gauge_fontsize => 1, 2575 gauge_fontsize => 1,
2451 gauge_size => 0.35, 2576 gauge_size => 0.35,
2452 stat_fontsize => 0.7, 2577 stat_fontsize => 0.7,
2453 mapsize => 100, 2578 mapsize => 100,
2454 audio_enable => 1, 2579 audio_enable => 1,
2455 audio_hw_channels => 0, 2580 audio_hw_channels => 0,
2456 audio_hw_frequency => 0, 2581 audio_hw_frequency => 0,
2457 audio_hw_chunksize => 0, 2582 audio_hw_chunksize => 0,
2458 audio_mix_channels => 8, 2583 audio_mix_channels => 8,
2459 effects_enable => 1, 2584 effects_enable => 1,
2460 effects_volume => 1, 2585 effects_volume => 1,
2461 bgm_enable => 1, 2586 bgm_enable => 1,
2462 bgm_volume => 0.5, 2587 bgm_volume => 0.5,
2463 output_rate => "", 2588 output_rate => "",
2464 pickup => 0, 2589 pickup => 0,
2465 inv_sort => "mtime", 2590 inv_sort => "mtime",
2466 default => "profile", # default profile 2591 default => "profile", # default profile
2467 show_tips => 1, 2592 show_tips => 1,
2468 logview_max_par => 1000, 2593 logview_max_par => 1000,
2594 shift_fire_stop => 0,
2469 ); 2595 );
2470 2596
2471 while (my ($k, $v) = each %DEF_CFG) { 2597 while (my ($k, $v) = each %DEF_CFG) {
2472 $CFG->{$k} = $v unless exists $CFG->{$k}; 2598 $CFG->{$k} = $v unless exists $CFG->{$k};
2473 } 2599 }
2474 2600
2475 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2601 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2476 $PROFILE = $CFG->{profile}{default}; 2602 $PROFILE = $CFG->{profile}{default};
2477 2603
2478 # convert old bindings (only default profile matters) 2604 # convert old bindings (only default profile matters)
2479 if (my $bindings = delete $PROFILE->{bindings}) { 2605 if (my $bindings = delete $PROFILE->{bindings}) {
2480 while (my ($mod, $syms) = each %$bindings) { 2606 while (my ($mod, $syms) = each %$bindings) {
2481 while (my ($sym, $cmds) = each %$syms) { 2607 while (my ($sym, $cmds) = each %$syms) {
2482 push @{ $PROFILE->{macro} }, { 2608 push @{ $PROFILE->{macro} }, {
2483 accelkey => [$mod*1, $sym*1], 2609 accelkey => [$mod*1, $sym*1],
2484 action => $cmds, 2610 action => $cmds,
2611 };
2485 }; 2612 }
2486 } 2613 }
2487 } 2614 }
2488 }
2489 2615
2490 sdl_init; 2616 sdl_init;
2491 2617
2492 @SDL_MODES = DC::SDL_ListModes 8, 8; 2618 {
2493 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2494 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2495
2496 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2497
2498 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2499
2500 {
2501 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2619 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2502 DejaVuSans.ttf 2620 DejaVuSans.ttf
2503 DejaVuSansMono.ttf 2621 DejaVuSansMono.ttf
2504 DejaVuSans-Bold.ttf 2622 DejaVuSans-Bold.ttf
2505 DejaVuSansMono-Bold.ttf 2623 DejaVuSansMono-Bold.ttf
2506 DejaVuSans-Oblique.ttf 2624 DejaVuSans-Oblique.ttf
2507 DejaVuSansMono-Oblique.ttf 2625 DejaVuSansMono-Oblique.ttf
2508 DejaVuSans-BoldOblique.ttf 2626 DejaVuSans-BoldOblique.ttf
2509 DejaVuSansMono-BoldOblique.ttf 2627 DejaVuSansMono-BoldOblique.ttf
2510 ); 2628 );
2511 2629
2512 DC::add_font $_ for @fonts; 2630 DC::add_font $_ for @fonts;
2513 2631
2514 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2632 $FONT_PROP = new_from_file DC::Font $fonts[0];
2515 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2633 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2516 2634
2517 $FONT_PROP->make_default; 2635 $FONT_PROP->make_default;
2518 2636
2519 DC::pango_init; 2637 DC::pango_init;
2520 } 2638 }
2521 2639
2522# compare mono (ft) vs. rgba (cairo) 2640# compare mono (ft) vs. rgba (cairo)
2523# ft - 1.8s, cairo 3s, even in alpha-only mode 2641# ft - 1.8s, cairo 3s, even in alpha-only mode
2524# for my $rgba (0..1) { 2642# for my $rgba (0..1) {
2525# my $t1 = Time::HiRes::time; 2643# my $t1 = Time::HiRes::time;
… …
2530# } 2648# }
2531# my $t2 = Time::HiRes::time; 2649# my $t2 = Time::HiRes::time;
2532# warn $t2-$t1; 2650# warn $t2-$t1;
2533# } 2651# }
2534 2652
2535 video_init; 2653 video_init;
2536 audio_init; 2654 audio_init;
2537} 2655 }
2538 2656
2539show_tip_of_the_day if $CFG->{show_tips}; 2657 show_tip_of_the_day if $CFG->{show_tips};
2540 2658
2541our $STARTUP_CANCEL = EV::idle sub { 2659 our $STARTUP_CANCEL = EV::idle sub {
2542 undef $::STARTUP_CANCEL; 2660 undef $::STARTUP_CANCEL;
2543 $startup_done->(); 2661 $startup_done->();
2544}; 2662 };
2545 2663
2664 delete $SIG{__DIE__};
2546EV::loop; 2665 EV::loop;
2547 2666
2548#video_shutdown; 2667#video_shutdown;
2549#audio_shutdown; 2668#audio_shutdown;
2550DC::OpenGL::quit; 2669 DC::OpenGL::quit;
2551DC::SDL_Quit; 2670 DC::SDL_Quit;
2552DC::DB::Server::stop; 2671 DC::DB::Server::stop;
2672}
2673
2674DC::SDL_braino; # see sub above
2553 2675
2554=head1 NAME 2676=head1 NAME
2555 2677
2556deliantra - A Deliantra MORPG game client 2678deliantra - A Deliantra MORPG game client
2557 2679
… …
2574 4 show fps 2696 4 show fps
2575 8 suppress tooltips 2697 8 suppress tooltips
2576 2698
2577=head1 AUTHOR 2699=head1 AUTHOR
2578 2700
2579Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2701Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2580 2702
2581 2703
2582 2704

Diff Legend

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