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.73 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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