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.20 by root, Fri Dec 28 11:44:02 2007 UTC vs.
Revision 1.73 by root, Wed Sep 3 06:07:39 2008 UTC

… …
49 } 49 }
50 } 50 }
51 51
52 if ($^O eq "MSWin32") { 52 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 53 # pango is relocatable on win32
54 } else { 54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion" 55 open my $fh, "<:perlio", "$root/pangoversion"
56 or die "pangoversion: $!"; 56 or die "pangoversion: $!";
57 my $PANGO = <$fh>; 57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file 58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
… …
69 69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 70 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!"; 72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; 73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else {
75 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things
74 } 81 }
75 82
76 unshift @INC, $root; 83 unshift @INC, $root;
77 } 84 }
78} 85}
79 86
80# prepend private library directory 87# prepend private library directory
81BEGIN { 88BEGIN {
82 for (grep !ref, @INC) { 89 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 90 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 91 if (-d $path) {
85 unshift @INC, $path; 92 unshift @INC, $path;
86 last; 93 last;
87 } 94 }
88 } 95 }
… …
90 97
91# need to do it again because that pile of garbage called PAR nukes it before main 98# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 99unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 100 if %PAR::LibCache;
94 101
95use Time::HiRes 'time';
96use EV; 102use EV;
103BEGIN { *time = \&EV::time }
104
97use List::Util qw(max min); 105use List::Util qw(max min);
98 106
99use Deliantra; 107use Deliantra;
100use Deliantra::Protocol::Constants; 108use Deliantra::Protocol::Constants;
101 109
110use AnyEvent::Util ();
111use AnyEvent::DNS;
112use AnyEvent::Socket ();
113
102use Compress::LZF; 114use Compress::LZF;
115use JSON::XS;
103 116
104use DC; 117use DC;
118
119sub crash($;$) {
120 # nop during compiletime
121}
122
123BEGIN {
124 $SIG{__DIE__} = sub {
125 return if $^S;
126 crash "CRASH/DIE: $_[0]" => 1;
127 DC::fatal Carp::longmess "$_[0]";
128 }
129}
130
105use DC::OpenGL (); 131use DC::OpenGL ();
106use DC::Protocol; 132use DC::Protocol;
107use DC::DB; 133use DC::DB;
108use DC::UI; 134use DC::UI;
109use DC::UI::Canvas; 135use DC::UI::Canvas;
110use DC::UI::Inventory; 136use DC::UI::Inventory;
111use DC::UI::SpellList; 137use DC::UI::SpellList;
112use DC::UI::Dockable; 138use DC::UI::Dockable;
113use DC::UI::MessageWindow; 139use DC::UI::Dockbar;
114use DC::UI::ChatView; 140use DC::UI::ChatView;
141use DC::MessageDistributor;
115use DC::Pod; 142use DC::Pod;
116use DC::MapWidget; 143use DC::MapWidget;
117use DC::Macro; 144use DC::Macro;
118 145
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 146$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 147$SIG{PIPE} = 'IGNORE';
121 148
122$EV::DIED = sub { 149$EV::DIED = sub {
150 crash "CRASH/EV::DIED: $@" => 1;
123 DC::fatal Carp::longmess $@; 151 DC::fatal Carp::longmess $@;
124}; 152};
125 153
126my $MAX_FPS = 60; 154my $MAX_FPS = 60;
127 155
… …
129 157
130our $LAST_REFRESH; 158our $LAST_REFRESH;
131our $NOW; 159our $NOW;
132 160
133our $CFG; 161our $CFG;
134our $CONN;
135our $PROFILE; # current profile 162our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 163our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 164
138our $WANT_REFRESH; 165our $WANT_REFRESH;
139 166
167our $MODE_SLIDER;
168our $CAVEAT_LABEL;
169
140our @SDL_MODES; 170our @SDL_MODES;
171our $SDL_REINIT = 1;
141our $WIDTH; 172our $WIDTH;
142our $HEIGHT; 173our $HEIGHT;
143our $FULLSCREEN; 174our $FULLSCREEN;
144our $FONTSIZE; 175our $FONTSIZE;
145 176
146our $FONT_PROP; 177our $FONT_PROP;
147our $FONT_FIXED; 178our $FONT_FIXED;
179
180our $CONN;
148 181
149our $MAP; 182our $MAP;
150our $MAPMAP; 183our $MAPMAP;
151our $MAPWIDGET; 184our $MAPWIDGET;
152our $COMPLETER; 185our $COMPLETER;
… …
178our $SPELL_PAGE; 211our $SPELL_PAGE;
179our $SPELL_LIST; 212our $SPELL_LIST;
180 213
181our $HELP_WINDOW; 214our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 215our $MESSAGE_WINDOW;
216our $MESSAGE_DIST;
183our $FLOORBOX; 217our $FLOORBOX;
184our $GAUGES; 218our $GAUGES;
185our $STATWIDS; 219our $STATWIDS;
186 220
187our $SDL_ACTIVE; 221our $SDL_ACTIVE;
188our %SDL_CB; 222our %SDL_CB;
189 223
190our $ALT_ENTER_MESSAGE; 224our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 225our $STATUSBOX;
226our $MODBOX;
192our $DEBUG_STATUS; 227our $DEBUG_STATUS;
193 228
194our $INV; 229our $INV;
195our $INVR; 230our $INVR;
196our $INVR_HB; 231our $INVR_HB;
197 232
198############################################################################# 233#############################################################################
199 234
235# write a crash message blockingly to the socket, if possible
236# this is a bit too complicated for my tastes, but it was easy.
237*crash = sub($;$) {
238 my ($msg, $backtrace) = @_;
239
240 return unless $CONN;
241
242 my $fh = $CONN->{fh}
243 or return;
244
245 my $buf = delete $CONN->{wbuf};
246
247 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
248
249 AnyEvent::Util::fh_nonblocking $fh, 0;
250 syswrite $fh, $buf;
251 AnyEvent::Util::fh_nonblocking $fh, 1;
252
253 $msg =~ s/\s+$//;
254
255 # backtrace as second step, in case it crashes, too
256 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
257 if $backtrace;
258};
259
260#############################################################################
261
200sub status { 262sub status {
201 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
202} 264}
203 265
204sub debug { 266sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 267 $DEBUG_STATUS->set_text ($_[0]);
206} 268}
207 269
208sub message { 270sub message {
209 $MESSAGE_WINDOW->message (@_); 271 $MESSAGE_DIST->message (@_);
272}
273
274sub update_modbox {
275 my $mod = DC::SDL_GetModState;
276
277 my $markup;
278
279 $markup .= $mod & DC::KMOD_CTRL
280 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
281 : "[<span foreground='#888'> once </span>]";
282
283 $markup .= $mod & DC::KMOD_SHIFT
284 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
285 : "[<span foreground='#888'>move</span>]";
286
287 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
288 ? "[ALT]"
289 : "[<span foreground='#888'>alt</span>]";
290
291 $markup .= $mod & DC::KMOD_NUM
292 ? "[NUM]"
293 : "[<span foreground='#888'>num</span>]";
294
295 # <tt> around next statement works around some bug that keeps the
296 # "font =>" from being used on windows
297 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 298}
211 299
212############################################################################# 300#############################################################################
213#TODO: maybe move into own audio module... 301#TODO: maybe move into own audio module...
214 302
… …
634 # right: accept 722 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 723 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 724 text => "Accept",
637 on_activate => sub { 725 on_activate => sub {
638 $conn->send ("reply n"); 726 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 727 destroy_query_dialog $conn;
641 0 728 0
642 }, 729 },
643 ); 730 );
644 731
… …
653 [Cha => CS_STAT_CHA], 740 [Cha => CS_STAT_CHA],
654 ) { 741 ) {
655 my ($name, $id) = @$_; 742 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 743 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 744 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 745 expand => 1,
660 can_events => 1, 746 can_events => 1,
661 can_hover => 1, 747 can_hover => 1,
662 tooltip => "#stat_$name", 748 tooltip => "#stat_$name",
663 ); 749 );
… …
697 783
698 $vbox->add (@dialog); 784 $vbox->add (@dialog);
699 $dialog->show; 785 $dialog->show;
700} 786}
701 787
702sub start_game { 788sub dc_connect {
703 status "logging in..."; 789 my ($host, $port) = @_;
704
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707 790
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 791 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
709 792
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 793 $CONN =
715 new DC::Protocol 794 new DC::Protocol
716 host => $host, 795 host => $host,
717 port => $port || 13327, 796 port => $port,
718 user => $PROFILE->{user}, 797 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 798 pass => $PROFILE->{password},
720 mapw => $mapsize, 799 mapw => $mapsize,
721 maph => $mapsize, 800 maph => $mapsize,
722 801
723 client => "cfplus $DC::VERSION $] $^O", 802 client => "$DC::VERSION $] $^O",
724 803
725 map_widget => $MAPWIDGET, 804 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 805 statusbox => $STATUSBOX,
727 map => $MAP, 806 map => $MAP,
728 mapmap => $MAPMAP, 807 mapmap => $MAPMAP,
729 query => \&server_query, 808 query => \&server_query,
730 809
731 setup_req => { 810 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 811 smoothing => $CFG->{map_smoothing}*1,
733 }, 812 },
734 };
735 813
736 if ($CONN) { 814 on_connect => sub {
815 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 816 DC::lowdelay fileno $CONN->{fh};
738 817
739 status "login successful"; 818 status "login successful";
819 } else {
820 undef $CONN;
821 status "unable to connect: $!";
822 stop_game();
823 }
824 },
825 ;
826}
827
828sub start_game {
829 status "logging in...";
830
831 $LOGIN_BUTTON->set_text ("Logout");
832 $SETUP_DIALOG->hide;
833
834 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
835
836 $MAP = new DC::Map;
837
838 # hack to make SURE we find the IP address all right
839 # can be removed once AnyEvent::DNS is proven stable.
840 if ($host eq "gameserver.deliantra.net") {
841 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
842 if ($_[0] ne "80.101.114.108") { # Perl
843 status "dns failure, using hardcoded address";
844 $host = "129.13.162.95";
845 }
846
847 dc_connect $host, $port;
848 };
740 } else { 849 } else {
741 status "unable to connect"; 850 dc_connect $host, $port;
742 stop_game();
743 } 851 }
744} 852}
745 853
746sub stop_game { 854sub stop_game {
855 crash "stop_game";
856
747 $LOGIN_BUTTON->set_text ("Login / Register"); 857 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 858 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
749 $SETUP_DIALOG->show; 859 $SETUP_DIALOG->show;
750 $PL_WINDOW->hide; 860 $PL_WINDOW->hide;
751 $SPELL_LIST->clear_spells; 861 $SPELL_LIST->clear_spells;
… …
769 879
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 880 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 881
772 my $row = 0; 882 my $row = 0;
773 883
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 884 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 885 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
776 can_events => 1, 886 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 887 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
888
889 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
890 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
891 can_events => 1,
892 tooltip => "This field shows any known issues with your config or driver, such as "
893 . "a non-accelerated display format. You can try to work around these issues "
894 . "by selecting a different video mode, changing the settings below or "
895 . "by installing the right driver for your graphics card.");
778 896
779 my $vidmode_tooltip = 897 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 898 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
781 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 899 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 900
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 902 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 903
786 $hbox->add (my $mode_slider = new DC::UI::Slider 904 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 905 force_w => $WIDTH * 0.1, expand => 1,
906 range => [ ($CFG->{sdl_mode}) x 3 ],
788 tooltip => $vidmode_tooltip); 907 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 908 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 909 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 910 can_events => 1, tooltip => $vidmode_tooltip);
792 911
793 $mode_slider->connect (changed => sub { 912 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 913 my ($self, $value) = @_;
795 914
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 915 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 916 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 917 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 918 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 919
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 922 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 923 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 924 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 925 );
807 926
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 928 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 929 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 930 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 931 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 932 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 933 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 934 . "but cards and drivers from other vendors (ATI) are often just as bad. "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 935 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 936 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 937 );
819 938
939 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
940 $table->add_at (1, $row++, new DC::UI::CheckBox
941 state => $CFG->{disable_alpha},
942 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
943 . "by disabling a number of textures and transparency effects. Normally, these "
944 . "effects do not cost a lot of resources, but some graphics cards might fall "
945 . "back to etxremely slow rendering if this is enabled. If disabling this option "
946 . "noticably improves the framerate of the client please report this! "
947 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
948 on_changed => sub {
949 my ($self, $value) = @_;
950 $CFG->{disable_alpha} = $value;
951 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
952 0
953 }
954 );
955
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 956 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 957 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 958 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 959 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 960 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 961 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 962 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 963 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 964 );
829 965
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 966 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 967 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 968 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 969 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 970 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 971 );
836 972
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 973 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 974 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 975 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 976 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 977 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 978 );
843 979
844 $table->add_at (1, $row++, new DC::UI::Button 980 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 981 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 982 tooltip => "Apply the video settings above.",
847 on_activate => sub { 983 on_activate => sub {
848 video_shutdown (); 984 video_shutdown ();
849 video_init (); 985 video_init ();
850 0 986 0
851 } 987 }
852 ); 988 );
853 989
990 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
991 $table->add_at (1, $row++, new DC::UI::CheckBox
992 state => $CFG->{smooth_movement},
993 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
994 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
995 . "then disable this option. Changes take effect immdiately.",
996 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
997 );
998
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1001 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1002 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 1004 );
860 1005
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1007 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 1008 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1009 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 1010 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 1011 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1012 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 1013 );
869 1014
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1015 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 1016 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 1017 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1018 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 1020 );
876 1021
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1022 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 1023 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1024 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1025 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1026 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 1027 );
883 1028
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 1030 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1031 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1032 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 1033 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1034 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 1035 );
891 1036
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1037 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 1038 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1039 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1040 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 1041 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 1042 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 1043 &set_gauge_window_fontsize;
899 0 1044 0
900 } 1045 }
901 ); 1046 );
902 1047
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1050 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1051 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 1052 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1053 $CFG->{gauge_size} = $_[1];
… …
942 1087
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1088 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1089
945 my $row = 0; 1090 my $row = 0;
946 1091
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1092 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1093 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1094 state => $CFG->{audio_enable},
950 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1095 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1096 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1097 );
953 1098
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1099 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1100 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1101 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1102 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1103 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1104 $CFG->{effects_enable} = $_[1];
… …
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1111 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1112 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1113 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1114 );
970 1115
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1116 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1117 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1118 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1119 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1120 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1121 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1128 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1129 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1130 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1131 );
987 1132
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1133 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1134 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1135 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1136 value => $CFG->{audio_hw_frequency},
992 options => [ 1137 options => [
993 [ 0, "default" , "Use System Default"], 1138 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1147 audio_tab_update;
1003 1 1148 1
1004 } 1149 }
1005 ); 1150 );
1006 1151
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1152 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1153 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1154 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1155 value => $CFG->{audio_hw_channels},
1011 options => [ 1156 options => [
1012 [0, "default" , "Use System Default"], 1157 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1166 audio_tab_update;
1022 1 1167 1
1023 } 1168 }
1024 ); 1169 );
1025 1170
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1171 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1172 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1173 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1174 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1175 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1176 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1180 1
1036 } 1181 }
1037 ); 1182 );
1038 1183
1039 # should really be a slider 1184 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1185 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1186 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1187 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1188 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1189 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1190 template => ">= 99",
… …
1051 1; 1196 1;
1052 } 1197 }
1053 ); 1198 );
1054 1199
1055 $table->add_at (1, $row++, new DC::UI::Button 1200 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1201 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1202 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1203 on_activate => sub {
1059 audio_shutdown (); 1204 audio_shutdown ();
1060 audio_init (); 1205 audio_init ();
1061 0 1206 0
… …
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1256 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1257 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1258 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1259 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115 1260
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1261 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress); 1262 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress); 1263 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1264 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120 1265
1121 $GAUGES = { 1266 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg, 1267 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng, 1268 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1269 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1140 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1285 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1141 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1286 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1142 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1287 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1143 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1288 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1144 1289
1145 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1290 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1146 1291
1147 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1292 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1148 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2); 1293 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1149 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 ); 1294 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1150 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2); 1295 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
… …
1190 $vb->add (new DC::UI::FancyFrame 1335 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1336 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1337 child => (my $pi = new DC::UI::VBox),
1193 ); 1338 );
1194 1339
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1340 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1341 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1342 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1343 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1344 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1345 tooltip => "The map you are currently on (if supported by the server).");
1201 1346
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1347 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1348 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1349 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1350 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1351 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1352 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1353 tooltip => "The weight limit: you cannot carry more than this.");
1209 1354
1210 $vb->add (new DC::UI::FancyFrame 1355 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1356 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1377 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1378 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1379 my ($col, $row, $id, $label, $template) = @$_;
1235 1380
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1381 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1382 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1383 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1384 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1385 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1386 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1387 }
1243 1388
1244 $vb->add (new DC::UI::FancyFrame 1389 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1390 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1391 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1392 );
1248 1393
1249 my $row = 0; 1394 my $row = 0;
1250 my $col = 0; 1395 my $col = 0;
1251 1396
… …
1290 1435
1291 for (qw/slow holyw conf fire depl magic 1436 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1437 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1438 blind fear tund elec cold ghit/)
1294 { 1439 {
1295 $tbl2->add_at ($col, $row, 1440 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1441 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1442 new DC::UI::Label
1298 font => $FONT_FIXED, 1443 font => $FONT_FIXED,
1299 template => "-100%", 1444 template => "-100%",
1300 align => +1, 1445 align => 1,
1301 valign => 0,
1302 can_events => 1, 1446 can_events => 1,
1303 can_hover => 1, 1447 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1448 tooltip => $resist_names{$_}->[1],
1305 ); 1449 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1450 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1452 can_hover => 1,
1309 can_events => 1, 1453 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1454 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1455 tooltip => $resist_names{$_}->[1],
1312 ); 1456 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1457 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1458 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1459 font => $FONT_FIXED,
1460 align => 1,
1316 can_hover => 1, 1461 can_hover => 1,
1317 can_events => 1, 1462 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1463 tooltip => $resist_names{$_}->[1],
1319 ); 1464 );
1320 1465
1321 $row++; 1466 $row++;
1322 if ($row % 6 == 0) { 1467 if ($row % 6 == 0) {
1323 $col += 3; 1468 $col += 4;
1324 $row = 0; 1469 $row = 0;
1325 } 1470 }
1326 } 1471 }
1327 1472
1328 #update_stats_window ({}); 1473 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1519 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1520 "Short information about this server provided by its admins.",
1376 ); 1521 );
1377 my @col = qw(#Users Host Uptime Version Description); 1522 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1523 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1524 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1525 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1526 for 0 .. $#col;
1383 1527
1384 my @align = qw(1 0 1 1 -1); 1528 my @align = qw(1 0.5 1 1 0);
1385 1529
1386 my $y = 0; 1530 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1531 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1532 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1533 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1614 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1615 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1616 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1617 );
1474 1618
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1619 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1620 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1621 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1622 tooltip => "The name of your character on the server.",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1623 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1624 );
1481 1625
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1626 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1627 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1628 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1629 hidden => 1,
1486 tooltip => "The password for your character.", 1630 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1631 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1632 );
1489 1633
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1634 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1635 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1636 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1637 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1638 on_activate => sub {
1496 $CONN ? stop_game 1639 $CONN ? stop_game
1497 : start_game; 1640 : start_game;
1498 1 1641 1
1499 }, 1642 },
1500 ); 1643 );
1501 1644
1502 $vbox->add (new DC::UI::FancyFrame 1645 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1646 label => "How to Play",
1504 min_h => 200, 1647 min_h => 240,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1648 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1649 markup =>
1650 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1651 . "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 " 1652 . "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.", 1653 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1654 ),
1510 ); 1655 );
1511 1656
1512 $vbox 1657 $vbox
… …
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1665 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1666 );
1522 1667
1523 my $row = 0; 1668 my $row = 0;
1524 1669
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1670 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1671 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1672 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1673
1529 $vbox->add ( 1674 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1675 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1676 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1677 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1678 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1679 on_changed => sub {
1535 my ($self, $value) = @_; 1680 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1681 $CFG->{profile}{default}{host} = $value;
1537 1 1682 1
1538 } 1683 }
… …
1541 if (0) { #d# disabled 1686 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1687 $vbox->add (new DC::UI::Button
1543 expand => 1, 1688 expand => 1,
1544 text => "Server List", 1689 text => "Server List",
1545 other => $METASERVER, 1690 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1691 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1692 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1693 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1694 );
1550 }#d# 1695 }#d#
1551 } 1696 }
1552 1697
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1698 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1699 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1700 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1701 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1702 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1703 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1704 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1705 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1706 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1707 );
1563 1708
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1709 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1710 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1711 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1712 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1713 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1714 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1582sub client_setup { 1727sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1728 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1729
1585 my $row = 0; 1730 my $row = 0;
1586 1731
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1732 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1733 $table->add_at (1, $row++, new DC::UI::CheckBox
1589 state => $CFG->{show_tips}, 1734 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1735 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1736 on_changed => sub {
1592 my ($self, $value) = @_; 1737 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1738 $CFG->{show_tips} = $value;
1594 0 1739 0
1595 } 1740 }
1596 ); 1741 );
1597 1742
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1743 $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 1744 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1600 text => $CFG->{logview_max_par}, 1745 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1746 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 " 1747 . "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.", 1748 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1749 on_changed => sub {
1605 my ($self, $value) = @_; 1750 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1751 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1752 0
1608 }, 1753 },
1609 ); 1754 );
1610 1755
1611 $table 1756 $table
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1803 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1804 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1805 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1806 ["Flesh" => PICKUP_FLESH],
1662 ], 1807 ],
1663 ["Weight/Value ratio", 2, 17] 1808 ["Value/Weight ratio", 2, 17]
1664 ) 1809 )
1665 { 1810 {
1666 my ($title, $x, $y, @bits) = @$_; 1811 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1812 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1813
… …
1693 } 1838 }
1694 1839
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1840 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1841 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1842 template => ">= 99",
1843 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] }, 1844 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1845 on_changed => sub {
1700 my ($slider, $value) = @_; 1846 my ($slider, $value) = @_;
1701 1847
1702 $::CFG->{pickup} &= ~0xF; 1848 $::CFG->{pickup} &= ~0xF;
… …
1715 1861
1716 $r 1862 $r
1717} 1863}
1718 1864
1719my %SORT_ORDER = ( 1865my %SORT_ORDER = (
1720 type => undef, 1866 type => sub {
1867 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1868 },
1721 mtime => sub { 1869 mtime => sub {
1722 my $NOW = time; 1870 my $NOW = time;
1723 sort { 1871 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1872 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; 1873 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1737 1885
1738sub inventory_widget { 1886sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1887 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1888
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1889 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1890 $vb1->add (new DC::UI::Label text => "Player");
1743 1891
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1892 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1893
1746 use sort 'stable'; 1894 use sort 'stable';
1747 1895
… …
1756 $::CFG->{inv_sort} = $_[1]; 1904 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1905 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1906 },
1759 ); 1907 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1908 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1909 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1910 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1911
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1912 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1913 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1914 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1915
… …
1947 my @path = DC::Pod::full_path_of $node; 2095 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2096 pop @path; # drop current node
1949 2097
1950 for my $node (@path) { 2098 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2099 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2100 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2101 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2102 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2103 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2104 $load_node->($node);
1957 }, 2105 },
1958 ); 2106 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2107 $buttons->add (new DC::UI::Label text => "/");
1960 } 2108 }
1961 2109
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2110 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2111
1964 $curnode = $node; 2112 $curnode = $node;
1965 2113
1966 $viewer->clear; 2114 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2115 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2178 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2179 );
2032 $hb->add (new DC::UI::Button 2180 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2181 text => "Quit anyway",
2034 expand => 1, 2182 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2183 on_activate => sub {
2184 crash "Quit anyway";
2185 EV::unloop EV::UNLOOP_ALL;
2186 },
2036 ); 2187 );
2037 } 2188 }
2038 2189
2039 $QUIT_DIALOG->show; 2190 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2191 $QUIT_DIALOG->grab_focus;
… …
2093 $dialog->show; 2244 $dialog->show;
2094 }; 2245 };
2095} 2246}
2096 2247
2097sub sdl_init { 2248sub sdl_init {
2098 DC::SDL_Init 2249 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2250 and die "SDL::Init failed!\n";
2100} 2251}
2101 2252
2102sub video_init { 2253sub video_init {
2254 DC::set_theme $CFG->{theme};
2255
2256 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2257 $SDL_REINIT = 0;
2258
2259 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2260 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2261 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2262 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2263
2264 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2265
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2266 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2267 $CFG->{sdl_mode} = 0; # lowest resolution by default
2268
2269 # now choose biggest mode <= 1024x768
2270 for (0 .. $#SDL_MODES) {
2271 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2272 $CFG->{sdl_mode} = $_;
2273 }
2274 }
2275 }
2104 2276
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2277 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2278
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2279 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2280 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2281 $FAST = $CFG->{fast};
2110 2282
2283 # 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 2284 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2285 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2286 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2287
2114 $SDL_ACTIVE = 1; 2288 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2289 $LAST_REFRESH = time - 0.01;
2116 2290
… …
2146 force_x => "max", 2320 force_x => "max",
2147 force_y => 0; 2321 force_y => 0;
2148 $DEBUG_STATUS->show; 2322 $DEBUG_STATUS->show;
2149 2323
2150 $STATUSBOX = new DC::UI::Statusbox; 2324 $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]); 2325
2326 $MODBOX = new DC::UI::Label
2327 can_events => 1,
2328 can_hover => 1,
2329 markup => "",
2330 align => 0,
2331 font => $FONT_FIXED,
2332 tooltip => "#modifier_box",
2333 tooltip_width => 0.67,
2334 ;
2335
2336 update_modbox;
2152 2337
2153 (new DC::UI::Frame 2338 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2339 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2340 force_x => 0,
2156 force_y => "max", 2341 force_y => "max",
2157 child => $STATUSBOX, 2342 child => (my $LR = new DC::UI::VBox),
2158 )->show; 2343 )->show;
2344
2345 $LR->add ($STATUSBOX);
2346 $LR->add ($MODBOX);
2347 $LR->add (new DC::UI::Label
2348 align => 0,
2349 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2350 fontsize => 0.5,
2351 fg => [1, 1, 0, 0.7],
2352 );
2159 2353
2160 DC::UI::Toplevel->new ( 2354 DC::UI::Toplevel->new (
2161 title => "Minimap", 2355 title => "Minimap",
2162 name => "mapmap", 2356 name => "mapmap",
2163 x => 0, 2357 x => 0,
… …
2171 2365
2172 $MAPWIDGET = new DC::MapWidget; 2366 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2367 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2368 my ($mapwidget, $preset) = @_;
2175 2369
2176 $MESSAGE_WINDOW->activate_console ($preset) 2370 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2371 if $MESSAGE_DIST;
2178 }); 2372 });
2179 $MAPWIDGET->show; 2373 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2374 $MAPWIDGET->grab_focus;
2181 2375
2182 $COMPLETER = new DC::MapWidget::Command:: 2376 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2388 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2389 has_close_button => 1,
2196 ; 2390 ;
2197 2391
2198 $METASERVER = metaserver_dialog; 2392 $METASERVER = metaserver_dialog;
2393 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2394 $MESSAGE_WINDOW = new DC::UI::Dockbar
2395 name => "message_window2",
2396 title => 'Messages',
2397 force_w => $::WIDTH * 0.6,
2398 force_h => $::HEIGHT * 0.25,
2399 ;
2200 2400
2401 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2402
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2403 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2404 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2405
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2406 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2407 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2408 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2426 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2225 2427
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2428 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2429 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228 2430
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2431# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2432# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231 2433
2232 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 2434 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
2233 2435
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window, 2436 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2437 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
… …
2237 $BUTTONBAR->add (new DC::UI::Button 2439 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config", 2440 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2441 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub { 2442 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout; 2443 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf"; 2444 DC::write_cfg;
2243 status "Configuration Saved"; 2445 status "Configuration Saved";
2244 0 2446 0
2245 }, 2447 },
2246 ); 2448 );
2247 2449
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2450 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation"); 2451 tooltip => "View Documentation");
2250
2251 2452
2252 $BUTTONBAR->add (new DC::UI::Button 2453 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit", 2454 text => "Quit",
2254 tooltip => "Terminates the program", 2455 tooltip => "Terminates the program",
2255 on_activate => sub { 2456 on_activate => sub {
… …
2265 $BUTTONBAR->show; 2466 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2467 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2468 $MESSAGE_WINDOW->show;
2268 } 2469 }
2269 2470
2471 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2472 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2473
2474 $CAVEAT_LABEL->set_text ("None :)");
2475 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2476 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2477
2270 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2478 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2271} 2479}
2272 2480
2273sub video_shutdown { 2481sub video_shutdown {
2274 DC::OpenGL::shutdown; 2482 DC::OpenGL::shutdown;
2483 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2484
2276 undef $SDL_ACTIVE; 2485 undef $SDL_ACTIVE;
2277} 2486}
2278 2487
2279my %animate_object; 2488my %animate_object;
… …
2322 delete $animate_object{$widget}; 2531 delete $animate_object{$widget};
2323} 2532}
2324 2533
2325%SDL_CB = ( 2534%SDL_CB = (
2326 DC::SDL_QUIT => sub { 2535 DC::SDL_QUIT => sub {
2536 crash "SDL_QUIT";
2327 EV::unloop EV::UNLOOP_ALL; 2537 EV::unloop EV::UNLOOP_ALL;
2328 }, 2538 },
2329 DC::SDL_VIDEORESIZE => sub { 2539 DC::SDL_VIDEORESIZE => sub {
2330 }, 2540 },
2331 DC::SDL_VIDEOEXPOSE => sub { 2541 DC::SDL_VIDEOEXPOSE => sub {
… …
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2550# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2551 },
2342 DC::SDL_KEYDOWN => sub { 2552 DC::SDL_KEYDOWN => sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2553 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2554 # alt-enter
2555 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2556 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2557 video_init;
2348 } else { 2558 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2559 &DC::UI::feed_sdl_key_down_event;
2350 } 2560 }
2561 update_modbox;
2351 }, 2562 },
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2563 DC::SDL_KEYUP => sub {
2564 &DC::UI::feed_sdl_key_up_event;
2565 update_modbox;
2566 },
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2567 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2568 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2569 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2570 DC::SDL_USEREVENT => sub {
2357 if ($_[0]{code} == 1) { 2571 if ($_[0]{code} == 1) {
… …
2367$SIG{INT} = $SIG{TERM} = sub { 2581$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2582 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2583 #d# TODO calling exit here hangs the process in some futex
2370}; 2584};
2371 2585
2372{ 2586# due to mac os x + sdl combined briandamage, we need this contortion
2587sub main {
2588 {
2589 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2590
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2591 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2592 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2593 } else {
2376 #TODO: compatibility cruft 2594 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2595 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2596 print STDERR "INFO: used old configuration file\n";
2379 } 2597 }
2380 2598
2381 DC::DB::Server::run; 2599 DC::DB::Server::run;
2382 2600
2601 if ($CFG->{db_schema} < 1) {
2602 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2603 DC::DB::nuke_db;
2604 $CFG->{db_schema} = 1;
2605 DC::write_cfg;
2606 }
2607
2608 DC::DB::open_db;
2609
2383 DC::UI::set_layout ($::CFG->{layout}); 2610 DC::UI::set_layout ($::CFG->{layout});
2384 2611
2385 my %DEF_CFG = ( 2612 my %DEF_CFG = (
2386 sdl_mode => 0, 2613 sdl_mode => undef,
2387 fullscreen => 1, 2614 fullscreen => 1,
2388 fast => 0, 2615 fast => 0,
2389 force_opengl11 => undef, 2616 force_opengl11 => undef,
2617 disable_alpha => 0,
2618 smooth_movement => 1,
2390 texture_compression => 1, 2619 texture_compression => 1,
2391 map_scale => 1, 2620 map_scale => 1,
2392 fow_enable => 1, 2621 fow_enable => 1,
2393 fow_intensity => 0, 2622 fow_intensity => 0,
2394 map_smoothing => 1, 2623 map_smoothing => 1,
2395 gui_fontsize => 1, 2624 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2625 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2626 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2627 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2628 stat_fontsize => 0.7,
2400 mapsize => 100, 2629 mapsize => 100,
2401 audio_enable => 1, 2630 audio_enable => 1,
2402 audio_hw_channels => 0, 2631 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2632 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2633 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2634 audio_mix_channels => 8,
2406 effects_enable => 1, 2635 effects_enable => 1,
2407 effects_volume => 1, 2636 effects_volume => 1,
2408 bgm_enable => 1, 2637 bgm_enable => 1,
2409 bgm_volume => 0.5, 2638 bgm_volume => 0.5,
2410 output_rate => "", 2639 output_rate => "",
2411 pickup => 0, 2640 pickup => 0,
2412 inv_sort => "mtime", 2641 inv_sort => "mtime",
2413 default => "profile", # default profile 2642 default => "profile", # default profile
2414 show_tips => 1, 2643 show_tips => 1,
2415 logview_max_par => 1000, 2644 logview_max_par => 1000,
2645 shift_fire_stop => 0,
2646 theme => "wood",
2416 ); 2647 );
2417 2648
2418 while (my ($k, $v) = each %DEF_CFG) { 2649 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2650 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2651 }
2421 2652
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2653 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2423 $PROFILE = $CFG->{profile}{default}; 2654 $PROFILE = $CFG->{profile}{default};
2424 2655
2425 # convert old bindings (only default profile matters) 2656 # convert old bindings (only default profile matters)
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2657 if (my $bindings = delete $PROFILE->{bindings}) {
2427 while (my ($mod, $syms) = each %$bindings) { 2658 while (my ($mod, $syms) = each %$bindings) {
2428 while (my ($sym, $cmds) = each %$syms) { 2659 while (my ($sym, $cmds) = each %$syms) {
2429 push @{ $PROFILE->{macro} }, { 2660 push @{ $PROFILE->{macro} }, {
2430 accelkey => [$mod*1, $sym*1], 2661 accelkey => [$mod*1, $sym*1],
2431 action => $cmds, 2662 action => $cmds,
2663 };
2432 }; 2664 }
2433 } 2665 }
2434 } 2666 }
2435 }
2436 2667
2437 sdl_init; 2668 sdl_init;
2438 2669
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2670 {
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2441 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2442
2443 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2444
2445 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2446
2447 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2671 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2672 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2673 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2674 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2675 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2676 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2677 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2678 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2679 DejaVuSansMono-BoldOblique.ttf
2457 ); 2680 );
2458 2681
2459 DC::add_font $_ for @fonts; 2682 DC::add_font $_ for @fonts;
2460 2683
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2684 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2685 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2686
2466 $FONT_PROP->make_default; 2687 $FONT_PROP->make_default;
2467 } 2688
2689 DC::pango_init;
2690 }
2468 2691
2469# compare mono (ft) vs. rgba (cairo) 2692# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2693# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2694# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2695# my $t1 = Time::HiRes::time;
… …
2477# } 2700# }
2478# my $t2 = Time::HiRes::time; 2701# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2702# warn $t2-$t1;
2480# } 2703# }
2481 2704
2482 video_init; 2705 video_init;
2483 audio_init; 2706 audio_init;
2484} 2707 }
2485 2708
2486show_tip_of_the_day if $CFG->{show_tips}; 2709 show_tip_of_the_day if $CFG->{show_tips};
2487 2710
2488our $STARTUP_CANCEL = EV::idle sub { 2711 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2712 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2713 $startup_done->();
2491}; 2714 };
2492 2715
2716 delete $SIG{__DIE__};
2493EV::loop; 2717 EV::loop;
2494 2718
2495#video_shutdown; 2719#video_shutdown;
2496#audio_shutdown; 2720#audio_shutdown;
2497DC::OpenGL::quit; 2721 DC::OpenGL::quit;
2498DC::SDL_Quit; 2722 DC::SDL_Quit;
2499DC::DB::Server::stop; 2723 DC::DB::Server::stop;
2724}
2725
2726DC::SDL_braino; # see sub above
2500 2727
2501=head1 NAME 2728=head1 NAME
2502 2729
2503deliantra - A Deliantra MORPG game client 2730deliantra - A Deliantra MORPG game client
2504 2731
… …
2521 4 show fps 2748 4 show fps
2522 8 suppress tooltips 2749 8 suppress tooltips
2523 2750
2524=head1 AUTHOR 2751=head1 AUTHOR
2525 2752
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2753Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2754
2528 2755
2529 2756

Diff Legend

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