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.22 by root, Sat Dec 29 13:44:31 2007 UTC vs.
Revision 1.69 by root, Mon Sep 1 15:08:15 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
81 symlink "libjpeg.62.dylib", "libjpeg.dylib";
74 } 82 }
75 83
76 unshift @INC, $root; 84 unshift @INC, $root;
77 } 85 }
78} 86}
79 87
80# prepend private library directory 88# prepend private library directory
81BEGIN { 89BEGIN {
82 for (grep !ref, @INC) { 90 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 91 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 92 if (-d $path) {
85 unshift @INC, $path; 93 unshift @INC, $path;
86 last; 94 last;
87 } 95 }
88 } 96 }
… …
90 98
91# need to do it again because that pile of garbage called PAR nukes it before main 99# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 100unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 101 if %PAR::LibCache;
94 102
95use Time::HiRes 'time';
96use EV; 103use EV;
104BEGIN { *time = \&EV::time }
105
97use List::Util qw(max min); 106use List::Util qw(max min);
98 107
99use Deliantra; 108use Deliantra;
100use Deliantra::Protocol::Constants; 109use Deliantra::Protocol::Constants;
101 110
111use AnyEvent::Util ();
112use AnyEvent::DNS;
113use AnyEvent::Socket ();
114
102use Compress::LZF; 115use Compress::LZF;
116use JSON::XS;
103 117
104use DC; 118use DC;
119
120sub crash($;$) {
121 # nop during compiletime
122}
123
124BEGIN {
125 $SIG{__DIE__} = sub {
126 return if $^S;
127 crash "CRASH/DIE: $_[0]" => 1;
128 DC::fatal Carp::longmess "$_[0]";
129 }
130}
131
105use DC::OpenGL (); 132use DC::OpenGL ();
106use DC::Protocol; 133use DC::Protocol;
107use DC::DB; 134use DC::DB;
108use DC::UI; 135use DC::UI;
109use DC::UI::Canvas; 136use DC::UI::Canvas;
110use DC::UI::Inventory; 137use DC::UI::Inventory;
111use DC::UI::SpellList; 138use DC::UI::SpellList;
112use DC::UI::Dockable; 139use DC::UI::Dockable;
113use DC::UI::MessageWindow; 140use DC::UI::Dockbar;
114use DC::UI::ChatView; 141use DC::UI::ChatView;
142use DC::MessageDistributor;
115use DC::Pod; 143use DC::Pod;
116use DC::MapWidget; 144use DC::MapWidget;
117use DC::Macro; 145use DC::Macro;
118 146
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 147$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 148$SIG{PIPE} = 'IGNORE';
121 149
122$EV::DIED = sub { 150$EV::DIED = sub {
151 crash "CRASH/EV::DIED: $@" => 1;
123 DC::fatal Carp::longmess $@; 152 DC::fatal Carp::longmess $@;
124}; 153};
125 154
126my $MAX_FPS = 60; 155my $MAX_FPS = 60;
127 156
… …
129 158
130our $LAST_REFRESH; 159our $LAST_REFRESH;
131our $NOW; 160our $NOW;
132 161
133our $CFG; 162our $CFG;
134our $CONN;
135our $PROFILE; # current profile 163our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 164our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 165
138our $WANT_REFRESH; 166our $WANT_REFRESH;
139 167
168our $MODE_SLIDER;
169our $CAVEAT_LABEL;
170
140our @SDL_MODES; 171our @SDL_MODES;
172our $SDL_REINIT = 1;
141our $WIDTH; 173our $WIDTH;
142our $HEIGHT; 174our $HEIGHT;
143our $FULLSCREEN; 175our $FULLSCREEN;
144our $FONTSIZE; 176our $FONTSIZE;
145 177
146our $FONT_PROP; 178our $FONT_PROP;
147our $FONT_FIXED; 179our $FONT_FIXED;
180
181our $CONN;
148 182
149our $MAP; 183our $MAP;
150our $MAPMAP; 184our $MAPMAP;
151our $MAPWIDGET; 185our $MAPWIDGET;
152our $COMPLETER; 186our $COMPLETER;
… …
178our $SPELL_PAGE; 212our $SPELL_PAGE;
179our $SPELL_LIST; 213our $SPELL_LIST;
180 214
181our $HELP_WINDOW; 215our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 216our $MESSAGE_WINDOW;
217our $MESSAGE_DIST;
183our $FLOORBOX; 218our $FLOORBOX;
184our $GAUGES; 219our $GAUGES;
185our $STATWIDS; 220our $STATWIDS;
186 221
187our $SDL_ACTIVE; 222our $SDL_ACTIVE;
188our %SDL_CB; 223our %SDL_CB;
189 224
190our $ALT_ENTER_MESSAGE; 225our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 226our $STATUSBOX;
227our $MODBOX;
192our $DEBUG_STATUS; 228our $DEBUG_STATUS;
193 229
194our $INV; 230our $INV;
195our $INVR; 231our $INVR;
196our $INVR_HB; 232our $INVR_HB;
197 233
198############################################################################# 234#############################################################################
199 235
236# write a crash message blockingly to the socket, if possible
237# this is a bit too complicated for my tastes, but it was easy.
238*crash = sub($;$) {
239 my ($msg, $backtrace) = @_;
240
241 return unless $CONN;
242
243 my $fh = $CONN->{fh}
244 or return;
245
246 my $buf = delete $CONN->{wbuf};
247
248 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
249
250 AnyEvent::Util::fh_nonblocking $fh, 0;
251 syswrite $fh, $buf;
252 AnyEvent::Util::fh_nonblocking $fh, 1;
253
254 $msg =~ s/\s+$//;
255
256 # backtrace as second step, in case it crashes, too
257 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
258 if $backtrace;
259};
260
261#############################################################################
262
200sub status { 263sub status {
201 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
202} 265}
203 266
204sub debug { 267sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 268 $DEBUG_STATUS->set_text ($_[0]);
206} 269}
207 270
208sub message { 271sub message {
209 $MESSAGE_WINDOW->message (@_); 272 $MESSAGE_DIST->message (@_);
273}
274
275sub update_modbox {
276 my $mod = DC::SDL_GetModState;
277
278 my $markup;
279
280 $markup .= $mod & DC::KMOD_CTRL
281 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
282 : "[<span foreground='#888'> once </span>]";
283
284 $markup .= $mod & DC::KMOD_SHIFT
285 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
286 : "[<span foreground='#888'>move</span>]";
287
288 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
289 ? "[ALT]"
290 : "[<span foreground='#888'>alt</span>]";
291
292 $markup .= $mod & DC::KMOD_NUM
293 ? "[NUM]"
294 : "[<span foreground='#888'>num</span>]";
295
296 # <tt> around next statement works around some bug that keeps the
297 # "font =>" from being used on windows
298 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 299}
211 300
212############################################################################# 301#############################################################################
213#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
214 303
… …
634 # right: accept 723 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 724 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 725 text => "Accept",
637 on_activate => sub { 726 on_activate => sub {
638 $conn->send ("reply n"); 727 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 728 destroy_query_dialog $conn;
641 0 729 0
642 }, 730 },
643 ); 731 );
644 732
… …
696 784
697 $vbox->add (@dialog); 785 $vbox->add (@dialog);
698 $dialog->show; 786 $dialog->show;
699} 787}
700 788
701sub start_game { 789sub dc_connect {
702 status "logging in..."; 790 my ($host, $port) = @_;
703
704 $LOGIN_BUTTON->set_text ("Logout");
705 $SETUP_DIALOG->hide;
706 791
707 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 792 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
708 793
709 my ($host, $port) = split /:/, $PROFILE->{host};
710
711 $MAP = new DC::Map;
712
713 $CONN = eval { 794 $CONN =
714 new DC::Protocol 795 new DC::Protocol
715 host => $host, 796 host => $host,
716 port => $port || 13327, 797 port => $port,
717 user => $PROFILE->{user}, 798 user => $PROFILE->{user},
718 pass => $PROFILE->{password}, 799 pass => $PROFILE->{password},
719 mapw => $mapsize, 800 mapw => $mapsize,
720 maph => $mapsize, 801 maph => $mapsize,
721 802
722 client => "cfplus $DC::VERSION $] $^O", 803 client => "$DC::VERSION $] $^O",
723 804
724 map_widget => $MAPWIDGET, 805 map_widget => $MAPWIDGET,
725 statusbox => $STATUSBOX, 806 statusbox => $STATUSBOX,
726 map => $MAP, 807 map => $MAP,
727 mapmap => $MAPMAP, 808 mapmap => $MAPMAP,
728 query => \&server_query, 809 query => \&server_query,
729 810
730 setup_req => { 811 setup_req => {
731 smoothing => $CFG->{map_smoothing}*1, 812 smoothing => $CFG->{map_smoothing}*1,
732 }, 813 },
733 };
734 814
735 if ($CONN) { 815 on_connect => sub {
816 if ($_[0]) {
736 DC::lowdelay fileno $CONN->{fh}; 817 DC::lowdelay fileno $CONN->{fh};
737 818
738 status "login successful"; 819 status "login successful";
820 } else {
821 undef $CONN;
822 status "unable to connect: $!";
823 stop_game();
824 }
825 },
826 ;
827}
828
829sub start_game {
830 status "logging in...";
831
832 $LOGIN_BUTTON->set_text ("Logout");
833 $SETUP_DIALOG->hide;
834
835 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
836
837 $MAP = new DC::Map;
838
839 # hack to make SURE we find the IP address all right
840 # can be removed once AnyEvent::DNS is proven stable.
841 if ($host eq "gameserver.deliantra.net") {
842 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
843 if ($_[0] ne "80.101.114.108") { # Perl
844 status "dns failure, using hardcoded address";
845 $host = "129.13.162.95";
846 }
847
848 dc_connect $host, $port;
849 };
739 } else { 850 } else {
740 status "unable to connect"; 851 dc_connect $host, $port;
741 stop_game();
742 } 852 }
743} 853}
744 854
745sub stop_game { 855sub stop_game {
856 crash "stop_game";
857
746 $LOGIN_BUTTON->set_text ("Login / Register"); 858 $LOGIN_BUTTON->set_text ("Login / Register");
747 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 859 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
748 $SETUP_DIALOG->show; 860 $SETUP_DIALOG->show;
749 $PL_WINDOW->hide; 861 $PL_WINDOW->hide;
750 $SPELL_LIST->clear_spells; 862 $SPELL_LIST->clear_spells;
… …
770 882
771 my $row = 0; 883 my $row = 0;
772 884
773 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 885 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
774 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 886 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
775 can_events => 1, 887 can_events => 1,
776 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 888 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
889
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
891 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
892 can_events => 1,
893 tooltip => "This field shows any known issues with your config or driver, such as "
894 . "a non-accelerated display format. You can try to work around these issues "
895 . "by selecting a different video mode, changing the settings below or "
896 . "by installing the right driver for your graphics card.");
777 897
778 my $vidmode_tooltip = 898 my $vidmode_tooltip =
779 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 899 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
780 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 900 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
781 901
782 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
783 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 903 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
784 904
785 $hbox->add (my $mode_slider = new DC::UI::Slider 905 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
786 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 906 force_w => $WIDTH * 0.1, expand => 1,
907 range => [ ($CFG->{sdl_mode}) x 3 ],
787 tooltip => $vidmode_tooltip); 908 tooltip => $vidmode_tooltip);
788 $hbox->add (my $mode_label = new DC::UI::Label 909 $hbox->add (my $mode_label = new DC::UI::Label
789 height => 0.8, template => "9999x9999@9+9", 910 height => 0.8, template => "9999x9999@9+9",
790 can_events => 1, tooltip => $vidmode_tooltip); 911 can_events => 1, tooltip => $vidmode_tooltip);
791 912
792 $mode_slider->connect (changed => sub { 913 $MODE_SLIDER->connect (changed => sub {
793 my ($self, $value) = @_; 914 my ($self, $value) = @_;
794 915
795 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 916 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
796 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 917 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
797 }); 918 });
798 $mode_slider->emit (changed => $mode_slider->{range}[0]); 919 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
799 920
800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
801 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 922 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
802 state => $CFG->{fullscreen}, 923 state => $CFG->{fullscreen},
803 tooltip => "Bring the client into fullscreen mode.", 924 tooltip => "Bring the client into fullscreen mode.",
… …
805 ); 926 );
806 927
807 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 928 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
808 $table->add_at (1, $row++, new DC::UI::CheckBox 929 $table->add_at (1, $row++, new DC::UI::CheckBox
809 state => $CFG->{force_opengl11}, 930 state => $CFG->{force_opengl11},
810 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 931 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
811 . "higher memory usage and slower performance. It will, however, help tremendously on " 932 . "higher memory usage and slower performance. It will, however, help tremendously on "
812 . "cards that claim to support a feature but fall back to software rendering. " 933 . "cards that claim to support a feature but fall back to software rendering. "
813 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 934 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
814 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 935 . "but cards and drivers from other vendors (ATI) are often just as bad. "
815 . "experience extremely low framerates and your card should do better, try this option.</b>", 936 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
816 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 937 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
938 );
939
940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
941 $table->add_at (1, $row++, new DC::UI::CheckBox
942 state => $CFG->{disable_alpha},
943 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
944 . "by disabling a number of textures and transparency effects. Normally, these "
945 . "effects do not cost a lot of resources, but some graphics cards might fall "
946 . "back to etxremely slow rendering if this is enabled. If disabling this option "
947 . "noticably improves the framerate of the client please report this! "
948 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
949 on_changed => sub {
950 my ($self, $value) = @_;
951 $CFG->{disable_alpha} = $value;
952 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
953 0
954 }
817 ); 955 );
818 956
819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
820 $table->add_at (1, $row++, new DC::UI::CheckBox 958 $table->add_at (1, $row++, new DC::UI::CheckBox
821 state => $CFG->{texture_compression}, 959 state => $CFG->{texture_compression},
822 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 960 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
823 . "will save a lot of memory and increase performance. The compression algorithm " 961 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
824 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 962 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
825 . "forced OpenGL 1.1 mode.", 963 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
826 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 964 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
827 ); 965 );
828 966
829 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
830 $table->add_at (1, $row++, new DC::UI::CheckBox 968 $table->add_at (1, $row++, new DC::UI::CheckBox
… …
848 video_init (); 986 video_init ();
849 0 987 0
850 } 988 }
851 ); 989 );
852 990
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
992 $table->add_at (1, $row++, new DC::UI::CheckBox
993 state => $CFG->{smooth_movement},
994 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
995 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
996 . "then disable this option. Changes take effect immdiately.",
997 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
998 );
999
853 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
854 $table->add_at (1, $row++, new DC::UI::Slider 1001 $table->add_at (1, $row++, new DC::UI::Slider
855 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1002 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
856 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1003 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1004 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
884 $table->add_at (1, $row++, new DC::UI::Slider 1031 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1032 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
886 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1033 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
887 . "but you still need to press apply to correctly re-layout the widget.", 1034 . "but you still need to press apply to correctly re-layout the widget.",
888 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1035 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
889 ); 1036 );
890 1037
891 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
892 $table->add_at (1, $row++, new DC::UI::Slider 1039 $table->add_at (1, $row++, new DC::UI::Slider
893 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1040 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
… …
1495 1 1642 1
1496 }, 1643 },
1497 ); 1644 );
1498 1645
1499 $vbox->add (new DC::UI::FancyFrame 1646 $vbox->add (new DC::UI::FancyFrame
1500 label => "Registering", 1647 label => "How to Play",
1501 min_h => 200, 1648 min_h => 240,
1502 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1649 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1503 markup => 1650 markup =>
1651 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1652 . "Then register a new account (or use an existing one if you have one). "
1504 "To register a new account, choose a username that hasn't been taken yet and " 1653 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1505 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1654 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1506 ), 1655 ),
1507 ); 1656 );
1508 1657
1509 $vbox 1658 $vbox
… …
1525 1674
1526 $vbox->add ( 1675 $vbox->add (
1527 $HOST_ENTRY = new DC::UI::Entry 1676 $HOST_ENTRY = new DC::UI::Entry
1528 expand => 1, 1677 expand => 1,
1529 text => $CFG->{profile}{default}{host}, 1678 text => $CFG->{profile}{default}{host},
1530 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1679 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1531 on_changed => sub { 1680 on_changed => sub {
1532 my ($self, $value) = @_; 1681 my ($self, $value) = @_;
1533 $CFG->{profile}{default}{host} = $value; 1682 $CFG->{profile}{default}{host} = $value;
1534 1 1683 1
1535 } 1684 }
… …
1538 if (0) { #d# disabled 1687 if (0) { #d# disabled
1539 $vbox->add (new DC::UI::Button 1688 $vbox->add (new DC::UI::Button
1540 expand => 1, 1689 expand => 1,
1541 text => "Server List", 1690 text => "Server List",
1542 other => $METASERVER, 1691 other => $METASERVER,
1543 tooltip => "Show a list of available crossfire servers", 1692 tooltip => "Show a list of available Deliantra servers",
1544 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1693 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1545 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1694 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1546 ); 1695 );
1547 }#d# 1696 }#d#
1548 } 1697 }
… …
1590 $CFG->{show_tips} = $value; 1739 $CFG->{show_tips} = $value;
1591 0 1740 0
1592 } 1741 }
1593 ); 1742 );
1594 1743
1595 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size"); 1744 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1596 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1745 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1597 text => $CFG->{logview_max_par}, 1746 text => $CFG->{logview_max_par},
1598 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1747 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1599 . "sends more messages than this number, older messages get removed to save memory and " 1748 . "sends more messages than this number, older messages get removed to save memory and "
1600 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1749 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1601 on_changed => sub { 1750 on_changed => sub {
1602 my ($self, $value) = @_; 1751 my ($self, $value) = @_;
1603 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1752 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1604 0 1753 0
1605 }, 1754 },
1606 ); 1755 );
1607 1756
1608 $table 1757 $table
… …
1655 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1804 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1656 ["Ignore cursed" => PICKUP_NOT_CURSED], 1805 ["Ignore cursed" => PICKUP_NOT_CURSED],
1657 ["Jewelery" => PICKUP_JEWELS], 1806 ["Jewelery" => PICKUP_JEWELS],
1658 ["Flesh" => PICKUP_FLESH], 1807 ["Flesh" => PICKUP_FLESH],
1659 ], 1808 ],
1660 ["Weight/Value ratio", 2, 17] 1809 ["Value/Weight ratio", 2, 17]
1661 ) 1810 )
1662 { 1811 {
1663 my ($title, $x, $y, @bits) = @$_; 1812 my ($title, $x, $y, @bits) = @$_;
1664 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1813 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1665 1814
… …
1690 } 1839 }
1691 1840
1692 $table->add_at (2, 18, new DC::UI::ValSlider 1841 $table->add_at (2, 18, new DC::UI::ValSlider
1693 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1842 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1694 template => ">= 99", 1843 template => ">= 99",
1844 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1695 to_value => sub { ">= " . 5 * $_[0] }, 1845 to_value => sub { ">= " . 5 * $_[0] },
1696 on_changed => sub { 1846 on_changed => sub {
1697 my ($slider, $value) = @_; 1847 my ($slider, $value) = @_;
1698 1848
1699 $::CFG->{pickup} &= ~0xF; 1849 $::CFG->{pickup} &= ~0xF;
… …
1712 1862
1713 $r 1863 $r
1714} 1864}
1715 1865
1716my %SORT_ORDER = ( 1866my %SORT_ORDER = (
1717 type => undef, 1867 type => sub {
1868 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1869 },
1718 mtime => sub { 1870 mtime => sub {
1719 my $NOW = time; 1871 my $NOW = time;
1720 sort { 1872 sort {
1721 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1873 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1722 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1874 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1753 $::CFG->{inv_sort} = $_[1]; 1905 $::CFG->{inv_sort} = $_[1];
1754 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1906 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1755 }, 1907 },
1756 ); 1908 );
1757 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1909 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1758 #TODO# update to weigh/maxweight 1910 #TODO# update to weight/maxweight
1759 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1911 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1760 1912
1761 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1913 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1762 $sw1->add ($INV = new DC::UI::Inventory); 1914 $sw1->add ($INV = new DC::UI::Inventory);
1763 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1915 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1944 my @path = DC::Pod::full_path_of $node; 2096 my @path = DC::Pod::full_path_of $node;
1945 pop @path; # drop current node 2097 pop @path; # drop current node
1946 2098
1947 for my $node (@path) { 2099 for my $node (@path) {
1948 $buttons->add (new DC::UI::Button 2100 $buttons->add (new DC::UI::Button
1949 text => $node->{kw}[0], 2101 text => $node->[DC::Pod::N_KW][0],
1950 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2102 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1951 on_activate => sub { 2103 on_activate => sub {
1952 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2104 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1953 $load_node->($node); 2105 $load_node->($node);
1954 }, 2106 },
1955 ); 2107 );
1956 $buttons->add (new DC::UI::Label text => "/"); 2108 $buttons->add (new DC::UI::Label text => "/");
1957 } 2109 }
1958 2110
1959 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2111 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1960 2112
1961 $curnode = $node; 2113 $curnode = $node;
1962 2114
1963 $viewer->clear; 2115 $viewer->clear;
1964 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2116 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2027 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2179 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2028 ); 2180 );
2029 $hb->add (new DC::UI::Button 2181 $hb->add (new DC::UI::Button
2030 text => "Quit anyway", 2182 text => "Quit anyway",
2031 expand => 1, 2183 expand => 1,
2032 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2184 on_activate => sub {
2185 crash "Quit anyway";
2186 EV::unloop EV::UNLOOP_ALL;
2187 },
2033 ); 2188 );
2034 } 2189 }
2035 2190
2036 $QUIT_DIALOG->show; 2191 $QUIT_DIALOG->show;
2037 $QUIT_DIALOG->grab_focus; 2192 $QUIT_DIALOG->grab_focus;
… …
2090 $dialog->show; 2245 $dialog->show;
2091 }; 2246 };
2092} 2247}
2093 2248
2094sub sdl_init { 2249sub sdl_init {
2095 DC::SDL_Init 2250 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2096 and die "SDL::Init failed!\n"; 2251 and die "SDL::Init failed!\n";
2097} 2252}
2098 2253
2099sub video_init { 2254sub video_init {
2255 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2256 $SDL_REINIT = 0;
2257
2258 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2259 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2260 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2261 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2262
2263 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2264
2100 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2265 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2266 $CFG->{sdl_mode} = 0; # lowest resolution by default
2267
2268 # now choose biggets mode <= 1024x768
2269 for (0 .. $#SDL_MODES) {
2270 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2271 $CFG->{sdl_mode} = $_;
2272 }
2273 }
2274 }
2101 2275
2102 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2276 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2103 2277
2104 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2278 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2105 $FULLSCREEN = $CFG->{fullscreen}; 2279 $FULLSCREEN = $CFG->{fullscreen};
2106 $FAST = $CFG->{fast}; 2280 $FAST = $CFG->{fast};
2107 2281
2282 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2108 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2283 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2284 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2109 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2285 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2110 2286
2111 $SDL_ACTIVE = 1; 2287 $SDL_ACTIVE = 1;
2112 $LAST_REFRESH = time - 0.01; 2288 $LAST_REFRESH = time - 0.01;
2113 2289
… …
2143 force_x => "max", 2319 force_x => "max",
2144 force_y => 0; 2320 force_y => 0;
2145 $DEBUG_STATUS->show; 2321 $DEBUG_STATUS->show;
2146 2322
2147 $STATUSBOX = new DC::UI::Statusbox; 2323 $STATUSBOX = new DC::UI::Statusbox;
2148 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2324
2325 $MODBOX = new DC::UI::Label
2326 can_events => 1,
2327 can_hover => 1,
2328 markup => "",
2329 align => 0,
2330 font => $FONT_FIXED,
2331 tooltip => "#modifier_box",
2332 tooltip_width => 0.67,
2333 ;
2334
2335 update_modbox;
2149 2336
2150 (new DC::UI::Frame 2337 (new DC::UI::Frame
2151 bg => [0, 0, 0, 0.4], 2338 bg => [0, 0, 0, 0.4],
2152 force_x => 0, 2339 force_x => 0,
2153 force_y => "max", 2340 force_y => "max",
2154 child => $STATUSBOX, 2341 child => (my $LR = new DC::UI::VBox),
2155 )->show; 2342 )->show;
2343
2344 $LR->add ($STATUSBOX);
2345 $LR->add ($MODBOX);
2346 $LR->add (new DC::UI::Label
2347 align => 0,
2348 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2349 fontsize => 0.5,
2350 fg => [1, 1, 0, 0.7],
2351 );
2156 2352
2157 DC::UI::Toplevel->new ( 2353 DC::UI::Toplevel->new (
2158 title => "Minimap", 2354 title => "Minimap",
2159 name => "mapmap", 2355 name => "mapmap",
2160 x => 0, 2356 x => 0,
… …
2168 2364
2169 $MAPWIDGET = new DC::MapWidget; 2365 $MAPWIDGET = new DC::MapWidget;
2170 $MAPWIDGET->connect (activate_console => sub { 2366 $MAPWIDGET->connect (activate_console => sub {
2171 my ($mapwidget, $preset) = @_; 2367 my ($mapwidget, $preset) = @_;
2172 2368
2173 $MESSAGE_WINDOW->activate_console ($preset) 2369 $MESSAGE_DIST->activate_console ($preset)
2174 if $MESSAGE_WINDOW; 2370 if $MESSAGE_DIST;
2175 }); 2371 });
2176 $MAPWIDGET->show; 2372 $MAPWIDGET->show;
2177 $MAPWIDGET->grab_focus; 2373 $MAPWIDGET->grab_focus;
2178 2374
2179 $COMPLETER = new DC::MapWidget::Command:: 2375 $COMPLETER = new DC::MapWidget::Command::
… …
2191 force_h => $::HEIGHT * 0.6, 2387 force_h => $::HEIGHT * 0.6,
2192 has_close_button => 1, 2388 has_close_button => 1,
2193 ; 2389 ;
2194 2390
2195 $METASERVER = metaserver_dialog; 2391 $METASERVER = metaserver_dialog;
2392 # the name is changed to not conflict with the older name as users could have hidden it
2196 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2393 $MESSAGE_WINDOW = new DC::UI::Dockbar
2394 name => "message_window2",
2395 title => 'Messages',
2396 force_w => $::WIDTH * 0.6,
2397 force_h => $::HEIGHT * 0.25,
2398 ;
2197 2399
2400 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2401
2198 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2402 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2199 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2403 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2200 2404
2201 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2405 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2202 "Configure the server to play on, your username and password."); 2406 "Configure the server to play on, your username and password.");
2203 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2407 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2221 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2425 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2222 2426
2223 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2427 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2224 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2428 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2225 2429
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2430# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2431# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228 2432
2229 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 2433 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
2230 2434
2231 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2435 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2232 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2436 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2234 $BUTTONBAR->add (new DC::UI::Button 2438 $BUTTONBAR->add (new DC::UI::Button
2235 text => "Save Config", 2439 text => "Save Config",
2236 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2440 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2237 on_activate => sub { 2441 on_activate => sub {
2238 $::CFG->{layout} = DC::UI::get_layout; 2442 $::CFG->{layout} = DC::UI::get_layout;
2239 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2443 DC::write_cfg;
2240 status "Configuration Saved"; 2444 status "Configuration Saved";
2241 0 2445 0
2242 }, 2446 },
2243 ); 2447 );
2244 2448
2245 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2449 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2246 tooltip => "View Documentation"); 2450 tooltip => "View Documentation");
2247
2248 2451
2249 $BUTTONBAR->add (new DC::UI::Button 2452 $BUTTONBAR->add (new DC::UI::Button
2250 text => "Quit", 2453 text => "Quit",
2251 tooltip => "Terminates the program", 2454 tooltip => "Terminates the program",
2252 on_activate => sub { 2455 on_activate => sub {
… …
2262 $BUTTONBAR->show; 2465 $BUTTONBAR->show;
2263 $SETUP_DIALOG->show; 2466 $SETUP_DIALOG->show;
2264 $MESSAGE_WINDOW->show; 2467 $MESSAGE_WINDOW->show;
2265 } 2468 }
2266 2469
2470 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
2471 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2472
2473 $CAVEAT_LABEL->set_text ("None :)");
2474 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2475 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2476
2267 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2477 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2268} 2478}
2269 2479
2270sub video_shutdown { 2480sub video_shutdown {
2271 DC::OpenGL::shutdown; 2481 DC::OpenGL::shutdown;
2482 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2272 2483
2273 undef $SDL_ACTIVE; 2484 undef $SDL_ACTIVE;
2274} 2485}
2275 2486
2276my %animate_object; 2487my %animate_object;
… …
2319 delete $animate_object{$widget}; 2530 delete $animate_object{$widget};
2320} 2531}
2321 2532
2322%SDL_CB = ( 2533%SDL_CB = (
2323 DC::SDL_QUIT => sub { 2534 DC::SDL_QUIT => sub {
2535 crash "SDL_QUIT";
2324 EV::unloop EV::UNLOOP_ALL; 2536 EV::unloop EV::UNLOOP_ALL;
2325 }, 2537 },
2326 DC::SDL_VIDEORESIZE => sub { 2538 DC::SDL_VIDEORESIZE => sub {
2327 }, 2539 },
2328 DC::SDL_VIDEOEXPOSE => sub { 2540 DC::SDL_VIDEOEXPOSE => sub {
… …
2337# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2549# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2338 }, 2550 },
2339 DC::SDL_KEYDOWN => sub { 2551 DC::SDL_KEYDOWN => sub {
2340 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2552 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2341 # alt-enter 2553 # alt-enter
2554 video_shutdown;
2342 $FULLSCREEN_ENABLE->toggle; 2555 $FULLSCREEN_ENABLE->toggle;
2343 video_shutdown;
2344 video_init; 2556 video_init;
2345 } else { 2557 } else {
2346 DC::UI::feed_sdl_key_down_event ($_[0]); 2558 &DC::UI::feed_sdl_key_down_event;
2347 } 2559 }
2560 update_modbox;
2348 }, 2561 },
2349 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2562 DC::SDL_KEYUP => sub {
2563 &DC::UI::feed_sdl_key_up_event;
2564 update_modbox;
2565 },
2350 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2566 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2351 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2567 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2352 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2568 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2353 DC::SDL_USEREVENT => sub { 2569 DC::SDL_USEREVENT => sub {
2354 if ($_[0]{code} == 1) { 2570 if ($_[0]{code} == 1) {
… …
2364$SIG{INT} = $SIG{TERM} = sub { 2580$SIG{INT} = $SIG{TERM} = sub {
2365 EV::unloop; 2581 EV::unloop;
2366 #d# TODO calling exit here hangs the process in some futex 2582 #d# TODO calling exit here hangs the process in some futex
2367}; 2583};
2368 2584
2369{ 2585# due to mac os x + sdl combined briandamage, we need this contortion
2586sub main {
2587 {
2588 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2589
2370 if (-e "$Deliantra::VARDIR/client.cf") { 2590 if (-e "$Deliantra::VARDIR/client.cf") {
2371 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2591 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2372 } else { 2592 } else {
2373 #TODO: compatibility cruft 2593 #TODO: compatibility cruft
2374 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2594 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2375 print STDERR "INFO: used old configuratrion file\n"; 2595 print STDERR "INFO: used old configuration file\n";
2376 } 2596 }
2377 2597
2378 DC::DB::Server::run; 2598 DC::DB::Server::run;
2379 2599
2600 if ($CFG->{db_schema} < 1) {
2601 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2602 DC::DB::nuke_db;
2603 $CFG->{db_schema} = 1;
2604 DC::write_cfg;
2605 }
2606
2607 DC::DB::open_db;
2608
2380 DC::UI::set_layout ($::CFG->{layout}); 2609 DC::UI::set_layout ($::CFG->{layout});
2381 2610
2382 my %DEF_CFG = ( 2611 my %DEF_CFG = (
2383 sdl_mode => 0, 2612 sdl_mode => undef,
2384 fullscreen => 1, 2613 fullscreen => 1,
2385 fast => 0, 2614 fast => 0,
2386 force_opengl11 => undef, 2615 force_opengl11 => undef,
2616 disable_alpha => 0,
2617 smooth_movement => 1,
2387 texture_compression => 1, 2618 texture_compression => 1,
2388 map_scale => 1, 2619 map_scale => 1,
2389 fow_enable => 1, 2620 fow_enable => 1,
2390 fow_intensity => 0, 2621 fow_intensity => 0,
2391 map_smoothing => 1, 2622 map_smoothing => 1,
2392 gui_fontsize => 1, 2623 gui_fontsize => 1,
2393 log_fontsize => 0.7, 2624 log_fontsize => 0.7,
2394 gauge_fontsize => 1, 2625 gauge_fontsize => 1,
2395 gauge_size => 0.35, 2626 gauge_size => 0.35,
2396 stat_fontsize => 0.7, 2627 stat_fontsize => 0.7,
2397 mapsize => 100, 2628 mapsize => 100,
2398 audio_enable => 1, 2629 audio_enable => 1,
2399 audio_hw_channels => 0, 2630 audio_hw_channels => 0,
2400 audio_hw_frequency => 0, 2631 audio_hw_frequency => 0,
2401 audio_hw_chunksize => 0, 2632 audio_hw_chunksize => 0,
2402 audio_mix_channels => 8, 2633 audio_mix_channels => 8,
2403 effects_enable => 1, 2634 effects_enable => 1,
2404 effects_volume => 1, 2635 effects_volume => 1,
2405 bgm_enable => 1, 2636 bgm_enable => 1,
2406 bgm_volume => 0.5, 2637 bgm_volume => 0.5,
2407 output_rate => "", 2638 output_rate => "",
2408 pickup => 0, 2639 pickup => 0,
2409 inv_sort => "mtime", 2640 inv_sort => "mtime",
2410 default => "profile", # default profile 2641 default => "profile", # default profile
2411 show_tips => 1, 2642 show_tips => 1,
2412 logview_max_par => 1000, 2643 logview_max_par => 1000,
2644 shift_fire_stop => 0,
2413 ); 2645 );
2414 2646
2415 while (my ($k, $v) = each %DEF_CFG) { 2647 while (my ($k, $v) = each %DEF_CFG) {
2416 $CFG->{$k} = $v unless exists $CFG->{$k}; 2648 $CFG->{$k} = $v unless exists $CFG->{$k};
2417 } 2649 }
2418 2650
2419 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2651 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2420 $PROFILE = $CFG->{profile}{default}; 2652 $PROFILE = $CFG->{profile}{default};
2421 2653
2422 # convert old bindings (only default profile matters) 2654 # convert old bindings (only default profile matters)
2423 if (my $bindings = delete $PROFILE->{bindings}) { 2655 if (my $bindings = delete $PROFILE->{bindings}) {
2424 while (my ($mod, $syms) = each %$bindings) { 2656 while (my ($mod, $syms) = each %$bindings) {
2425 while (my ($sym, $cmds) = each %$syms) { 2657 while (my ($sym, $cmds) = each %$syms) {
2426 push @{ $PROFILE->{macro} }, { 2658 push @{ $PROFILE->{macro} }, {
2427 accelkey => [$mod*1, $sym*1], 2659 accelkey => [$mod*1, $sym*1],
2428 action => $cmds, 2660 action => $cmds,
2661 };
2429 }; 2662 }
2430 } 2663 }
2431 } 2664 }
2432 }
2433 2665
2434 sdl_init; 2666 sdl_init;
2435 2667
2436 @SDL_MODES = DC::SDL_ListModes 8, 8; 2668 {
2437 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2438 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2439
2440 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2441
2442 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2443
2444 {
2445 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2669 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2446 DejaVuSans.ttf 2670 DejaVuSans.ttf
2447 DejaVuSansMono.ttf 2671 DejaVuSansMono.ttf
2448 DejaVuSans-Bold.ttf 2672 DejaVuSans-Bold.ttf
2449 DejaVuSansMono-Bold.ttf 2673 DejaVuSansMono-Bold.ttf
2450 DejaVuSans-Oblique.ttf 2674 DejaVuSans-Oblique.ttf
2451 DejaVuSansMono-Oblique.ttf 2675 DejaVuSansMono-Oblique.ttf
2452 DejaVuSans-BoldOblique.ttf 2676 DejaVuSans-BoldOblique.ttf
2453 DejaVuSansMono-BoldOblique.ttf 2677 DejaVuSansMono-BoldOblique.ttf
2454 ); 2678 );
2455 2679
2456 DC::add_font $_ for @fonts; 2680 DC::add_font $_ for @fonts;
2457 2681
2458 DC::pango_init;
2459
2460 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2682 $FONT_PROP = new_from_file DC::Font $fonts[0];
2461 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2683 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2462 2684
2463 $FONT_PROP->make_default; 2685 $FONT_PROP->make_default;
2464 } 2686
2687 DC::pango_init;
2688 }
2465 2689
2466# compare mono (ft) vs. rgba (cairo) 2690# compare mono (ft) vs. rgba (cairo)
2467# ft - 1.8s, cairo 3s, even in alpha-only mode 2691# ft - 1.8s, cairo 3s, even in alpha-only mode
2468# for my $rgba (0..1) { 2692# for my $rgba (0..1) {
2469# my $t1 = Time::HiRes::time; 2693# my $t1 = Time::HiRes::time;
… …
2474# } 2698# }
2475# my $t2 = Time::HiRes::time; 2699# my $t2 = Time::HiRes::time;
2476# warn $t2-$t1; 2700# warn $t2-$t1;
2477# } 2701# }
2478 2702
2479 video_init; 2703 video_init;
2480 audio_init; 2704 audio_init;
2481} 2705 }
2482 2706
2483show_tip_of_the_day if $CFG->{show_tips}; 2707 show_tip_of_the_day if $CFG->{show_tips};
2484 2708
2485our $STARTUP_CANCEL = EV::idle sub { 2709 our $STARTUP_CANCEL = EV::idle sub {
2486 undef $::STARTUP_CANCEL; 2710 undef $::STARTUP_CANCEL;
2487 $startup_done->(); 2711 $startup_done->();
2488}; 2712 };
2489 2713
2714 delete $SIG{__DIE__};
2490EV::loop; 2715 EV::loop;
2491 2716
2492#video_shutdown; 2717#video_shutdown;
2493#audio_shutdown; 2718#audio_shutdown;
2494DC::OpenGL::quit; 2719 DC::OpenGL::quit;
2495DC::SDL_Quit; 2720 DC::SDL_Quit;
2496DC::DB::Server::stop; 2721 DC::DB::Server::stop;
2722}
2723
2724DC::SDL_braino; # see sub above
2497 2725
2498=head1 NAME 2726=head1 NAME
2499 2727
2500deliantra - A Deliantra MORPG game client 2728deliantra - A Deliantra MORPG game client
2501 2729
… …
2518 4 show fps 2746 4 show fps
2519 8 suppress tooltips 2747 8 suppress tooltips
2520 2748
2521=head1 AUTHOR 2749=head1 AUTHOR
2522 2750
2523Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2751Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2524 2752
2525 2753
2526 2754

Diff Legend

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