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.26 by root, Thu Jan 10 21:53:33 2008 UTC vs.
Revision 1.78 by root, Tue Sep 30 03:05:07 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;
… …
190our $SDL_ACTIVE; 201our $SDL_ACTIVE;
191our %SDL_CB; 202our %SDL_CB;
192 203
193our $ALT_ENTER_MESSAGE; 204our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 205our $STATUSBOX;
206our $MODBOX;
195our $DEBUG_STATUS; 207our $DEBUG_STATUS;
196 208
197our $INV; 209our $INV;
198our $INVR; 210our $INVR;
199our $INVR_HB; 211our $INVR_HB;
200 212
201############################################################################# 213#############################################################################
202 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
203sub status { 242sub status {
204 $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]);
205} 244}
206 245
207sub debug { 246sub debug {
208 $DEBUG_STATUS->set_text ($_[0]); 247 $DEBUG_STATUS->set_text ($_[0]);
209} 248}
210 249
211sub message { 250sub message {
212 $MESSAGE_DIST->message (@_); 251 $MESSAGE_DIST->message (@_);
252}
253
254sub update_modbox {
255 my $mod = DC::SDL_GetModState;
256
257 my $markup;
258
259 $markup .= $mod & DC::KMOD_CTRL
260 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
261 : "[<span foreground='#888'> once </span>]";
262
263 $markup .= $mod & DC::KMOD_SHIFT
264 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
265 : "[<span foreground='#888'>move</span>]";
266
267 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
268 ? "[ALT]"
269 : "[<span foreground='#888'>alt</span>]";
270
271 $markup .= $mod & DC::KMOD_NUM
272 ? "[NUM]"
273 : "[<span foreground='#888'>num</span>]";
274
275 # <tt> around next statement works around some bug that keeps the
276 # "font =>" from being used on windows
277 $MODBOX->set_markup ("<tt>$markup</tt>");
213} 278}
214 279
215############################################################################# 280#############################################################################
216#TODO: maybe move into own audio module... 281#TODO: maybe move into own audio module...
217 282
… …
637 # right: accept 702 # right: accept
638 $table->add_at (4, 0, new DC::UI::Button 703 $table->add_at (4, 0, new DC::UI::Button
639 text => "Accept", 704 text => "Accept",
640 on_activate => sub { 705 on_activate => sub {
641 $conn->send ("reply n"); 706 $conn->send ("reply n");
642 $STATS_PAGE->hide;
643 destroy_query_dialog $conn; 707 destroy_query_dialog $conn;
644 0 708 0
645 }, 709 },
646 ); 710 );
647 711
… …
699 763
700 $vbox->add (@dialog); 764 $vbox->add (@dialog);
701 $dialog->show; 765 $dialog->show;
702} 766}
703 767
704sub start_game { 768sub dc_connect {
705 status "logging in..."; 769 my ($host, $port) = @_;
706
707 $LOGIN_BUTTON->set_text ("Logout");
708 $SETUP_DIALOG->hide;
709 770
710 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
711 772
712 my ($host, $port) = split /:/, $PROFILE->{host};
713
714 $MAP = new DC::Map;
715
716 $CONN = eval { 773 $CONN =
717 new DC::Protocol 774 new DC::Protocol
718 host => $host, 775 host => $host,
719 port => $port || 13327, 776 port => $port,
720 user => $PROFILE->{user}, 777 user => $PROFILE->{user},
721 pass => $PROFILE->{password}, 778 pass => $PROFILE->{password},
722 mapw => $mapsize, 779 mapw => $mapsize,
723 maph => $mapsize, 780 maph => $mapsize,
724 781
… …
731 query => \&server_query, 788 query => \&server_query,
732 789
733 setup_req => { 790 setup_req => {
734 smoothing => $CFG->{map_smoothing}*1, 791 smoothing => $CFG->{map_smoothing}*1,
735 }, 792 },
736 };
737 793
738 if ($CONN) { 794 on_connect => sub {
795 if ($_[0]) {
739 DC::lowdelay fileno $CONN->{fh}; 796 DC::lowdelay fileno $CONN->{fh};
740 797
741 status "login successful"; 798 status "login successful";
799 } else {
800 undef $CONN;
801 status "unable to connect: $!";
802 stop_game();
803 }
804 },
805 ;
806}
807
808sub start_game {
809 status "logging in...";
810
811 $LOGIN_BUTTON->set_text ("Logout");
812 $SETUP_DIALOG->hide;
813
814 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
815
816 $MAP = new DC::Map;
817
818 # hack to make SURE we find the IP address all right
819 # can be removed once AnyEvent::DNS is proven stable.
820 if ($host eq "gameserver.deliantra.net") {
821 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
822 if ($_[0] ne "80.101.114.108") { # Perl
823 status "dns failure, using hardcoded address";
824 $host = "129.13.162.95";
825 }
826
827 dc_connect $host, $port;
828 };
742 } else { 829 } else {
743 status "unable to connect"; 830 dc_connect $host, $port;
744 stop_game();
745 } 831 }
746} 832}
747 833
748sub stop_game { 834sub stop_game {
835 crash "stop_game";
836
749 $LOGIN_BUTTON->set_text ("Login / Register"); 837 $LOGIN_BUTTON->set_text ("Login / Register");
750 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 838 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
751 $SETUP_DIALOG->show; 839 $SETUP_DIALOG->show;
752 $PL_WINDOW->hide; 840 $PL_WINDOW->hide;
753 $SPELL_LIST->clear_spells; 841 $SPELL_LIST->clear_spells;
… …
767} 855}
768 856
769sub graphics_setup { 857sub graphics_setup {
770 my $vbox = new DC::UI::VBox; 858 my $vbox = new DC::UI::VBox;
771 859
860 {
861 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
862
772 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 863 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
773 864
774 my $row = 0; 865 my $row = 0;
775 866
776 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
777 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 868 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
778 can_events => 1, 869 can_events => 1,
779 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 870 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
780 871
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
873 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
874 can_events => 1,
875 tooltip => "This field shows any known issues with your config or driver, such as "
876 . "a non-accelerated display format. You can try to work around these issues "
877 . "by selecting a different video mode, changing the settings below or "
878 . "by installing the right driver for your graphics card.");
879
880 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
881 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
882 value => $CFG->{uitheme},
883 options => [
884 [wood => "Wood (the default)"],
885 [plain => "Plain (very)"],
886 [blue => "Blue (dark)"],
887 [metal => "Metal (light)"],
888 ],
889 tooltip => "Choose the User Interface theme that you like most :)",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
891 );
892
781 my $vidmode_tooltip = 893 my $vidmode_tooltip =
782 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 894 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
783 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 895 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
784 896
785 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 897 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
786 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
787 899
788 $hbox->add (my $mode_slider = new DC::UI::Slider 900 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
789 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 901 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ],
790 tooltip => $vidmode_tooltip); 903 tooltip => $vidmode_tooltip);
791 $hbox->add (my $mode_label = new DC::UI::Label 904 $hbox->add (my $mode_label = new DC::UI::Label
792 height => 0.8, template => "9999x9999@9+9", 905 height => 0.8, template => "9999x9999@9+9",
793 can_events => 1, tooltip => $vidmode_tooltip); 906 can_events => 1, tooltip => $vidmode_tooltip);
794 907
795 $mode_slider->connect (changed => sub { 908 $MODE_SLIDER->connect (changed => sub {
796 my ($self, $value) = @_; 909 my ($self, $value) = @_;
797 910
798 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 911 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
799 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 912 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
800 }); 913 });
801 $mode_slider->emit (changed => $mode_slider->{range}[0]); 914 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
802 915
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
804 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
805 state => $CFG->{fullscreen}, 918 state => $CFG->{fullscreen},
806 tooltip => "Bring the client into fullscreen mode.", 919 tooltip => "Bring the client into fullscreen mode.",
807 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 920 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
808 ); 921 );
809 922
810 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 923 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
811 $table->add_at (1, $row++, new DC::UI::CheckBox 924 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{force_opengl11}, 925 state => $CFG->{force_opengl11},
813 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 926 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
814 . "higher memory usage and slower performance. It will, however, help tremendously on " 927 . "higher memory usage and slower performance. It will, however, help tremendously on "
815 . "cards that claim to support a feature but fall back to software rendering. " 928 . "cards that claim to support a feature but fall back to software rendering. "
816 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 929 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
817 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 930 . "but cards and drivers from other vendors (ATI) are often just as bad. "
818 . "experience extremely low framerates and your card should do better, try this option.</b>", 931 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 932 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
820 ); 933 );
821 934
935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
936 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
939 . "by disabling a number of textures and transparency effects. Normally, these "
940 . "effects do not cost a lot of resources, but some graphics cards might fall "
941 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! "
943 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
944 on_changed => sub {
945 my ($self, $value) = @_;
946 $CFG->{disable_alpha} = $value;
947 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
948 0
949 }
950 );
951
822 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
823 $table->add_at (1, $row++, new DC::UI::CheckBox 953 $table->add_at (1, $row++, new DC::UI::CheckBox
824 state => $CFG->{texture_compression}, 954 state => $CFG->{texture_compression},
825 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 955 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
826 . "will save a lot of memory and increase performance. The compression algorithm " 956 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
827 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 957 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
828 . "forced OpenGL 1.1 mode.", 958 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
829 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 959 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
830 ); 960 );
831 961
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 962 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
833 $table->add_at (1, $row++, new DC::UI::CheckBox 963 $table->add_at (1, $row++, new DC::UI::CheckBox
834 state => $CFG->{fast}, 964 state => $CFG->{fast},
835 tooltip => "Lower the visual quality considerably to speed up rendering.", 965 tooltip => "Lower the visual quality considerably to speed up rendering.",
836 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
837 ); 967 );
838 968
839 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
840 $table->add_at (1, $row++, new DC::UI::Slider 970 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 971 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
842 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 972 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
843 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 973 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
844 ); 974 );
845 975
846 $table->add_at (1, $row++, new DC::UI::Button 976 $table->add_at (1, $row++, new DC::UI::Button
847 expand => 1, text => "Apply", 977 expand => 1, text => "Apply",
848 tooltip => "Apply the video settings above.", 978 tooltip => "Apply the video settings above.",
849 on_activate => sub { 979 on_activate => sub {
850 video_shutdown (); 980 video_shutdown ();
851 video_init (); 981 video_init ();
982 0
852 0 983 }
853 } 984 );
985 }
986
987 {
988 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
989
990 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
991
992 my $row = 0;
993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
994 $table->add_at (1, $row++, new DC::UI::CheckBox
995 state => $CFG->{smooth_movement},
996 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
997 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
998 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
854 ); 1000 );
855 1001
856 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
857 $table->add_at (1, $row++, new DC::UI::Slider 1003 $table->add_at (1, $row++, new DC::UI::Slider
858 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
859 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
860 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
861 ); 1007 );
862 1008
863 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1009 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
864 $table->add_at (1, $row++, new DC::UI::CheckBox 1010 $table->add_at (1, $row++, new DC::UI::CheckBox
865 state => $CFG->{map_smoothing}, 1011 state => $CFG->{map_smoothing},
866 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1012 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
867 . "This increases load on the graphics subsystem and works only with TRT servers. " 1013 . "This increases load on the graphics subsystem and works only with TRT servers. "
868 . "Changes take effect at next login only.", 1014 . "Changes take effect at next login only.",
869 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
870 ); 1016 );
871 1017
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1018 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
873 $table->add_at (1, $row++, new DC::UI::CheckBox 1019 $table->add_at (1, $row++, new DC::UI::CheckBox
874 state => $CFG->{fow_enable}, 1020 state => $CFG->{fow_enable},
875 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1021 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
876 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
877 ); 1023 );
878 1024
879 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1025 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
880 $table->add_at (1, $row++, new DC::UI::Slider 1026 $table->add_at (1, $row++, new DC::UI::Slider
881 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1027 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
882 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1028 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
884 ); 1030 );
885 1031
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
887 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
888 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1034 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
889 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1035 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
890 . "but you still need to press apply to correctly re-layout the widget.", 1036 . "but you still need to press apply to correctly re-layout the widget.",
891 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1037 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
892 ); 1038 );
893 1039
894 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
895 $table->add_at (1, $row++, new DC::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
896 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1042 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
897 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1043 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
898 on_changed => sub { 1044 on_changed => sub {
899 $CFG->{gauge_fontsize} = $_[1]; 1045 $CFG->{gauge_fontsize} = $_[1];
900 &set_gauge_window_fontsize; 1046 &set_gauge_window_fontsize;
1047 0
901 0 1048 }
902 } 1049 );
903 );
904 1050
905 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
906 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
907 range => [$CFG->{gauge_size}, 0.2, 0.8], 1053 range => [$CFG->{gauge_size}, 0.2, 0.8],
908 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1054 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
909 on_changed => sub { 1055 on_changed => sub {
910 $CFG->{gauge_size} = $_[1]; 1056 $CFG->{gauge_size} = $_[1];
911 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1057 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1058 0
912 0 1059 }
913 } 1060 );
914 ); 1061 }
915 1062
916 $vbox 1063 $vbox
917} 1064}
918 1065
919our $AUDIO_HW_CHUNKSIZE; 1066our $AUDIO_HW_CHUNKSIZE;
… …
1498 1 1645 1
1499 }, 1646 },
1500 ); 1647 );
1501 1648
1502 $vbox->add (new DC::UI::FancyFrame 1649 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1650 label => "How to Play",
1504 min_h => 200, 1651 min_h => 240,
1505 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1652 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1653 markup =>
1654 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1655 . "Then register a new account (or use an existing one if you have one). "
1507 "To register a new account, choose a username that hasn't been taken yet and " 1656 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1657 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1658 ),
1510 ); 1659 );
1511 1660
1512 $vbox 1661 $vbox
… …
1528 1677
1529 $vbox->add ( 1678 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1679 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1680 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1681 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1682 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1683 on_changed => sub {
1535 my ($self, $value) = @_; 1684 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1685 $CFG->{profile}{default}{host} = $value;
1537 1 1686 1
1538 } 1687 }
… …
1541 if (0) { #d# disabled 1690 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1691 $vbox->add (new DC::UI::Button
1543 expand => 1, 1692 expand => 1,
1544 text => "Server List", 1693 text => "Server List",
1545 other => $METASERVER, 1694 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1695 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1696 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1697 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1698 );
1550 }#d# 1699 }#d#
1551 } 1700 }
… …
1593 $CFG->{show_tips} = $value; 1742 $CFG->{show_tips} = $value;
1594 0 1743 0
1595 } 1744 }
1596 ); 1745 );
1597 1746
1598 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1747 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1748 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1749 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1750 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1751 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1752 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1753 on_changed => sub {
1605 my ($self, $value) = @_; 1754 my ($self, $value) = @_;
1606 $MESSAGE_DIST->set_max_para ($CFG->{logview_max_par} = $value*1); 1755 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1756 0
1608 }, 1757 },
1609 ); 1758 );
1610 1759
1611 $table 1760 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1807 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1808 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1809 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1810 ["Flesh" => PICKUP_FLESH],
1662 ], 1811 ],
1663 ["Weight/Value ratio", 2, 17] 1812 ["Value/Weight ratio", 2, 17]
1664 ) 1813 )
1665 { 1814 {
1666 my ($title, $x, $y, @bits) = @$_; 1815 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1816 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1817
… …
1693 } 1842 }
1694 1843
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1844 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1845 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1846 template => ">= 99",
1847 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1848 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1849 on_changed => sub {
1700 my ($slider, $value) = @_; 1850 my ($slider, $value) = @_;
1701 1851
1702 $::CFG->{pickup} &= ~0xF; 1852 $::CFG->{pickup} &= ~0xF;
… …
1715 1865
1716 $r 1866 $r
1717} 1867}
1718 1868
1719my %SORT_ORDER = ( 1869my %SORT_ORDER = (
1720 type => undef, 1870 type => sub {
1871 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1872 },
1721 mtime => sub { 1873 mtime => sub {
1722 my $NOW = time; 1874 my $NOW = time;
1723 sort { 1875 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1876 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1877 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1756 $::CFG->{inv_sort} = $_[1]; 1908 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1909 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1910 },
1759 ); 1911 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1912 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1913 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1914 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1915
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1916 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1917 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1918 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1947 my @path = DC::Pod::full_path_of $node; 2099 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2100 pop @path; # drop current node
1949 2101
1950 for my $node (@path) { 2102 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2103 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2104 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2105 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2106 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2107 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2108 $load_node->($node);
1957 }, 2109 },
1958 ); 2110 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2111 $buttons->add (new DC::UI::Label text => "/");
1960 } 2112 }
1961 2113
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2114 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2115
1964 $curnode = $node; 2116 $curnode = $node;
1965 2117
1966 $viewer->clear; 2118 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2119 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2182 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2183 );
2032 $hb->add (new DC::UI::Button 2184 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2185 text => "Quit anyway",
2034 expand => 1, 2186 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2187 on_activate => sub {
2188 crash "Quit anyway";
2189 EV::unloop EV::UNLOOP_ALL;
2190 },
2036 ); 2191 );
2037 } 2192 }
2038 2193
2039 $QUIT_DIALOG->show; 2194 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2195 $QUIT_DIALOG->grab_focus;
… …
2093 $dialog->show; 2248 $dialog->show;
2094 }; 2249 };
2095} 2250}
2096 2251
2097sub sdl_init { 2252sub sdl_init {
2098 DC::SDL_Init 2253 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2254 and die "SDL::Init failed!\n";
2100} 2255}
2101 2256
2102sub video_init { 2257sub video_init {
2258 DC::set_theme $CFG->{uitheme};
2259
2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2261 $SDL_REINIT = 0;
2262
2263 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2264 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2265 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2266 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2267
2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2269
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2270 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2271 $CFG->{sdl_mode} = 0; # lowest resolution by default
2272
2273 # now choose biggest mode <= 1024x768
2274 for (0 .. $#SDL_MODES) {
2275 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2276 $CFG->{sdl_mode} = $_;
2277 }
2278 }
2279 }
2104 2280
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2281 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2282
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2283 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2284 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2285 $FAST = $CFG->{fast};
2110 2286
2287 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2288 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2289 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2290 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2291
2114 $SDL_ACTIVE = 1; 2292 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2293 $LAST_REFRESH = time - 0.01;
2116 2294
… …
2146 force_x => "max", 2324 force_x => "max",
2147 force_y => 0; 2325 force_y => 0;
2148 $DEBUG_STATUS->show; 2326 $DEBUG_STATUS->show;
2149 2327
2150 $STATUSBOX = new DC::UI::Statusbox; 2328 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2329
2330 $MODBOX = new DC::UI::Label
2331 can_events => 1,
2332 can_hover => 1,
2333 markup => "",
2334 align => 0,
2335 font => $FONT_FIXED,
2336 tooltip => "#modifier_box",
2337 tooltip_width => 0.67,
2338 ;
2339
2340 update_modbox;
2152 2341
2153 (new DC::UI::Frame 2342 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2343 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2344 force_x => 0,
2156 force_y => "max", 2345 force_y => "max",
2157 child => $STATUSBOX, 2346 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2347 )->show;
2348
2349 $LR->add ($STATUSBOX);
2350 $LR->add ($MODBOX);
2351 $LR->add (new DC::UI::Label
2352 align => 0,
2353 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2354 fontsize => 0.5,
2355 fg => [1, 1, 0, 0.7],
2356 );
2159 2357
2160 DC::UI::Toplevel->new ( 2358 DC::UI::Toplevel->new (
2161 title => "Minimap", 2359 title => "Minimap",
2162 name => "mapmap", 2360 name => "mapmap",
2163 x => 0, 2361 x => 0,
2164 y => $FONTSIZE + 8, 2362 y => $FONTSIZE + 8,
2165 border_bg => [1, 1, 1, 192/255], 2363 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2364 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2365 child => ($MAPMAP = new DC::MapWidget::MapMap
2168 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2367 ),
2170 )->show; 2368 )->show;
2171 2369
2172 $MAPWIDGET = new DC::MapWidget; 2370 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2371 $MAPWIDGET->connect (activate_console => sub {
… …
2194 force_h => $::HEIGHT * 0.6, 2392 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2393 has_close_button => 1,
2196 ; 2394 ;
2197 2395
2198 $METASERVER = metaserver_dialog; 2396 $METASERVER = metaserver_dialog;
2199 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages'); 2397 # the name is changed to not conflict with the older name as users could have hidden it
2398 $MESSAGE_WINDOW = new DC::UI::Dockbar
2399 name => "message_window2",
2400 title => 'Messages',
2401 force_w => $::WIDTH * 0.6,
2402 force_h => $::HEIGHT * 0.25,
2403 ;
2404
2200 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2405 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2201 2406
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2407 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2408 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2409
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2410 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2411 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2412 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2430 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2431
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2432 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2433 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2434
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2435# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2436# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2437
2233 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 2438 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
2234 2439
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2440 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2441 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2238 $BUTTONBAR->add (new DC::UI::Button 2443 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2444 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2445 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2446 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout; 2447 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2448 DC::write_cfg;
2244 status "Configuration Saved"; 2449 status "Configuration Saved";
2245 0 2450 0
2246 }, 2451 },
2247 ); 2452 );
2248 2453
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2455 tooltip => "View Documentation");
2251
2252 2456
2253 $BUTTONBAR->add (new DC::UI::Button 2457 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2458 text => "Quit",
2255 tooltip => "Terminates the program", 2459 tooltip => "Terminates the program",
2256 on_activate => sub { 2460 on_activate => sub {
… …
2266 $BUTTONBAR->show; 2470 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2471 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2472 $MESSAGE_WINDOW->show;
2269 } 2473 }
2270 2474
2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2477
2478 $CAVEAT_LABEL->set_text ("None :)");
2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2481
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2482 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2483}
2273 2484
2274sub video_shutdown { 2485sub video_shutdown {
2275 DC::OpenGL::shutdown; 2486 DC::OpenGL::shutdown;
2487 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2488
2277 undef $SDL_ACTIVE; 2489 undef $SDL_ACTIVE;
2278} 2490}
2279 2491
2280my %animate_object; 2492my %animate_object;
… …
2323 delete $animate_object{$widget}; 2535 delete $animate_object{$widget};
2324} 2536}
2325 2537
2326%SDL_CB = ( 2538%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2539 DC::SDL_QUIT => sub {
2540 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2541 EV::unloop EV::UNLOOP_ALL;
2329 }, 2542 },
2330 DC::SDL_VIDEORESIZE => sub { 2543 DC::SDL_VIDEORESIZE => sub {
2331 }, 2544 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2545 DC::SDL_VIDEOEXPOSE => sub {
… …
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2554# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2555 },
2343 DC::SDL_KEYDOWN => sub { 2556 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2557 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2558 # alt-enter
2559 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2560 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2561 video_init;
2349 } else { 2562 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2563 &DC::UI::feed_sdl_key_down_event;
2351 } 2564 }
2565 update_modbox;
2352 }, 2566 },
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2567 DC::SDL_KEYUP => sub {
2568 &DC::UI::feed_sdl_key_up_event;
2569 update_modbox;
2570 },
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2571 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2572 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2573 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2574 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2575 if ($_[0]{code} == 1) {
… …
2368$SIG{INT} = $SIG{TERM} = sub { 2585$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2586 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2587 #d# TODO calling exit here hangs the process in some futex
2371}; 2588};
2372 2589
2373{ 2590# due to mac os x + sdl combined briandamage, we need this contortion
2591sub main {
2592 {
2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2594
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2595 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2596 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2597 } else {
2377 #TODO: compatibility cruft 2598 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2599 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2600 print STDERR "INFO: used old configuration file\n";
2380 } 2601 }
2381 2602
2382 DC::DB::Server::run; 2603 DC::DB::Server::run;
2383 2604
2605 if ($CFG->{db_schema} < 1) {
2606 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2607 DC::DB::nuke_db;
2608 $CFG->{db_schema} = 1;
2609 DC::write_cfg;
2610 }
2611
2612 DC::DB::open_db;
2613
2384 DC::UI::set_layout ($::CFG->{layout}); 2614 DC::UI::set_layout ($::CFG->{layout});
2385 2615
2386 my %DEF_CFG = ( 2616 my %DEF_CFG = (
2387 sdl_mode => 0, 2617 sdl_mode => undef,
2388 fullscreen => 1, 2618 fullscreen => 1,
2389 fast => 0, 2619 fast => 0,
2390 force_opengl11 => undef, 2620 force_opengl11 => undef,
2621 disable_alpha => 0,
2622 smooth_movement => 1,
2391 texture_compression => 1, 2623 texture_compression => 1,
2392 map_scale => 1, 2624 map_scale => 1,
2393 fow_enable => 1, 2625 fow_enable => 1,
2394 fow_intensity => 0, 2626 fow_intensity => 0,
2395 map_smoothing => 1, 2627 map_smoothing => 1,
2396 gui_fontsize => 1, 2628 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2629 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2630 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2631 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2632 stat_fontsize => 0.7,
2401 mapsize => 100, 2633 mapsize => 100,
2402 audio_enable => 1, 2634 audio_enable => 1,
2403 audio_hw_channels => 0, 2635 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2636 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2637 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2638 audio_mix_channels => 8,
2407 effects_enable => 1, 2639 effects_enable => 1,
2408 effects_volume => 1, 2640 effects_volume => 1,
2409 bgm_enable => 1, 2641 bgm_enable => 1,
2410 bgm_volume => 0.5, 2642 bgm_volume => 0.5,
2411 output_rate => "", 2643 output_rate => "",
2412 pickup => 0, 2644 pickup => 0,
2413 inv_sort => "mtime", 2645 inv_sort => "mtime",
2414 default => "profile", # default profile 2646 default => "profile", # default profile
2415 show_tips => 1, 2647 show_tips => 1,
2416 logview_max_par => 1000, 2648 logview_max_par => 1000,
2649 shift_fire_stop => 0,
2650 uitheme => "wood",
2417 ); 2651 );
2418 2652
2419 while (my ($k, $v) = each %DEF_CFG) { 2653 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2654 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2655 }
2422 2656
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2657 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2658 $PROFILE = $CFG->{profile}{default};
2425 2659
2426 # convert old bindings (only default profile matters) 2660 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2661 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2662 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2663 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2664 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2665 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2666 action => $cmds,
2667 };
2433 }; 2668 }
2434 } 2669 }
2435 } 2670 }
2436 }
2437 2671
2438 sdl_init; 2672 sdl_init;
2439 2673
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2674 {
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2675 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2676 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2677 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2678 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2679 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2680 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2681 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2682 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2683 DejaVuSansMono-BoldOblique.ttf
2458 ); 2684 );
2459 2685
2460 DC::add_font $_ for @fonts; 2686 DC::add_font $_ for @fonts;
2461 2687
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2688 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2689 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2690
2467 $FONT_PROP->make_default; 2691 $FONT_PROP->make_default;
2468 } 2692
2693 DC::pango_init;
2694 }
2469 2695
2470# compare mono (ft) vs. rgba (cairo) 2696# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2697# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2698# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2699# my $t1 = Time::HiRes::time;
… …
2478# } 2704# }
2479# my $t2 = Time::HiRes::time; 2705# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2706# warn $t2-$t1;
2481# } 2707# }
2482 2708
2483 video_init; 2709 video_init;
2484 audio_init; 2710 audio_init;
2485} 2711 }
2486 2712
2487show_tip_of_the_day if $CFG->{show_tips}; 2713 show_tip_of_the_day if $CFG->{show_tips};
2488 2714
2489our $STARTUP_CANCEL = EV::idle sub { 2715 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2716 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2717 $startup_done->();
2492}; 2718 };
2493 2719
2720 delete $SIG{__DIE__};
2494EV::loop; 2721 EV::loop;
2495 2722
2496#video_shutdown; 2723#video_shutdown;
2497#audio_shutdown; 2724#audio_shutdown;
2498DC::OpenGL::quit; 2725 DC::OpenGL::quit;
2499DC::SDL_Quit; 2726 DC::SDL_Quit;
2500DC::DB::Server::stop; 2727 DC::DB::Server::stop;
2728}
2729
2730DC::SDL_braino; # see sub above
2501 2731
2502=head1 NAME 2732=head1 NAME
2503 2733
2504deliantra - A Deliantra MORPG game client 2734deliantra - A Deliantra MORPG game client
2505 2735
… …
2522 4 show fps 2752 4 show fps
2523 8 suppress tooltips 2753 8 suppress tooltips
2524 2754
2525=head1 AUTHOR 2755=head1 AUTHOR
2526 2756
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2758
2529 2759
2530 2760

Diff Legend

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