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.18 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.79 by root, Fri Dec 19 22:06:53 2008 UTC

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

Diff Legend

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