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.76 by root, Wed Sep 3 12:50:43 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines