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.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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