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.29 by root, Mon Mar 24 00:24:47 2008 UTC vs.
Revision 1.79 by root, Fri Dec 19 22:06:53 2008 UTC

… …
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 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 # OS X
56 or die "pangoversion: $!"; 56 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
57 my $PANGO = <$fh>; 57 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
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"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 58 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 59 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 60 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 61 }
75 62
76 unshift @INC, $root; 63 unshift @INC, $root;
77 } 64 }
78} 65}
… …
90 77
91# need to do it again because that pile of garbage called PAR nukes it before main 78# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 79unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 80 if %PAR::LibCache;
94 81
95use Time::HiRes 'time';
96use EV; 82use EV;
83BEGIN { *time = \&EV::time }
84
97use List::Util qw(max min); 85use List::Util qw(max min);
98 86
99use Deliantra; 87use Deliantra;
100use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
101 89
90use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket ();
93
102use Compress::LZF; 94use Compress::LZF;
95use JSON::XS;
103 96
104use DC; 97use DC;
98
99sub crash($;$) {
100 # nop during compiletime
101}
102
103BEGIN {
104 $SIG{__DIE__} = sub {
105 return if $^S;
106 crash "CRASH/DIE: $_[0]" => 1;
107 DC::fatal Carp::longmess "$_[0]";
108 }
109}
110
105use DC::OpenGL (); 111use DC::OpenGL ();
106use DC::Protocol; 112use DC::Protocol;
107use DC::DB; 113use DC::DB;
108use DC::UI; 114use DC::UI;
109use DC::UI::Canvas; 115use DC::UI::Canvas;
110use DC::UI::Inventory; 116use DC::UI::Inventory;
111use DC::UI::SpellList; 117use DC::UI::SpellList;
112use DC::UI::Dockable; 118use DC::UI::Dockable;
113use DC::UI::Dockbar; 119use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 120use DC::UI::ChatView;
116use DC::MessageDistributor; 121use DC::MessageDistributor;
117use DC::Pod; 122use DC::Pod;
118use DC::MapWidget; 123use DC::MapWidget;
119use DC::Macro; 124use DC::Macro;
120 125
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 126$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 127$SIG{PIPE} = 'IGNORE';
123 128
124$EV::DIED = sub { 129$EV::DIED = sub {
130 crash "CRASH/EV::DIED: $@" => 1;
125 DC::fatal Carp::longmess $@; 131 DC::fatal Carp::longmess $@;
126}; 132};
127 133
128my $MAX_FPS = 60; 134my $MAX_FPS = 60;
129 135
… …
131 137
132our $LAST_REFRESH; 138our $LAST_REFRESH;
133our $NOW; 139our $NOW;
134 140
135our $CFG; 141our $CFG;
136our $CONN;
137our $PROFILE; # current profile 142our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 143our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 144
140our $WANT_REFRESH; 145our $WANT_REFRESH;
141 146
147our $MODE_SLIDER;
148our $CAVEAT_LABEL;
149
142our @SDL_MODES; 150our @SDL_MODES;
151our $SDL_REINIT = 1;
143our $WIDTH; 152our $WIDTH;
144our $HEIGHT; 153our $HEIGHT;
145our $FULLSCREEN; 154our $FULLSCREEN;
146our $FONTSIZE; 155our $FONTSIZE;
147 156
148our $FONT_PROP; 157our $FONT_PROP;
149our $FONT_FIXED; 158our $FONT_FIXED;
159
160our $CONN;
150 161
151our $MAP; 162our $MAP;
152our $MAPMAP; 163our $MAPMAP;
153our $MAPWIDGET; 164our $MAPWIDGET;
154our $COMPLETER; 165our $COMPLETER;
… …
199our $INVR; 210our $INVR;
200our $INVR_HB; 211our $INVR_HB;
201 212
202############################################################################# 213#############################################################################
203 214
215# write a crash message blockingly to the socket, if possible
216# this is a bit too complicated for my tastes, but it was easy.
217*crash = sub($;$) {
218 my ($msg, $backtrace) = @_;
219
220 return unless $CONN;
221
222 my $fh = $CONN->{fh}
223 or return;
224
225 my $buf = delete $CONN->{wbuf};
226
227 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
228
229 AnyEvent::Util::fh_nonblocking $fh, 0;
230 syswrite $fh, $buf;
231 AnyEvent::Util::fh_nonblocking $fh, 1;
232
233 $msg =~ s/\s+$//;
234
235 # backtrace as second step, in case it crashes, too
236 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
237 if $backtrace;
238};
239
240#############################################################################
241
204sub status { 242sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 243 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
206} 244}
207 245
208sub debug { 246sub debug {
… …
232 270
233 $markup .= $mod & DC::KMOD_NUM 271 $markup .= $mod & DC::KMOD_NUM
234 ? "[NUM]" 272 ? "[NUM]"
235 : "[<span foreground='#888'>num</span>]"; 273 : "[<span foreground='#888'>num</span>]";
236 274
275 # <tt> around next statement works around some bug that keeps the
276 # "font =>" from being used on windows
237 $MODBOX->set_markup ($markup); 277 $MODBOX->set_markup ("<tt>$markup</tt>");
238} 278}
239 279
240############################################################################# 280#############################################################################
241#TODO: maybe move into own audio module... 281#TODO: maybe move into own audio module...
242 282
… …
662 # right: accept 702 # right: accept
663 $table->add_at (4, 0, new DC::UI::Button 703 $table->add_at (4, 0, new DC::UI::Button
664 text => "Accept", 704 text => "Accept",
665 on_activate => sub { 705 on_activate => sub {
666 $conn->send ("reply n"); 706 $conn->send ("reply n");
667 $STATS_PAGE->hide;
668 destroy_query_dialog $conn; 707 destroy_query_dialog $conn;
669 0 708 0
670 }, 709 },
671 ); 710 );
672 711
… …
724 763
725 $vbox->add (@dialog); 764 $vbox->add (@dialog);
726 $dialog->show; 765 $dialog->show;
727} 766}
728 767
729sub start_game { 768sub dc_connect {
730 status "logging in..."; 769 my ($host, $port) = @_;
731 770
732 $LOGIN_BUTTON->set_text ("Logout");
733 $SETUP_DIALOG->hide;
734
735 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapw = List::Util::min 48, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
772 my $maph = List::Util::min 48, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
736 773
737 my ($host, $port) = split /:/, $PROFILE->{host};
738
739 $MAP = new DC::Map;
740
741 $CONN = eval { 774 $CONN =
742 new DC::Protocol 775 new DC::Protocol
743 host => $host, 776 host => $host,
744 port => $port || 13327, 777 port => $port,
745 user => $PROFILE->{user}, 778 user => $PROFILE->{user},
746 pass => $PROFILE->{password}, 779 pass => $PROFILE->{password},
747 mapw => $mapsize, 780 mapw => $mapw,
748 maph => $mapsize, 781 maph => $maph,
749 782
750 client => "$DC::VERSION $] $^O", 783 client => "$DC::VERSION $] $^O",
751 784
752 map_widget => $MAPWIDGET, 785 map_widget => $MAPWIDGET,
753 statusbox => $STATUSBOX, 786 statusbox => $STATUSBOX,
… …
756 query => \&server_query, 789 query => \&server_query,
757 790
758 setup_req => { 791 setup_req => {
759 smoothing => $CFG->{map_smoothing}*1, 792 smoothing => $CFG->{map_smoothing}*1,
760 }, 793 },
761 };
762 794
763 if ($CONN) { 795 on_connect => sub {
796 if ($_[0]) {
764 DC::lowdelay fileno $CONN->{fh}; 797 DC::lowdelay fileno $CONN->{fh};
765 798
766 status "login successful"; 799 status "login successful";
800 } else {
801 undef $CONN;
802 status "unable to connect: $!";
803 stop_game();
804 }
805 },
806 ;
807}
808
809sub start_game {
810 status "logging in...";
811
812 $LOGIN_BUTTON->set_text ("Logout");
813 $SETUP_DIALOG->hide;
814
815 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
816
817 $MAP = new DC::Map;
818
819 # hack to make SURE we find the IP address all right
820 # can be removed once AnyEvent::DNS is proven stable.
821 if ($host eq "gameserver.deliantra.net") {
822 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
823 if ($_[0] ne "80.101.114.108") { # Perl
824 status "dns failure, using hardcoded address";
825 $host = "129.13.162.95";
826 }
827
828 dc_connect $host, $port;
829 };
767 } else { 830 } else {
768 status "unable to connect"; 831 dc_connect $host, $port;
769 stop_game();
770 } 832 }
771} 833}
772 834
773sub stop_game { 835sub stop_game {
836 crash "stop_game";
837
774 $LOGIN_BUTTON->set_text ("Login / Register"); 838 $LOGIN_BUTTON->set_text ("Login / Register");
775 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 839 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
776 $SETUP_DIALOG->show; 840 $SETUP_DIALOG->show;
777 $PL_WINDOW->hide; 841 $PL_WINDOW->hide;
778 $SPELL_LIST->clear_spells; 842 $SPELL_LIST->clear_spells;
… …
792} 856}
793 857
794sub graphics_setup { 858sub graphics_setup {
795 my $vbox = new DC::UI::VBox; 859 my $vbox = new DC::UI::VBox;
796 860
861 {
862 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
863
797 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 864 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
798 865
799 my $row = 0; 866 my $row = 0;
800 867
801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
802 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 869 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
803 can_events => 1, 870 can_events => 1,
804 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 871 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
805 872
873 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
874 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
875 can_events => 1,
876 tooltip => "This field shows any known issues with your config or driver, such as "
877 . "a non-accelerated display format. You can try to work around these issues "
878 . "by selecting a different video mode, changing the settings below or "
879 . "by installing the right driver for your graphics card.");
880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
882 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
883 value => $CFG->{uitheme},
884 options => [
885 [wood => "Wood (the default)"],
886 [plain => "Plain (very)"],
887 [blue => "Blue (dark)"],
888 [metal => "Metal (light)"],
889 ],
890 tooltip => "Choose the User Interface theme that you like most :)",
891 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
892 );
893
806 my $vidmode_tooltip = 894 my $vidmode_tooltip =
807 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 895 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
808 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 896 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
809 897
810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 898 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
811 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 899 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
812 900
813 $hbox->add (my $mode_slider = new DC::UI::Slider 901 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
814 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 902 force_w => $WIDTH * 0.1, expand => 1,
903 range => [ ($CFG->{sdl_mode}) x 3 ],
815 tooltip => $vidmode_tooltip); 904 tooltip => $vidmode_tooltip);
816 $hbox->add (my $mode_label = new DC::UI::Label 905 $hbox->add (my $mode_label = new DC::UI::Label
817 height => 0.8, template => "9999x9999@9+9", 906 height => 0.8, template => "9999x9999@9+9",
818 can_events => 1, tooltip => $vidmode_tooltip); 907 can_events => 1, tooltip => $vidmode_tooltip);
819 908
820 $mode_slider->connect (changed => sub { 909 $MODE_SLIDER->connect (changed => sub {
821 my ($self, $value) = @_; 910 my ($self, $value) = @_;
822 911
823 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 912 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
824 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 913 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
825 }); 914 });
826 $mode_slider->emit (changed => $mode_slider->{range}[0]); 915 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
827 916
828 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 917 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
829 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 918 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
830 state => $CFG->{fullscreen}, 919 state => $CFG->{fullscreen},
831 tooltip => "Bring the client into fullscreen mode.", 920 tooltip => "Bring the client into fullscreen mode.",
832 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 921 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
833 ); 922 );
834 923
835 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
836 $table->add_at (1, $row++, new DC::UI::CheckBox 925 $table->add_at (1, $row++, new DC::UI::CheckBox
837 state => $CFG->{force_opengl11}, 926 state => $CFG->{force_opengl11},
838 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 927 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
839 . "higher memory usage and slower performance. It will, however, help tremendously on " 928 . "higher memory usage and slower performance. It will, however, help tremendously on "
840 . "cards that claim to support a feature but fall back to software rendering. " 929 . "cards that claim to support a feature but fall back to software rendering. "
841 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 930 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
842 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 931 . "but cards and drivers from other vendors (ATI) are often just as bad. "
843 . "experience extremely low framerates and your card should do better, try this option.</b>", 932 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
844 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 933 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
845 ); 934 );
846 935
936 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
937 $table->add_at (1, $row++, new DC::UI::CheckBox
938 state => $CFG->{disable_alpha},
939 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
940 . "by disabling a number of textures and transparency effects. Normally, these "
941 . "effects do not cost a lot of resources, but some graphics cards might fall "
942 . "back to extremely slow rendering if this is enabled. If disabling this option "
943 . "noticably improves the framerate of the client please report this! "
944 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
945 on_changed => sub {
946 my ($self, $value) = @_;
947 $CFG->{disable_alpha} = $value;
948 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
949 0
950 }
951 );
952
847 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
848 $table->add_at (1, $row++, new DC::UI::CheckBox 954 $table->add_at (1, $row++, new DC::UI::CheckBox
849 state => $CFG->{texture_compression}, 955 state => $CFG->{texture_compression},
850 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 956 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
851 . "will save a lot of memory and increase performance. The compression algorithm " 957 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
852 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 958 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
853 . "forced OpenGL 1.1 mode.", 959 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
854 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 960 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
855 ); 961 );
856 962
857 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
858 $table->add_at (1, $row++, new DC::UI::CheckBox 964 $table->add_at (1, $row++, new DC::UI::CheckBox
859 state => $CFG->{fast}, 965 state => $CFG->{fast},
860 tooltip => "Lower the visual quality considerably to speed up rendering.", 966 tooltip => "Lower the visual quality considerably to speed up rendering.",
861 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 967 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
862 ); 968 );
863 969
864 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
865 $table->add_at (1, $row++, new DC::UI::Slider 971 $table->add_at (1, $row++, new DC::UI::Slider
866 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 972 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
867 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 973 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
868 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 974 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
869 ); 975 );
870 976
871 $table->add_at (1, $row++, new DC::UI::Button 977 $table->add_at (1, $row++, new DC::UI::Button
872 expand => 1, text => "Apply", 978 expand => 1, text => "Apply",
873 tooltip => "Apply the video settings above.", 979 tooltip => "Apply the video settings above.",
874 on_activate => sub { 980 on_activate => sub {
875 video_shutdown (); 981 video_shutdown ();
876 video_init (); 982 video_init ();
983 0
877 0 984 }
878 } 985 );
986 }
987
988 {
989 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
990
991 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
992
993 my $row = 0;
994 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
995 $table->add_at (1, $row++, new DC::UI::CheckBox
996 state => $CFG->{smooth_movement},
997 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
998 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
999 . "then disable this option. Changes take effect immdiately.",
1000 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
879 ); 1001 );
880 1002
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
882 $table->add_at (1, $row++, new DC::UI::Slider 1004 $table->add_at (1, $row++, new DC::UI::Slider
883 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1005 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
884 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1006 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
885 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
886 ); 1008 );
887 1009
888 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
889 $table->add_at (1, $row++, new DC::UI::CheckBox 1011 $table->add_at (1, $row++, new DC::UI::CheckBox
890 state => $CFG->{map_smoothing}, 1012 state => $CFG->{map_smoothing},
891 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1013 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
892 . "This increases load on the graphics subsystem and works only with TRT servers. " 1014 . "This increases load on the graphics subsystem and works only with TRT servers. "
893 . "Changes take effect at next login only.", 1015 . "Changes take effect at next login only.",
894 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1016 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
895 ); 1017 );
896 1018
897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1019 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
898 $table->add_at (1, $row++, new DC::UI::CheckBox 1020 $table->add_at (1, $row++, new DC::UI::CheckBox
899 state => $CFG->{fow_enable}, 1021 state => $CFG->{fow_enable},
900 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1022 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
901 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1023 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
902 ); 1024 );
903 1025
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
905 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1028 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
907 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1029 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
908 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
909 ); 1031 );
910 1032
911 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
912 $table->add_at (1, $row++, new DC::UI::Slider 1034 $table->add_at (1, $row++, new DC::UI::Slider
913 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1035 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
914 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1036 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
915 . "but you still need to press apply to correctly re-layout the widget.", 1037 . "but you still need to press apply to correctly re-layout the widget.",
916 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1038 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
917 ); 1039 );
918 1040
919 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1041 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
920 $table->add_at (1, $row++, new DC::UI::Slider 1042 $table->add_at (1, $row++, new DC::UI::Slider
921 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1043 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
922 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1044 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
923 on_changed => sub { 1045 on_changed => sub {
924 $CFG->{gauge_fontsize} = $_[1]; 1046 $CFG->{gauge_fontsize} = $_[1];
925 &set_gauge_window_fontsize; 1047 &set_gauge_window_fontsize;
1048 0
926 0 1049 }
927 } 1050 );
928 );
929 1051
930 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1052 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
931 $table->add_at (1, $row++, new DC::UI::Slider 1053 $table->add_at (1, $row++, new DC::UI::Slider
932 range => [$CFG->{gauge_size}, 0.2, 0.8], 1054 range => [$CFG->{gauge_size}, 0.2, 0.8],
933 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1055 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
934 on_changed => sub { 1056 on_changed => sub {
935 $CFG->{gauge_size} = $_[1]; 1057 $CFG->{gauge_size} = $_[1];
936 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1058 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1059 0
937 0 1060 }
938 } 1061 );
939 ); 1062 }
940 1063
941 $vbox 1064 $vbox
942} 1065}
943 1066
944our $AUDIO_HW_CHUNKSIZE; 1067our $AUDIO_HW_CHUNKSIZE;
… …
1523 1 1646 1
1524 }, 1647 },
1525 ); 1648 );
1526 1649
1527 $vbox->add (new DC::UI::FancyFrame 1650 $vbox->add (new DC::UI::FancyFrame
1528 label => "Registering", 1651 label => "How to Play",
1529 min_h => 200, 1652 min_h => 240,
1530 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1653 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1531 markup => 1654 markup =>
1655 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1656 . "Then register a new account (or use an existing one if you have one). "
1532 "To register a new account, choose a username that hasn't been taken yet and " 1657 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1533 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1658 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1534 ), 1659 ),
1535 ); 1660 );
1536 1661
1537 $vbox 1662 $vbox
… …
1618 $CFG->{show_tips} = $value; 1743 $CFG->{show_tips} = $value;
1619 0 1744 0
1620 } 1745 }
1621 ); 1746 );
1622 1747
1623 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1748 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1624 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1749 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1625 text => $CFG->{logview_max_par}, 1750 text => $CFG->{logview_max_par},
1626 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1751 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1627 . "sends more messages than this number, older messages get removed to save memory and " 1752 . "sends more messages than this number, older messages get removed to save memory and "
1628 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1753 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1629 on_changed => sub { 1754 on_changed => sub {
1630 my ($self, $value) = @_; 1755 my ($self, $value) = @_;
1631 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1756 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
… …
1683 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1808 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1684 ["Ignore cursed" => PICKUP_NOT_CURSED], 1809 ["Ignore cursed" => PICKUP_NOT_CURSED],
1685 ["Jewelery" => PICKUP_JEWELS], 1810 ["Jewelery" => PICKUP_JEWELS],
1686 ["Flesh" => PICKUP_FLESH], 1811 ["Flesh" => PICKUP_FLESH],
1687 ], 1812 ],
1688 ["Weight/Value ratio", 2, 17] 1813 ["Value/Weight ratio", 2, 17]
1689 ) 1814 )
1690 { 1815 {
1691 my ($title, $x, $y, @bits) = @$_; 1816 my ($title, $x, $y, @bits) = @$_;
1692 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1817 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1693 1818
… …
1718 } 1843 }
1719 1844
1720 $table->add_at (2, 18, new DC::UI::ValSlider 1845 $table->add_at (2, 18, new DC::UI::ValSlider
1721 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1846 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1722 template => ">= 99", 1847 template => ">= 99",
1848 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1723 to_value => sub { ">= " . 5 * $_[0] }, 1849 to_value => sub { ">= " . 5 * $_[0] },
1724 on_changed => sub { 1850 on_changed => sub {
1725 my ($slider, $value) = @_; 1851 my ($slider, $value) = @_;
1726 1852
1727 $::CFG->{pickup} &= ~0xF; 1853 $::CFG->{pickup} &= ~0xF;
… …
1740 1866
1741 $r 1867 $r
1742} 1868}
1743 1869
1744my %SORT_ORDER = ( 1870my %SORT_ORDER = (
1745 type => undef, 1871 type => sub {
1872 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1873 },
1746 mtime => sub { 1874 mtime => sub {
1747 my $NOW = time; 1875 my $NOW = time;
1748 sort { 1876 sort {
1749 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1877 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1750 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1878 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1781 $::CFG->{inv_sort} = $_[1]; 1909 $::CFG->{inv_sort} = $_[1];
1782 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1910 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1783 }, 1911 },
1784 ); 1912 );
1785 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1913 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1786 #TODO# update to weigh/maxweight 1914 #TODO# update to weight/maxweight
1787 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1915 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1788 1916
1789 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1917 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1790 $sw1->add ($INV = new DC::UI::Inventory); 1918 $sw1->add ($INV = new DC::UI::Inventory);
1791 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1919 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1972 my @path = DC::Pod::full_path_of $node; 2100 my @path = DC::Pod::full_path_of $node;
1973 pop @path; # drop current node 2101 pop @path; # drop current node
1974 2102
1975 for my $node (@path) { 2103 for my $node (@path) {
1976 $buttons->add (new DC::UI::Button 2104 $buttons->add (new DC::UI::Button
1977 text => $node->{kw}[0], 2105 text => $node->[DC::Pod::N_KW][0],
1978 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2106 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1979 on_activate => sub { 2107 on_activate => sub {
1980 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2108 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1981 $load_node->($node); 2109 $load_node->($node);
1982 }, 2110 },
1983 ); 2111 );
1984 $buttons->add (new DC::UI::Label text => "/"); 2112 $buttons->add (new DC::UI::Label text => "/");
1985 } 2113 }
1986 2114
1987 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2115 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1988 2116
1989 $curnode = $node; 2117 $curnode = $node;
1990 2118
1991 $viewer->clear; 2119 $viewer->clear;
1992 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2120 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2055 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2183 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2056 ); 2184 );
2057 $hb->add (new DC::UI::Button 2185 $hb->add (new DC::UI::Button
2058 text => "Quit anyway", 2186 text => "Quit anyway",
2059 expand => 1, 2187 expand => 1,
2060 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2188 on_activate => sub {
2189 crash "Quit anyway";
2190 EV::unloop EV::UNLOOP_ALL;
2191 },
2061 ); 2192 );
2062 } 2193 }
2063 2194
2064 $QUIT_DIALOG->show; 2195 $QUIT_DIALOG->show;
2065 $QUIT_DIALOG->grab_focus; 2196 $QUIT_DIALOG->grab_focus;
… …
2118 $dialog->show; 2249 $dialog->show;
2119 }; 2250 };
2120} 2251}
2121 2252
2122sub sdl_init { 2253sub sdl_init {
2123 DC::SDL_Init 2254 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2124 and die "SDL::Init failed!\n"; 2255 and die "SDL::Init failed!\n";
2125} 2256}
2126 2257
2127sub video_init { 2258sub video_init {
2259 DC::set_theme $CFG->{uitheme};
2260
2261 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2262 $SDL_REINIT = 0;
2263
2264 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2265 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2266 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2267 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2268
2269 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2270
2128 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2271 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2272 $CFG->{sdl_mode} = 0; # lowest resolution by default
2273
2274 # now choose biggest mode <= 1024x768
2275 for (0 .. $#SDL_MODES) {
2276 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2277 $CFG->{sdl_mode} = $_;
2278 }
2279 }
2280 }
2129 2281
2130 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2282 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2131 2283
2132 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2284 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2133 $FULLSCREEN = $CFG->{fullscreen}; 2285 $FULLSCREEN = $CFG->{fullscreen};
2134 $FAST = $CFG->{fast}; 2286 $FAST = $CFG->{fast};
2135 2287
2288 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2136 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2289 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2290 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2137 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2291 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2138 2292
2139 $SDL_ACTIVE = 1; 2293 $SDL_ACTIVE = 1;
2140 $LAST_REFRESH = time - 0.01; 2294 $LAST_REFRESH = time - 0.01;
2141 2295
… …
2178 can_events => 1, 2332 can_events => 1,
2179 can_hover => 1, 2333 can_hover => 1,
2180 markup => "", 2334 markup => "",
2181 align => 0, 2335 align => 0,
2182 font => $FONT_FIXED, 2336 font => $FONT_FIXED,
2183 tooltip => "#modifier_box"; 2337 tooltip => "#modifier_box",
2338 tooltip_width => 0.67,
2339 ;
2184 2340
2185 update_modbox; 2341 update_modbox;
2186 2342
2187 (new DC::UI::Frame 2343 (new DC::UI::Frame
2188 bg => [0, 0, 0, 0.4], 2344 bg => [0, 0, 0, 0.4],
… …
2206 x => 0, 2362 x => 0,
2207 y => $FONTSIZE + 8, 2363 y => $FONTSIZE + 8,
2208 border_bg => [1, 1, 1, 192/255], 2364 border_bg => [1, 1, 1, 192/255],
2209 bg => [1, 1, 1, 0], 2365 bg => [1, 1, 1, 0],
2210 child => ($MAPMAP = new DC::MapWidget::MapMap 2366 child => ($MAPMAP = new DC::MapWidget::MapMap
2211 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2367 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2212 ), 2368 ),
2213 )->show; 2369 )->show;
2214 2370
2215 $MAPWIDGET = new DC::MapWidget; 2371 $MAPWIDGET = new DC::MapWidget;
2216 $MAPWIDGET->connect (activate_console => sub { 2372 $MAPWIDGET->connect (activate_console => sub {
… …
2237 force_h => $::HEIGHT * 0.6, 2393 force_h => $::HEIGHT * 0.6,
2238 has_close_button => 1, 2394 has_close_button => 1,
2239 ; 2395 ;
2240 2396
2241 $METASERVER = metaserver_dialog; 2397 $METASERVER = metaserver_dialog;
2242 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2398 # the name is changed to not conflict with the older name as users could have hidden it
2399 $MESSAGE_WINDOW = new DC::UI::Dockbar
2400 name => "message_window2",
2401 title => 'Messages',
2402 force_w => $::WIDTH * 0.6,
2403 force_h => $::HEIGHT * 0.25,
2404 ;
2405
2243 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2406 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2244 2407
2245 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2408 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2246 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2409 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2247 2410
2248 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2411 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2249 "Configure the server to play on, your username and password."); 2412 "Configure the server to play on, your username and password.");
2250 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2413 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2268 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2431 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2269 2432
2270 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2433 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2271 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2434 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2272 2435
2273 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2436# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2274 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2437# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2275 2438
2276 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 2439 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
2277 2440
2278 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2441 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2279 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2442 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2281 $BUTTONBAR->add (new DC::UI::Button 2444 $BUTTONBAR->add (new DC::UI::Button
2282 text => "Save Config", 2445 text => "Save Config",
2283 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2446 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2284 on_activate => sub { 2447 on_activate => sub {
2285 $::CFG->{layout} = DC::UI::get_layout; 2448 $::CFG->{layout} = DC::UI::get_layout;
2286 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2449 DC::write_cfg;
2287 status "Configuration Saved"; 2450 status "Configuration Saved";
2288 0 2451 0
2289 }, 2452 },
2290 ); 2453 );
2291 2454
2292 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2455 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2293 tooltip => "View Documentation"); 2456 tooltip => "View Documentation");
2294
2295 2457
2296 $BUTTONBAR->add (new DC::UI::Button 2458 $BUTTONBAR->add (new DC::UI::Button
2297 text => "Quit", 2459 text => "Quit",
2298 tooltip => "Terminates the program", 2460 tooltip => "Terminates the program",
2299 on_activate => sub { 2461 on_activate => sub {
… …
2309 $BUTTONBAR->show; 2471 $BUTTONBAR->show;
2310 $SETUP_DIALOG->show; 2472 $SETUP_DIALOG->show;
2311 $MESSAGE_WINDOW->show; 2473 $MESSAGE_WINDOW->show;
2312 } 2474 }
2313 2475
2476 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2477 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2478
2479 $CAVEAT_LABEL->set_text ("None :)");
2480 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2481 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2482
2314 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2483 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2315} 2484}
2316 2485
2317sub video_shutdown { 2486sub video_shutdown {
2318 DC::OpenGL::shutdown; 2487 DC::OpenGL::shutdown;
2488 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2319 2489
2320 undef $SDL_ACTIVE; 2490 undef $SDL_ACTIVE;
2321} 2491}
2322 2492
2323my %animate_object; 2493my %animate_object;
… …
2366 delete $animate_object{$widget}; 2536 delete $animate_object{$widget};
2367} 2537}
2368 2538
2369%SDL_CB = ( 2539%SDL_CB = (
2370 DC::SDL_QUIT => sub { 2540 DC::SDL_QUIT => sub {
2541 crash "SDL_QUIT";
2371 EV::unloop EV::UNLOOP_ALL; 2542 EV::unloop EV::UNLOOP_ALL;
2372 }, 2543 },
2373 DC::SDL_VIDEORESIZE => sub { 2544 DC::SDL_VIDEORESIZE => sub {
2374 }, 2545 },
2375 DC::SDL_VIDEOEXPOSE => sub { 2546 DC::SDL_VIDEOEXPOSE => sub {
… …
2384# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2555# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2385 }, 2556 },
2386 DC::SDL_KEYDOWN => sub { 2557 DC::SDL_KEYDOWN => sub {
2387 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2558 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2388 # alt-enter 2559 # alt-enter
2560 video_shutdown;
2389 $FULLSCREEN_ENABLE->toggle; 2561 $FULLSCREEN_ENABLE->toggle;
2390 video_shutdown;
2391 video_init; 2562 video_init;
2392 } else { 2563 } else {
2393 &DC::UI::feed_sdl_key_down_event; 2564 &DC::UI::feed_sdl_key_down_event;
2394 } 2565 }
2395 update_modbox; 2566 update_modbox;
… …
2415$SIG{INT} = $SIG{TERM} = sub { 2586$SIG{INT} = $SIG{TERM} = sub {
2416 EV::unloop; 2587 EV::unloop;
2417 #d# TODO calling exit here hangs the process in some futex 2588 #d# TODO calling exit here hangs the process in some futex
2418}; 2589};
2419 2590
2420{ 2591# due to mac os x + sdl combined briandamage, we need this contortion
2592sub main {
2593 {
2594 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2595
2421 if (-e "$Deliantra::VARDIR/client.cf") { 2596 if (-e "$Deliantra::VARDIR/client.cf") {
2422 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2597 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2423 } else { 2598 } else {
2424 #TODO: compatibility cruft 2599 #TODO: compatibility cruft
2425 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2600 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2426 print STDERR "INFO: used old configuration file\n"; 2601 print STDERR "INFO: used old configuration file\n";
2427 } 2602 }
2428 2603
2429 DC::DB::Server::run; 2604 DC::DB::Server::run;
2430 2605
2606 if ($CFG->{db_schema} < 1) {
2607 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2608 DC::DB::nuke_db;
2609 $CFG->{db_schema} = 1;
2610 DC::write_cfg;
2611 }
2612
2613 DC::DB::open_db;
2614
2431 DC::UI::set_layout ($::CFG->{layout}); 2615 DC::UI::set_layout ($::CFG->{layout});
2432 2616
2433 my %DEF_CFG = ( 2617 my %DEF_CFG = (
2434 sdl_mode => 0, 2618 sdl_mode => undef,
2435 fullscreen => 1, 2619 fullscreen => 1,
2436 fast => 0, 2620 fast => 0,
2437 force_opengl11 => undef, 2621 force_opengl11 => undef,
2622 disable_alpha => 0,
2623 smooth_movement => 1,
2438 texture_compression => 1, 2624 texture_compression => 1,
2439 map_scale => 1, 2625 map_scale => 1,
2440 fow_enable => 1, 2626 fow_enable => 1,
2441 fow_intensity => 0, 2627 fow_intensity => 0,
2442 map_smoothing => 1, 2628 map_smoothing => 1,
2443 gui_fontsize => 1, 2629 gui_fontsize => 1,
2444 log_fontsize => 0.7, 2630 log_fontsize => 0.7,
2445 gauge_fontsize => 1, 2631 gauge_fontsize => 1,
2446 gauge_size => 0.35, 2632 gauge_size => 0.35,
2447 stat_fontsize => 0.7, 2633 stat_fontsize => 0.7,
2448 mapsize => 100, 2634 mapsize => 100,
2449 audio_enable => 1, 2635 audio_enable => 1,
2450 audio_hw_channels => 0, 2636 audio_hw_channels => 0,
2451 audio_hw_frequency => 0, 2637 audio_hw_frequency => 0,
2452 audio_hw_chunksize => 0, 2638 audio_hw_chunksize => 0,
2453 audio_mix_channels => 8, 2639 audio_mix_channels => 8,
2454 effects_enable => 1, 2640 effects_enable => 1,
2455 effects_volume => 1, 2641 effects_volume => 1,
2456 bgm_enable => 1, 2642 bgm_enable => 1,
2457 bgm_volume => 0.5, 2643 bgm_volume => 0.5,
2458 output_rate => "", 2644 output_rate => "",
2459 pickup => 0, 2645 pickup => 0,
2460 inv_sort => "mtime", 2646 inv_sort => "mtime",
2461 default => "profile", # default profile 2647 default => "profile", # default profile
2462 show_tips => 1, 2648 show_tips => 1,
2463 logview_max_par => 1000, 2649 logview_max_par => 1000,
2650 shift_fire_stop => 0,
2651 uitheme => "wood",
2464 ); 2652 );
2465 2653
2466 while (my ($k, $v) = each %DEF_CFG) { 2654 while (my ($k, $v) = each %DEF_CFG) {
2467 $CFG->{$k} = $v unless exists $CFG->{$k}; 2655 $CFG->{$k} = $v unless exists $CFG->{$k};
2468 } 2656 }
2469 2657
2470 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2658 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2471 $PROFILE = $CFG->{profile}{default}; 2659 $PROFILE = $CFG->{profile}{default};
2472 2660
2473 # convert old bindings (only default profile matters) 2661 # convert old bindings (only default profile matters)
2474 if (my $bindings = delete $PROFILE->{bindings}) { 2662 if (my $bindings = delete $PROFILE->{bindings}) {
2475 while (my ($mod, $syms) = each %$bindings) { 2663 while (my ($mod, $syms) = each %$bindings) {
2476 while (my ($sym, $cmds) = each %$syms) { 2664 while (my ($sym, $cmds) = each %$syms) {
2477 push @{ $PROFILE->{macro} }, { 2665 push @{ $PROFILE->{macro} }, {
2478 accelkey => [$mod*1, $sym*1], 2666 accelkey => [$mod*1, $sym*1],
2479 action => $cmds, 2667 action => $cmds,
2668 };
2480 }; 2669 }
2481 } 2670 }
2482 } 2671 }
2483 }
2484 2672
2485 sdl_init; 2673 sdl_init;
2486 2674
2487 @SDL_MODES = DC::SDL_ListModes 8, 8; 2675 {
2488 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2489 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2490
2491 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2492
2493 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2494
2495 {
2496 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2676 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2497 DejaVuSans.ttf 2677 DejaVuSans.ttf
2498 DejaVuSansMono.ttf 2678 DejaVuSansMono.ttf
2499 DejaVuSans-Bold.ttf 2679 DejaVuSans-Bold.ttf
2500 DejaVuSansMono-Bold.ttf 2680 DejaVuSansMono-Bold.ttf
2501 DejaVuSans-Oblique.ttf 2681 DejaVuSans-Oblique.ttf
2502 DejaVuSansMono-Oblique.ttf 2682 DejaVuSansMono-Oblique.ttf
2503 DejaVuSans-BoldOblique.ttf 2683 DejaVuSans-BoldOblique.ttf
2504 DejaVuSansMono-BoldOblique.ttf 2684 DejaVuSansMono-BoldOblique.ttf
2505 ); 2685 );
2506 2686
2507 DC::add_font $_ for @fonts; 2687 DC::add_font $_ for @fonts;
2508 2688
2509 DC::pango_init;
2510
2511 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2689 $FONT_PROP = new_from_file DC::Font $fonts[0];
2512 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2690 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2513 2691
2514 $FONT_PROP->make_default; 2692 $FONT_PROP->make_default;
2515 } 2693
2694 DC::pango_init;
2695 }
2516 2696
2517# compare mono (ft) vs. rgba (cairo) 2697# compare mono (ft) vs. rgba (cairo)
2518# ft - 1.8s, cairo 3s, even in alpha-only mode 2698# ft - 1.8s, cairo 3s, even in alpha-only mode
2519# for my $rgba (0..1) { 2699# for my $rgba (0..1) {
2520# my $t1 = Time::HiRes::time; 2700# my $t1 = Time::HiRes::time;
… …
2525# } 2705# }
2526# my $t2 = Time::HiRes::time; 2706# my $t2 = Time::HiRes::time;
2527# warn $t2-$t1; 2707# warn $t2-$t1;
2528# } 2708# }
2529 2709
2530 video_init; 2710 video_init;
2531 audio_init; 2711 audio_init;
2532} 2712 }
2533 2713
2534show_tip_of_the_day if $CFG->{show_tips}; 2714 show_tip_of_the_day if $CFG->{show_tips};
2535 2715
2536our $STARTUP_CANCEL = EV::idle sub { 2716 our $STARTUP_CANCEL = EV::idle sub {
2537 undef $::STARTUP_CANCEL; 2717 undef $::STARTUP_CANCEL;
2538 $startup_done->(); 2718 $startup_done->();
2539}; 2719 };
2540 2720
2721 delete $SIG{__DIE__};
2541EV::loop; 2722 EV::loop;
2542 2723
2543#video_shutdown; 2724#video_shutdown;
2544#audio_shutdown; 2725#audio_shutdown;
2545DC::OpenGL::quit; 2726 DC::OpenGL::quit;
2546DC::SDL_Quit; 2727 DC::SDL_Quit;
2547DC::DB::Server::stop; 2728 DC::DB::Server::stop;
2729}
2730
2731DC::SDL_braino; # see sub above
2548 2732
2549=head1 NAME 2733=head1 NAME
2550 2734
2551deliantra - A Deliantra MORPG game client 2735deliantra - A Deliantra MORPG game client
2552 2736
… …
2569 4 show fps 2753 4 show fps
2570 8 suppress tooltips 2754 8 suppress tooltips
2571 2755
2572=head1 AUTHOR 2756=head1 AUTHOR
2573 2757
2574Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2758Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2575 2759
2576 2760
2577 2761

Diff Legend

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