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

Diff Legend

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