ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.21 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.94 by root, Sun Mar 29 22:28:13 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
86 last; 76 last;
87 } 77 }
88 } 78 }
… …
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
93use AnyEvent::Util ();
94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
96
102use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
103 99
104use DC; 100use DC;
101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
105use DC::OpenGL (); 114use DC::OpenGL ();
106use DC::Protocol; 115use DC::Protocol;
107use DC::DB; 116use DC::DB;
108use DC::UI; 117use DC::UI;
109use DC::UI::Canvas; 118use DC::UI::Canvas;
110use DC::UI::Inventory; 119use DC::UI::Inventory;
111use DC::UI::SpellList; 120use DC::UI::SpellList;
112use DC::UI::Dockable; 121use DC::UI::Dockable;
113use DC::UI::MessageWindow; 122use DC::UI::Dockbar;
114use DC::UI::ChatView; 123use DC::UI::ChatView;
124use DC::MessageDistributor;
115use DC::Pod; 125use DC::Pod;
116use DC::MapWidget; 126use DC::MapWidget;
117use DC::Macro; 127use DC::Macro;
118 128
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
121 131
122$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
123 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
124}; 135};
125 136
126my $MAX_FPS = 60; 137my $MAX_FPS = 60;
127 138
… …
129 140
130our $LAST_REFRESH; 141our $LAST_REFRESH;
131our $NOW; 142our $NOW;
132 143
133our $CFG; 144our $CFG;
134our $CONN;
135our $PROFILE; # current profile 145our $PROFILE; # current profile
136our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
137 147
138our $WANT_REFRESH; 148our $WANT_REFRESH;
139 149
150our $MODE_SLIDER;
151our $CAVEAT_LABEL;
152
140our @SDL_MODES; 153our @SDL_MODES;
154our $SDL_REINIT = 1;
141our $WIDTH; 155our $WIDTH;
142our $HEIGHT; 156our $HEIGHT;
143our $FULLSCREEN; 157our $FULLSCREEN;
144our $FONTSIZE; 158our $FONTSIZE;
145 159
146our $FONT_PROP; 160our $FONT_PROP;
147our $FONT_FIXED; 161our $FONT_FIXED;
148 162
163our $CONN;
164
149our $MAP; 165our $MAP;
150our $MAPMAP; 166our $MAPMAP;
151our $MAPWIDGET; 167our $MAPWIDGET;
152our $COMPLETER; 168our $COMPLETER;
153our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
154our $METASERVER; 173our $METASERVER;
155our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
156our $QUIT_DIALOG; 175our $QUIT_DIALOG;
157our $HOST_ENTRY; 176our $HOST_ENTRY;
158our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
178our $SPELL_PAGE; 197our $SPELL_PAGE;
179our $SPELL_LIST; 198our $SPELL_LIST;
180 199
181our $HELP_WINDOW; 200our $HELP_WINDOW;
182our $MESSAGE_WINDOW; 201our $MESSAGE_WINDOW;
202our $MESSAGE_DIST;
183our $FLOORBOX; 203our $FLOORBOX;
184our $GAUGES; 204our $GAUGES;
185our $STATWIDS; 205our $STATWIDS;
186 206
187our $SDL_ACTIVE; 207our $SDL_ACTIVE;
188our %SDL_CB; 208our @SDL_CB;
189 209
190our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
191our $STATUSBOX; 211our $STATUSBOX;
212our $MODBOX;
192our $DEBUG_STATUS; 213our $DEBUG_STATUS;
193 214
194our $INV; 215our $INV;
195our $INVR; 216our $INVR;
196our $INVR_HB; 217our $INVR_HB;
197 218
198############################################################################# 219#############################################################################
199 220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
258
259#############################################################################
260
200sub status { 261sub status {
201 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
202} 263}
203 264
204sub debug { 265sub debug {
205 $DEBUG_STATUS->set_text ($_[0]); 266 $DEBUG_STATUS->set_text ($_[0]);
206} 267}
207 268
208sub message { 269sub message {
209 $MESSAGE_WINDOW->message (@_); 270 $MESSAGE_DIST->message (@_);
271}
272
273sub update_modbox {
274 my $mod = DC::SDL_GetModState;
275
276 my $markup;
277
278 $markup .= $mod & DC::KMOD_CTRL
279 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
280 : "[<span foreground='#888'> once </span>]";
281
282 $markup .= $mod & DC::KMOD_SHIFT
283 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
284 : "[<span foreground='#888'>move</span>]";
285
286 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
287 ? "[ALT]"
288 : "[<span foreground='#888'>alt</span>]";
289
290 $markup .= $mod & DC::KMOD_NUM
291 ? "[NUM]"
292 : "[<span foreground='#888'>num</span>]";
293
294 # <tt> around next statement works around some bug that keeps the
295 # "font =>" from being used on windows
296 $MODBOX->set_markup ("<tt>$markup</tt>");
210} 297}
211 298
212############################################################################# 299#############################################################################
213#TODO: maybe move into own audio module... 300#TODO: maybe move into own audio module...
214 301
… …
257 or return; 344 or return;
258 345
259 $meta->{data} 346 $meta->{data}
260 or return; 347 or return;
261 348
262 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
263 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
264 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
265 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
266 &audio_music_push ($face); 353 &audio_music_push ($face);
267 } 354 }
268 } else { 355 } else {
269 # fetch from database 356 # fetch from database
270 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
271 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
272 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
273 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
274 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
275 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
276 363
277 audio_sound_push ($face); 364 audio_sound_push ($face);
278 }; 365 };
… …
325 412
326 audio_music_update_volume; 413 audio_music_update_volume;
327 414
328 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
329 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
330 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
331 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
332 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
333 423
334 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
335 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
336 426
337 my $NOW = time; 427 my $NOW = time;
338 428
339 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
340 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
634 # right: accept 724 # right: accept
635 $table->add_at (4, 0, new DC::UI::Button 725 $table->add_at (4, 0, new DC::UI::Button
636 text => "Accept", 726 text => "Accept",
637 on_activate => sub { 727 on_activate => sub {
638 $conn->send ("reply n"); 728 $conn->send ("reply n");
639 $STATS_PAGE->hide;
640 destroy_query_dialog $conn; 729 destroy_query_dialog $conn;
641 0 730 0
642 }, 731 },
643 ); 732 );
644 733
… …
653 [Cha => CS_STAT_CHA], 742 [Cha => CS_STAT_CHA],
654 ) { 743 ) {
655 my ($name, $id) = @$_; 744 my ($name, $id) = @$_;
656 $hbox->add (new DC::UI::Label 745 $hbox->add (new DC::UI::Label
657 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 746 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
658 align => 0,
659 expand => 1, 747 expand => 1,
660 can_events => 1, 748 can_events => 1,
661 can_hover => 1, 749 can_hover => 1,
662 tooltip => "#stat_$name", 750 tooltip => "#stat_$name",
663 ); 751 );
… …
697 785
698 $vbox->add (@dialog); 786 $vbox->add (@dialog);
699 $dialog->show; 787 $dialog->show;
700} 788}
701 789
702sub start_game { 790sub dc_connect {
703 status "logging in..."; 791 my ($host, $port) = @_;
704 792
705 $LOGIN_BUTTON->set_text ("Logout");
706 $SETUP_DIALOG->hide;
707
708 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 793 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
794 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
709 795
710 my ($host, $port) = split /:/, $PROFILE->{host};
711
712 $MAP = new DC::Map;
713
714 $CONN = eval { 796 $CONN =
715 new DC::Protocol 797 new DC::Protocol
716 host => $host, 798 host => $host,
717 port => $port || 13327, 799 port => $port,
718 user => $PROFILE->{user}, 800 user => $PROFILE->{user},
719 pass => $PROFILE->{password}, 801 pass => $PROFILE->{password},
720 mapw => $mapsize, 802 mapw => $mapw,
721 maph => $mapsize, 803 maph => $maph,
722 804
723 client => "cfplus $DC::VERSION $] $^O", 805 client => "$DC::VERSION $] $^O",
724 806
725 map_widget => $MAPWIDGET, 807 map_widget => $MAPWIDGET,
726 statusbox => $STATUSBOX, 808 statusbox => $STATUSBOX,
727 map => $MAP, 809 map => $MAP,
728 mapmap => $MAPMAP, 810 mapmap => $MAPMAP,
729 query => \&server_query, 811 query => \&server_query,
730 812
731 setup_req => { 813 setup_req => {
732 smoothing => $CFG->{map_smoothing}*1, 814 smoothing => $CFG->{map_smoothing}*1,
733 }, 815 },
734 };
735 816
736 if ($CONN) { 817 on_connect => sub {
818 if ($_[0]) {
737 DC::lowdelay fileno $CONN->{fh}; 819 DC::lowdelay fileno $CONN->{fh};
738 820
739 status "login successful"; 821 status "successfully connected to the server";
822 } else {
823 undef $CONN;
824 status "unable to connect: $!";
825 stop_game();
826 }
827 },
828 ;
829}
830
831sub start_game {
832 status "logging in...";
833
834 $LOGIN_BUTTON->set_text ("Logout");
835 $SETUP_DIALOG->hide;
836
837 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
838
839 $MAP = new DC::Map;
840
841 # hack to make SURE we find the IP address all right
842 # can be removed once AnyEvent::DNS is proven stable.
843 if ($host eq "gameserver.deliantra.net") {
844 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
845 if ($_[0] ne "80.101.114.108") { # Perl
846 status "dns failure, using hardcoded address";
847 $host = "129.13.162.95";
848 }
849
850 dc_connect $host, $port;
851 };
740 } else { 852 } else {
741 status "unable to connect"; 853 dc_connect $host, $port;
742 stop_game();
743 } 854 }
744} 855}
745 856
746sub stop_game { 857sub stop_game {
858 crash "stop_game";
859
747 $LOGIN_BUTTON->set_text ("Login / Register"); 860 $LOGIN_BUTTON->set_text ("Login / Register");
748 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 861 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
749 $SETUP_DIALOG->show; 862 $SETUP_DIALOG->show;
750 $PL_WINDOW->hide; 863 $PL_WINDOW->hide;
751 $SPELL_LIST->clear_spells; 864 $SPELL_LIST->clear_spells;
… …
765} 878}
766 879
767sub graphics_setup { 880sub graphics_setup {
768 my $vbox = new DC::UI::VBox; 881 my $vbox = new DC::UI::VBox;
769 882
883 {
884 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
885
770 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 886 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
771 887
772 my $row = 0; 888 my $row = 0;
773 889
774 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
775 $table->add_at (1, $row++, new DC::UI::Label valign => 0, fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 891 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
776 can_events => 1, 892 can_events => 1,
777 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 893 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
778 894
895 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
896 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
897 can_events => 1,
898 tooltip => "This field shows any known issues with your config or driver, such as "
899 . "a non-accelerated display format. You can try to work around these issues "
900 . "by selecting a different video mode, changing the settings below or "
901 . "by installing the right driver for your graphics card.");
902
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
904 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
905 value => $CFG->{uitheme},
906 options => [
907 [wood => "Wood (the default)"],
908 [plain => "Plain (very)"],
909 [blue => "Blue (dark)"],
910 [metal => "Metal (light)"],
911 ],
912 tooltip => "Choose the User Interface theme that you like most :)",
913 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
914 );
915
779 my $vidmode_tooltip = 916 my $vidmode_tooltip =
780 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 917 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
781 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 918 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
782 919
783 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Video Mode"); 920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
784 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 921 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
785 922
786 $hbox->add (my $mode_slider = new DC::UI::Slider 923 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
787 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 924 c_rescale => 1,
925 force_w => $WIDTH * 0.1, expand => 1,
926 range => [ ($CFG->{sdl_mode}) x 3 ],
788 tooltip => $vidmode_tooltip); 927 tooltip => $vidmode_tooltip);
789 $hbox->add (my $mode_label = new DC::UI::Label 928 $hbox->add (my $mode_label = new DC::UI::Label
790 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 929 height => 0.8, template => "9999x9999@9+9",
791 can_events => 1, tooltip => $vidmode_tooltip); 930 can_events => 1, tooltip => $vidmode_tooltip);
792 931
793 $mode_slider->connect (changed => sub { 932 $MODE_SLIDER->connect (changed => sub {
794 my ($self, $value) = @_; 933 my ($self, $value) = @_;
795 934
796 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 935 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
797 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 936 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
798 }); 937 });
799 $mode_slider->emit (changed => $mode_slider->{range}[0]); 938 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
800 939
801 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fullscreen"); 940 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
802 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 941 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
803 state => $CFG->{fullscreen}, 942 state => $CFG->{fullscreen},
804 tooltip => "Bring the client into fullscreen mode.", 943 tooltip => "Bring the client into fullscreen mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 944 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
806 ); 945 );
807 946
808 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
809 $table->add_at (1, $row++, new DC::UI::CheckBox 948 $table->add_at (1, $row++, new DC::UI::CheckBox
810 state => $CFG->{force_opengl11}, 949 state => $CFG->{force_opengl11},
811 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 950 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
812 . "higher memory usage and slower performance. It will, however, help tremendously on " 951 . "higher memory usage and slower performance. It will, however, help tremendously on "
813 . "cards that claim to support a feature but fall back to software rendering. " 952 . "cards that claim to support a feature but fall back to software rendering. "
814 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 953 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
815 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 954 . "but cards and drivers from other vendors (ATI) are often just as bad. "
816 . "experience extremely low framerates and your card should do better, try this option.</b>", 955 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 956 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
818 ); 957 );
819 958
820 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Compress Textures"); 959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
821 $table->add_at (1, $row++, new DC::UI::CheckBox 960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{disable_alpha},
962 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
963 . "by disabling a number of textures and transparency effects. Normally, these "
964 . "effects do not cost a lot of resources, but some graphics cards might fall "
965 . "back to extremely slow rendering if this is enabled. If disabling this option "
966 . "noticably improves the framerate of the client please report this! "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub {
969 my ($self, $value) = @_;
970 $CFG->{disable_alpha} = $value;
971 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
972 0
973 }
974 );
975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{texture_compression}, 978 state => $CFG->{texture_compression},
823 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 979 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
824 . "will save a lot of memory and increase performance. The compression algorithm " 980 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
825 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 981 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
826 . "forced OpenGL 1.1 mode.", 982 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
827 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 983 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
828 ); 984 );
829 985
830 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
831 $table->add_at (1, $row++, new DC::UI::CheckBox 987 $table->add_at (1, $row++, new DC::UI::CheckBox
832 state => $CFG->{fast}, 988 state => $CFG->{fast},
833 tooltip => "Lower the visual quality considerably to speed up rendering.", 989 tooltip => "Lower the visual quality considerably to speed up rendering.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 990 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
835 ); 991 );
836 992
837 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
838 $table->add_at (1, $row++, new DC::UI::Slider 994 $table->add_at (1, $row++, new DC::UI::Slider
839 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 995 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
840 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 996 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
841 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 997 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
842 ); 998 );
843 999
844 $table->add_at (1, $row++, new DC::UI::Button 1000 $table->add_at (1, $row++, new DC::UI::Button
845 expand => 1, align => 0, text => "Apply", 1001 expand => 1, text => "Apply",
846 tooltip => "Apply the video settings above.", 1002 tooltip => "Apply the video settings above.",
847 on_activate => sub { 1003 on_activate => sub {
848 video_shutdown (); 1004 video_shutdown ();
849 video_init (); 1005 video_init ();
1006 0
850 0 1007 }
851 } 1008 );
1009 }
1010
1011 {
1012 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1013
1014 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1015
1016 my $row = 0;
1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1018 $table->add_at (1, $row++, new DC::UI::CheckBox
1019 state => $CFG->{smooth_movement},
1020 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1021 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1022 . "then disable this option. Changes take effect immdiately.",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
852 ); 1024 );
853 1025
854 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Scale"); 1026 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
855 $table->add_at (1, $row++, new DC::UI::Slider 1027 $table->add_at (1, $row++, new DC::UI::Slider
856 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1028 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
857 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1029 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
858 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1030 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
859 ); 1031 );
860 1032
861 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1033 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
862 $table->add_at (1, $row++, new DC::UI::CheckBox 1034 $table->add_at (1, $row++, new DC::UI::CheckBox
863 state => $CFG->{map_smoothing}, 1035 state => $CFG->{map_smoothing},
864 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1036 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
865 . "This increases load on the graphics subsystem and works only with TRT servers. " 1037 . "This increases load on the graphics subsystem and works only with TRT servers. "
866 . "Changes take effect at next login only.", 1038 . "Changes take effect at next login only.",
867 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1039 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
868 ); 1040 );
869 1041
870 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Fog of War"); 1042 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
871 $table->add_at (1, $row++, new DC::UI::CheckBox 1043 $table->add_at (1, $row++, new DC::UI::CheckBox
872 state => $CFG->{fow_enable}, 1044 state => $CFG->{fow_enable},
873 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1045 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
874 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1046 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
875 ); 1047 );
876 1048
877 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
878 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1051 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
880 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1052 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
881 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
882 ); 1054 );
883 1055
884 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
885 $table->add_at (1, $row++, new DC::UI::Slider 1057 $table->add_at (1, $row++, new DC::UI::Slider
886 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1058 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
887 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1059 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
888 . "but you still need to press apply to correctly re-layout the widget.", 1060 . "but you still need to press apply to correctly re-layout the widget.",
889 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1061 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
890 ); 1062 );
891 1063
892 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
893 $table->add_at (1, $row++, new DC::UI::Slider 1065 $table->add_at (1, $row++, new DC::UI::Slider
894 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1066 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
895 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1067 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
896 on_changed => sub { 1068 on_changed => sub {
897 $CFG->{gauge_fontsize} = $_[1]; 1069 $CFG->{gauge_fontsize} = $_[1];
898 &set_gauge_window_fontsize; 1070 &set_gauge_window_fontsize;
1071 0
899 0 1072 }
900 } 1073 );
901 );
902 1074
903 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Gauge size"); 1075 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
904 $table->add_at (1, $row++, new DC::UI::Slider 1076 $table->add_at (1, $row++, new DC::UI::Slider
905 range => [$CFG->{gauge_size}, 0.2, 0.8], 1077 range => [$CFG->{gauge_size}, 0.2, 0.8],
906 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1078 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
907 on_changed => sub { 1079 on_changed => sub {
908 $CFG->{gauge_size} = $_[1]; 1080 $CFG->{gauge_size} = $_[1];
909 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1081 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1082 0
910 0 1083 }
911 } 1084 );
912 ); 1085 }
913 1086
914 $vbox 1087 $vbox
915} 1088}
916 1089
917our $AUDIO_HW_CHUNKSIZE; 1090our $AUDIO_HW_CHUNKSIZE;
… …
942 1115
943 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]); 1116 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
944 1117
945 my $row = 0; 1118 my $row = 0;
946 1119
947 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1120 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
948 $table->add_at (1, $row++, new DC::UI::CheckBox 1121 $table->add_at (1, $row++, new DC::UI::CheckBox
949 state => $CFG->{audio_enable}, 1122 state => $CFG->{audio_enable},
950 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 1123 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
951 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1124 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
952 ); 1125 );
953 1126
954 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1127 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
955 $table->add_at (1, $row, new DC::UI::CheckBox 1128 $table->add_at (1, $row, new DC::UI::CheckBox
956 expand => 1, state => $CFG->{effects_enable}, 1129 expand => 1, state => $CFG->{effects_enable},
957 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1130 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
958 on_changed => sub { 1131 on_changed => sub {
959 $CFG->{effects_enable} = $_[1]; 1132 $CFG->{effects_enable} = $_[1];
… …
966 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 1139 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
967 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 1140 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
968 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1141 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
969 ); 1142 );
970 1143
971 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Background Music"); 1144 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
972 $table->add_at (1, $row, new DC::UI::CheckBox 1145 $table->add_at (1, $row, new DC::UI::CheckBox
973 expand => 1, state => $CFG->{bgm_enable}, 1146 expand => 1, state => $CFG->{bgm_enable},
974 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1147 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
975 on_changed => sub { 1148 on_changed => sub {
976 $CFG->{bgm_enable} = $_[1]; 1149 $CFG->{bgm_enable} = $_[1];
… …
983 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1156 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
984 tooltip => "The volume of the background music. Changes are instant.", 1157 tooltip => "The volume of the background music. Changes are instant.",
985 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1158 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
986 ); 1159 );
987 1160
988 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Frequency"); 1161 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
989 $table->add_at (1, $row++, new DC::UI::Selector 1162 $table->add_at (1, $row++, new DC::UI::Selector
990 c_colspan => 2, expand => 1, 1163 c_colspan => 2, expand => 1,
991 value => $CFG->{audio_hw_frequency}, 1164 value => $CFG->{audio_hw_frequency},
992 options => [ 1165 options => [
993 [ 0, "default" , "Use System Default"], 1166 [ 0, "default" , "Use System Default"],
… …
1002 audio_tab_update; 1175 audio_tab_update;
1003 1 1176 1
1004 } 1177 }
1005 ); 1178 );
1006 1179
1007 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Channels"); 1180 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1008 $table->add_at (1, $row++, new DC::UI::Selector 1181 $table->add_at (1, $row++, new DC::UI::Selector
1009 c_colspan => 2, expand => 1, 1182 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_channels}, 1183 value => $CFG->{audio_hw_channels},
1011 options => [ 1184 options => [
1012 [0, "default" , "Use System Default"], 1185 [0, "default" , "Use System Default"],
… …
1021 audio_tab_update; 1194 audio_tab_update;
1022 1 1195 1
1023 } 1196 }
1024 ); 1197 );
1025 1198
1026 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Latency"); 1199 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1027 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector 1200 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1028 c_colspan => 2, expand => 1, 1201 c_colspan => 2, expand => 1,
1029 value => $CFG->{audio_hw_chunksize}, 1202 value => $CFG->{audio_hw_chunksize},
1030 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1203 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1031 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1204 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
… …
1035 1 1208 1
1036 } 1209 }
1037 ); 1210 );
1038 1211
1039 # should really be a slider 1212 # should really be a slider
1040 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1213 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1041 $table->add_at (1, $row++, new DC::UI::ValSlider 1214 $table->add_at (1, $row++, new DC::UI::ValSlider
1042 c_colspan => 2, expand => 1, 1215 c_colspan => 2, expand => 1,
1043 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1216 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1044 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1217 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1045 template => ">= 99", 1218 template => ">= 99",
… …
1051 1; 1224 1;
1052 } 1225 }
1053 ); 1226 );
1054 1227
1055 $table->add_at (1, $row++, new DC::UI::Button 1228 $table->add_at (1, $row++, new DC::UI::Button
1056 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1229 c_colspan => 2, expand => 1, text => "Apply",
1057 tooltip => "Apply the audio settings", 1230 tooltip => "Apply the audio settings",
1058 on_activate => sub { 1231 on_activate => sub {
1059 audio_shutdown (); 1232 audio_shutdown ();
1060 audio_init (); 1233 audio_init ();
1061 0 1234 0
… …
1080} 1253}
1081 1254
1082sub make_gauge_window { 1255sub make_gauge_window {
1083 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1256 my $gh = int $HEIGHT * $CFG->{gauge_size};
1084 1257
1085 my $win = new DC::UI::Frame ( 1258 $GAUGES->{win} = my $win = new DC::UI::Frame (
1086 force_x => 0, 1259 force_x => 0,
1087 force_y => "max", 1260 force_y => "max",
1088 force_w => $WIDTH, 1261 force_w => $WIDTH,
1089 force_h => $gh, 1262 force_h => $gh,
1090 ); 1263 );
… …
1106 (new DC::UI::Empty expand => 1), 1279 (new DC::UI::Empty expand => 1),
1107 (my $hb = new DC::UI::HBox), 1280 (my $hb = new DC::UI::HBox),
1108 ], 1281 ],
1109 ); 1282 );
1110 1283
1111 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1284 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1112 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1285 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1113 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1286 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1114 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1287 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1115
1116 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1117 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1118 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1120
1121 $GAUGES = {
1122 exp => $exp, prg => $prg, sklprg => $sklprg,
1123 win => $win, range => $rng,
1124 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1125 };
1126 1288
1127 &set_gauge_window_fontsize; 1289 &set_gauge_window_fontsize;
1128 1290
1129 $win 1291 $win
1130} 1292}
… …
1190 $vb->add (new DC::UI::FancyFrame 1352 $vb->add (new DC::UI::FancyFrame
1191 label => "Player", 1353 label => "Player",
1192 child => (my $pi = new DC::UI::VBox), 1354 child => (my $pi = new DC::UI::VBox),
1193 ); 1355 );
1194 1356
1195 $pi->add ($STATWIDS->{title} = new DC::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1357 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1196 can_hover => 1, can_events => 1, 1358 can_hover => 1, can_events => 1,
1197 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1359 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1198 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1360 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1199 can_hover => 1, can_events => 1, 1361 can_hover => 1, can_events => 1,
1200 tooltip => "The map you are currently on (if supported by the server)."); 1362 tooltip => "The map you are currently on (if supported by the server).");
1201 1363
1202 $pi->add (my $hb0 = new DC::UI::HBox); 1364 $pi->add (my $hb0 = new DC::UI::HBox);
1203 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1365 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1204 can_hover => 1, can_events => 1, 1366 can_hover => 1, can_events => 1,
1205 tooltip => "The weight of the player including all inventory items."); 1367 tooltip => "The weight of the player including all inventory items.");
1206 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1368 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1207 can_hover => 1, can_events => 1, 1369 can_hover => 1, can_events => 1,
1208 tooltip => "The weight limit: you cannot carry more than this."); 1370 tooltip => "The weight limit: you cannot carry more than this.");
1209 1371
1210 $vb->add (new DC::UI::FancyFrame 1372 $vb->add (new DC::UI::FancyFrame
1211 label => "Primary/Secondary Statistics", 1373 label => "Primary/Secondary Statistics",
… …
1232 [2, 5, st_wspd => "WSp", 10.54], 1394 [2, 5, st_wspd => "WSp", 10.54],
1233 ) { 1395 ) {
1234 my ($col, $row, $id, $label, $template) = @$_; 1396 my ($col, $row, $id, $label, $template) = @$_;
1235 1397
1236 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1398 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1237 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1399 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1238 align => +1, template => $template, tooltip => "#stat_$label"); 1400 align => 1, template => $template, tooltip => "#stat_$label");
1239 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label 1401 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1240 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1402 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1241 align => -1, text => $label, tooltip => "#stat_$label"); 1403 align => 0, text => $label, tooltip => "#stat_$label");
1242 } 1404 }
1243 1405
1244 $vb->add (new DC::UI::FancyFrame 1406 $vb->add (new DC::UI::FancyFrame
1245 label => "Resistancies", 1407 label => "Resistancies",
1246 child => (my $tbl2 = new DC::UI::Table expand => 1), 1408 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1247 ); 1409 );
1248 1410
1249 my $row = 0; 1411 my $row = 0;
1250 my $col = 0; 1412 my $col = 0;
1251 1413
… …
1290 1452
1291 for (qw/slow holyw conf fire depl magic 1453 for (qw/slow holyw conf fire depl magic
1292 drain acid pois para deat phys 1454 drain acid pois para deat phys
1293 blind fear tund elec cold ghit/) 1455 blind fear tund elec cold ghit/)
1294 { 1456 {
1295 $tbl2->add_at ($col, $row, 1457 $tbl2->add_at ($col + 2, $row,
1296 $STATWIDS->{"res_$_"} = 1458 $STATWIDS->{"res_$_"} =
1297 new DC::UI::Label 1459 new DC::UI::Label
1298 font => $FONT_FIXED, 1460 font => $FONT_FIXED,
1299 template => "-100%", 1461 template => "-100%",
1300 align => +1, 1462 align => 1,
1301 valign => 0,
1302 can_events => 1, 1463 can_events => 1,
1303 can_hover => 1, 1464 can_hover => 1,
1304 tooltip => $resist_names{$_}->[1], 1465 tooltip => $resist_names{$_}->[1],
1305 ); 1466 );
1306 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1467 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
… …
1308 can_hover => 1, 1469 can_hover => 1,
1309 can_events => 1, 1470 can_events => 1,
1310 path => "ui/resist/resist_$_.png", 1471 path => "ui/resist/resist_$_.png",
1311 tooltip => $resist_names{$_}->[1], 1472 tooltip => $resist_names{$_}->[1],
1312 ); 1473 );
1313 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1474 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1314 text => $resist_names{$_}->[0], 1475 text => $resist_names{$_}->[0],
1315 font => $FONT_FIXED, 1476 font => $FONT_FIXED,
1477 align => 1,
1316 can_hover => 1, 1478 can_hover => 1,
1317 can_events => 1, 1479 can_events => 1,
1318 tooltip => $resist_names{$_}->[1], 1480 tooltip => $resist_names{$_}->[1],
1319 ); 1481 );
1320 1482
1321 $row++; 1483 $row++;
1322 if ($row % 6 == 0) { 1484 if ($row % 6 == 0) {
1323 $col += 3; 1485 $col += 4;
1324 $row = 0; 1486 $row = 0;
1325 } 1487 }
1326 } 1488 }
1327 1489
1328 #update_stats_window ({}); 1490 #update_stats_window ({});
… …
1374 "The time this server has been running without being restarted.", 1536 "The time this server has been running without being restarted.",
1375 "Short information about this server provided by its admins.", 1537 "Short information about this server provided by its admins.",
1376 ); 1538 );
1377 my @col = qw(#Users Host Uptime Version Description); 1539 my @col = qw(#Users Host Uptime Version Description);
1378 $table->add_at ($_, 0, new DC::UI::Label 1540 $table->add_at ($_, 0, new DC::UI::Label
1379 can_hover => 1, can_events => 1, 1541 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1380 align => 0, fg => [1, 1, 0],
1381 text => $col[$_], tooltip => $tip[$_]) 1542 text => $col[$_], tooltip => $tip[$_])
1382 for 0 .. $#col; 1543 for 0 .. $#col;
1383 1544
1384 my @align = qw(1 0 1 1 -1); 1545 my @align = qw(1 0.5 1 1 0);
1385 1546
1386 my $y = 0; 1547 my $y = 0;
1387 for my $m (@{ $msg->{servers} }) { 1548 for my $m (@{ $msg->{servers} }) {
1388 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1549 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1389 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1550 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1470 $vbox->add (new DC::UI::FancyFrame 1631 $vbox->add (new DC::UI::FancyFrame
1471 label => "Login Settings", 1632 label => "Login Settings",
1472 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1633 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1473 ); 1634 );
1474 1635
1475 $table->add_at (0, 4, new DC::UI::Label valign => 0, align => 1, text => "Username"); 1636 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1476 $table->add_at (1, 4, new DC::UI::Entry 1637 $table->add_at (1, 4, new DC::UI::Entry
1477 text => $CFG->{profile}{default}{user}, 1638 text => $CFG->{profile}{default}{user},
1478 tooltip => "The name of your character on the server.", 1639 tooltip => "The name of your character on the server. The name is case-sensitive!",
1479 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1640 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1480 ); 1641 );
1481 1642
1482 $table->add_at (0, 5, new DC::UI::Label valign => 0, align => 1, text => "Password"); 1643 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1483 $table->add_at (1, 5, new DC::UI::Entry 1644 $table->add_at (1, 5, new DC::UI::Entry
1484 text => $CFG->{profile}{default}{password}, 1645 text => $CFG->{profile}{default}{password},
1485 hidden => 1, 1646 hidden => 1,
1486 tooltip => "The password for your character.", 1647 tooltip => "The password for your character.",
1487 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1648 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1488 ); 1649 );
1489 1650
1490 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1651 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1491 expand => 1, 1652 expand => 1,
1492 align => 0,
1493 text => "Login / Register", 1653 text => "Login / Register",
1494 tooltip => "This button will either login to the account configured above or register a new account.", 1654 tooltip => "This button will either login to the account configured above or register a new account.",
1495 on_activate => sub { 1655 on_activate => sub {
1496 $CONN ? stop_game 1656 $CONN ? stop_game
1497 : start_game; 1657 : start_game;
1498 1 1658 1
1499 }, 1659 },
1500 ); 1660 );
1501 1661
1502 $vbox->add (new DC::UI::FancyFrame 1662 $vbox->add (new DC::UI::FancyFrame
1503 label => "Registering", 1663 label => "How to Play",
1504 min_h => 200, 1664 min_h => 240,
1505 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1665 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1506 markup => 1666 markup =>
1667 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1668 . "Then register a new account (or use an existing one if you have one). "
1507 "To register a new account, choose a username that hasn't been taken yet and " 1669 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1508 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1670 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1509 ), 1671 ),
1510 ); 1672 );
1511 1673
1512 $vbox 1674 $vbox
… …
1520 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1682 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1521 ); 1683 );
1522 1684
1523 my $row = 0; 1685 my $row = 0;
1524 1686
1525 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Host:Port"); 1687 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1526 { 1688 {
1527 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1689 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1528 1690
1529 $vbox->add ( 1691 $vbox->add (
1530 $HOST_ENTRY = new DC::UI::Entry 1692 $HOST_ENTRY = new DC::UI::Entry
1531 expand => 1, 1693 expand => 1,
1532 text => $CFG->{profile}{default}{host}, 1694 text => $CFG->{profile}{default}{host},
1533 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1695 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1534 on_changed => sub { 1696 on_changed => sub {
1535 my ($self, $value) = @_; 1697 my ($self, $value) = @_;
1536 $CFG->{profile}{default}{host} = $value; 1698 $CFG->{profile}{default}{host} = $value;
1537 1 1699 1
1538 } 1700 }
… …
1541 if (0) { #d# disabled 1703 if (0) { #d# disabled
1542 $vbox->add (new DC::UI::Button 1704 $vbox->add (new DC::UI::Button
1543 expand => 1, 1705 expand => 1,
1544 text => "Server List", 1706 text => "Server List",
1545 other => $METASERVER, 1707 other => $METASERVER,
1546 tooltip => "Show a list of available crossfire servers", 1708 tooltip => "Show a list of available Deliantra servers",
1547 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1709 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1548 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1710 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1549 ); 1711 );
1550 }#d# 1712 }#d#
1551 } 1713 }
1552 1714
1553 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Map Size"); 1715 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1554 $table->add_at (1, $row, new DC::UI::Slider 1716 $table->add_at (1, $row, new DC::UI::Slider
1555 force_w => 100, 1717 force_w => 100,
1556 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1718 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1557 tooltip => "This is the size of the portion of the map update the server sends you. " 1719 tooltip => "This is the size of the portion of the map update the server sends you. "
1558 . "If you set this to a high value you will be able to see further, " 1720 . "If you set this to a high value you will be able to see further, "
1559 . "but you also increase bandwidth requirements and latency. " 1721 . "but you also increase bandwidth requirements and latency. "
1560 . "This option is only used once at log-in.", 1722 . "This option is only used once at log-in.",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1723 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1562 ); 1724 );
1563 1725
1564 $table->add_at (0, ++$row, new DC::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1726 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1565 $table->add_at (1, $row, new DC::UI::Entry 1727 $table->add_at (1, $row, new DC::UI::Entry
1566 text => $CFG->{output_rate}, 1728 text => $CFG->{output_rate},
1567 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1729 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1568 . "when sending data. When 0 or unset, the server " 1730 . "when sending data. When 0 or unset, the server "
1569 . "default will be used, which is usually around 100kb/s. Most servers will " 1731 . "default will be used, which is usually around 100kb/s. Most servers will "
… …
1582sub client_setup { 1744sub client_setup {
1583 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]; 1745 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1584 1746
1585 my $row = 0; 1747 my $row = 0;
1586 1748
1587 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1749 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1588 $table->add_at (1, $row++, new DC::UI::CheckBox 1750 $table->add_at (1, $row++, new DC::UI::CheckBox
1751 c_colspan => 2,
1589 state => $CFG->{show_tips}, 1752 state => $CFG->{show_tips},
1590 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1753 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1591 on_changed => sub { 1754 on_changed => sub {
1592 my ($self, $value) = @_; 1755 my ($self, $value) = @_;
1593 $CFG->{show_tips} = $value; 1756 $CFG->{show_tips} = $value;
1594 0 1757 0
1595 } 1758 }
1596 ); 1759 );
1597 1760
1598 $table->add_at (0, $row, new DC::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1761 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1599 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1762 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1763 c_colspan => 2,
1600 text => $CFG->{logview_max_par}, 1764 text => $CFG->{logview_max_par},
1601 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1765 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1602 . "sends more messages than this number, older messages get removed to save memory and " 1766 . "sends more messages than this number, older messages get removed to save memory and "
1603 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1767 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1604 on_changed => sub { 1768 on_changed => sub {
1605 my ($self, $value) = @_; 1769 my ($self, $value) = @_;
1606 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1770 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1607 0 1771 0
1608 }, 1772 },
1773 );
1774
1775 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1776 $table->add_at (1, $row, new DC::UI::CheckBox
1777 state => $CFG->{config_autosave},
1778 tooltip => "Normally, configuration settings and the user interface layout "
1779 . "are saved on client exit. You can disable this behaviour by "
1780 . "unchecking this checkbox.",
1781 on_changed => sub {
1782 my ($self, $value) = @_;
1783 $CFG->{config_autosave} = $value;
1784 0
1785 }
1786 );
1787 $table->add_at (2, $row++, new DC::UI::Button
1788 text => "Save Now",
1789 tooltip => "Use this to manually save configuration and UI layout when "
1790 . "autosave is disabled.",
1791 on_activate => sub {
1792 DC::write_cfg;
1793 0
1794 }
1609 ); 1795 );
1610 1796
1611 $table 1797 $table
1612} 1798}
1613 1799
… …
1621 col_expand => [0, 1, 0, 1], 1807 col_expand => [0, 1, 0, 1],
1622 ); 1808 );
1623 1809
1624 for ( 1810 for (
1625 ["General", 0, 0, 1811 ["General", 0, 0,
1626 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1627 ["Inhibit autopickup" => PICKUP_INHIBIT], 1812# ["Inhibit autopickup" => PICKUP_INHIBIT],
1628 ["Stop before pickup" => PICKUP_STOP], 1813 ["Stop before pickup" => PICKUP_STOP],
1629 ["Debug autopickup" => PICKUP_DEBUG], 1814 ["Debug autopickup" => PICKUP_DEBUG],
1630 ], 1815 ],
1631 ["Weapons", 0, 6, 1816 ["Weapons", 0, 6,
1632 ["All weapons" => PICKUP_ALLWEAPON], 1817 ["All weapons" => PICKUP_ALLWEAPON],
… …
1658 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1843 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1659 ["Ignore cursed" => PICKUP_NOT_CURSED], 1844 ["Ignore cursed" => PICKUP_NOT_CURSED],
1660 ["Jewelery" => PICKUP_JEWELS], 1845 ["Jewelery" => PICKUP_JEWELS],
1661 ["Flesh" => PICKUP_FLESH], 1846 ["Flesh" => PICKUP_FLESH],
1662 ], 1847 ],
1663 ["Weight/Value ratio", 2, 17] 1848 ["Value/Weight ratio", 2, 17]
1664 ) 1849 )
1665 { 1850 {
1666 my ($title, $x, $y, @bits) = @$_; 1851 my ($title, $x, $y, @bits) = @$_;
1667 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1852 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1668 1853
… …
1680 $::CFG->{pickup} |= $mask; 1865 $::CFG->{pickup} |= $mask;
1681 } else { 1866 } else {
1682 $::CFG->{pickup} &= ~$mask; 1867 $::CFG->{pickup} &= ~$mask;
1683 } 1868 }
1684 1869
1685 $::CONN->send_command ("pickup $::CFG->{pickup}") 1870 $::CONN->send_pickup ($::CFG->{pickup})
1686 if defined $::CONN; 1871 if defined $::CONN;
1687 1872
1688 0 1873 0
1689 }); 1874 });
1690 1875
… …
1693 } 1878 }
1694 1879
1695 $table->add_at (2, 18, new DC::UI::ValSlider 1880 $table->add_at (2, 18, new DC::UI::ValSlider
1696 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1881 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1697 template => ">= 99", 1882 template => ">= 99",
1883 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1698 to_value => sub { ">= " . 5 * $_[0] }, 1884 to_value => sub { ">= " . 5 * $_[0] },
1699 on_changed => sub { 1885 on_changed => sub {
1700 my ($slider, $value) = @_; 1886 my ($slider, $value) = @_;
1701 1887
1702 $::CFG->{pickup} &= ~0xF; 1888 $::CFG->{pickup} &= ~0xF;
… …
1706 }); 1892 });
1707 1893
1708 $table->add_at (3, 18, new DC::UI::Button 1894 $table->add_at (3, 18, new DC::UI::Button
1709 text => "set", 1895 text => "set",
1710 on_activate => sub { 1896 on_activate => sub {
1711 $::CONN->send_command ("pickup $::CFG->{pickup}") 1897 $::CONN->send_pickup ($::CFG->{pickup})
1712 if defined $::CONN; 1898 if defined $::CONN;
1713 0 1899 0
1714 }); 1900 });
1715 1901
1716 $r 1902 $r
1717} 1903}
1718 1904
1719my %SORT_ORDER = ( 1905my %SORT_ORDER = (
1720 type => undef, 1906 type => sub {
1907 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1908 },
1721 mtime => sub { 1909 mtime => sub {
1722 my $NOW = time; 1910 my $NOW = time;
1723 sort { 1911 sort {
1724 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1912 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1725 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1913 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1737 1925
1738sub inventory_widget { 1926sub inventory_widget {
1739 my $hb = new DC::UI::HBox homogeneous => 1; 1927 my $hb = new DC::UI::HBox homogeneous => 1;
1740 1928
1741 $hb->add (my $vb1 = new DC::UI::VBox); 1929 $hb->add (my $vb1 = new DC::UI::VBox);
1742 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1930 $vb1->add (new DC::UI::Label text => "Player");
1743 1931
1744 $vb1->add (my $hb1 = new DC::UI::HBox); 1932 $vb1->add (my $hb1 = new DC::UI::HBox);
1745 1933
1746 use sort 'stable'; 1934 use sort 'stable';
1747 1935
… …
1756 $::CFG->{inv_sort} = $_[1]; 1944 $::CFG->{inv_sort} = $_[1];
1757 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1945 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1758 }, 1946 },
1759 ); 1947 );
1760 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1948 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1761 #TODO# update to weigh/maxweight 1949 #TODO# update to weight/maxweight
1762 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1950 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1763 1951
1764 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1952 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1765 $sw1->add ($INV = new DC::UI::Inventory); 1953 $sw1->add ($INV = new DC::UI::Inventory);
1766 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1954 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1767 1955
… …
1827 $PL_NOTEBOOK->set_current_page ($widget); 2015 $PL_NOTEBOOK->set_current_page ($widget);
1828 $PL_WINDOW->show; 2016 $PL_WINDOW->show;
1829 } 2017 }
1830} 2018}
1831 2019
1832sub player_window { 2020sub make_playerbook {
1833 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2021 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1834 x => "center", 2022 x => "center",
1835 y => "center", 2023 y => "center",
1836 force_w => $WIDTH * 9/10, 2024 force_w => $WIDTH * 9/10,
1837 force_h => $HEIGHT * 9/10, 2025 force_h => $HEIGHT * 9/10,
… …
1871 "License, Author and Source info for media sent by the server."); 2059 "License, Author and Source info for media sent by the server.");
1872 2060
1873 $ntb->set_current_page ($INVENTORY_PAGE); 2061 $ntb->set_current_page ($INVENTORY_PAGE);
1874 2062
1875 $plwin->add ($ntb); 2063 $plwin->add ($ntb);
1876 $plwin
1877} 2064}
1878 2065
1879sub keyboard_setup { 2066sub keyboard_setup {
1880 DC::Macro::keyboard_setup 2067 DC::Macro::keyboard_setup
1881} 2068}
1882 2069
1883sub help_window { 2070sub make_help_window {
1884 my $win = new DC::UI::Toplevel 2071 my $win = new DC::UI::Toplevel
1885 x => 'center', 2072 x => 'center',
1886 y => 'center', 2073 y => 'center',
1887 z => 4, 2074 z => 4,
1888 name => 'doc_browser', 2075 name => 'doc_browser',
… …
1947 my @path = DC::Pod::full_path_of $node; 2134 my @path = DC::Pod::full_path_of $node;
1948 pop @path; # drop current node 2135 pop @path; # drop current node
1949 2136
1950 for my $node (@path) { 2137 for my $node (@path) {
1951 $buttons->add (new DC::UI::Button 2138 $buttons->add (new DC::UI::Button
1952 text => $node->{kw}[0], 2139 text => $node->[DC::Pod::N_KW][0],
1953 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>", 2140 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1954 on_activate => sub { 2141 on_activate => sub {
1955 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2142 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1956 $load_node->($node); 2143 $load_node->($node);
1957 }, 2144 },
1958 ); 2145 );
1959 $buttons->add (new DC::UI::Label text => "/"); 2146 $buttons->add (new DC::UI::Label text => "/");
1960 } 2147 }
1961 2148
1962 $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2149 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1963 2150
1964 $curnode = $node; 2151 $curnode = $node;
1965 2152
1966 $viewer->clear; 2153 $viewer->clear;
1967 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode); 2154 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
… …
1977 2164
1978 $load_node->((DC::Pod::find @path)[0]); 2165 $load_node->((DC::Pod::find @path)[0]);
1979 $win->show; 2166 $win->show;
1980 }; 2167 };
1981 2168
1982 $win 2169 $HELP_WINDOW = $win;
1983}
1984
1985sub open_string_query {
1986 my ($title, $cb, $txt, $tooltip) = @_;
1987 my $dialog = new DC::UI::Toplevel
1988 x => "center",
1989 y => "center",
1990 z => 50,
1991 force_w => $WIDTH * 4/5,
1992 title => $title;
1993
1994 $dialog->add (
1995 my $e = new DC::UI::Entry
1996 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1997 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1998 tooltip => $tooltip
1999 );
2000
2001 $e->grab_focus;
2002 $e->set_text ($txt) if $txt;
2003 $dialog->show;
2004} 2170}
2005 2171
2006sub open_quit_dialog { 2172sub open_quit_dialog {
2007 unless ($QUIT_DIALOG) { 2173 unless ($QUIT_DIALOG) {
2008 $QUIT_DIALOG = new DC::UI::Toplevel 2174 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2030 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2196 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2031 ); 2197 );
2032 $hb->add (new DC::UI::Button 2198 $hb->add (new DC::UI::Button
2033 text => "Quit anyway", 2199 text => "Quit anyway",
2034 expand => 1, 2200 expand => 1,
2035 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2201 on_activate => sub {
2202 crash "Quit anyway";
2203 EV::unloop EV::UNLOOP_ALL;
2204 },
2036 ); 2205 );
2037 } 2206 }
2038 2207
2039 $QUIT_DIALOG->show; 2208 $QUIT_DIALOG->show;
2040 $QUIT_DIALOG->grab_focus; 2209 $QUIT_DIALOG->grab_focus;
2210}
2211
2212sub make_menubar {
2213 $MENUFRAME = new DC::UI::Toplevel
2214 border => 0,
2215 force_x => 0,
2216 force_y => 0,
2217 force_w => $::WIDTH,
2218 child => ($MENUBAR = new DC::UI::HBox),
2219 ;
2220
2221 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2222
2223 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2224 make_gauge_window->show;
2225
2226# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2227# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2228
2229 make_playerbook;
2230
2231 $MENUPOPUP = DC::UI::Menu->new (items => [
2232 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2233 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2234 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2235 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2236 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2237 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2238 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2239 ["Quit…" , sub {
2240 if ($CONN) {
2241 open_quit_dialog;
2242 } else {
2243 EV::unloop EV::UNLOOP_ALL;
2244 }
2245 }],
2246 ]);
2247
2248 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2249 tooltip => "Shows the main menu",
2250 on_button_down => sub {
2251 my ($self, $ev) = @_;
2252 local $ev->{x} = 0;
2253 local $ev->{y} = 0;
2254 $MENUPOPUP->popup ($ev);
2255 },
2256 );
2257
2258 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2259 padding_x => 6,
2260 padding_y => 3,
2261 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2262 template => " Exp: 888,888,888,888 (lvl 188) ",
2263 );
2264
2265 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2266 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2267 . "will automatically pick up items as defined by your item pickup settings "
2268 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2269 . "disable autopickup by disabling this checkbox.",
2270 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2271 on_changed => sub {
2272 my ($self, $value) = @_;
2273 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2274 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2275 $CONN->send_pickup ($CFG->{pickup})
2276 if $CONN;
2277 },
2278 );
2279
2280 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2281 c_rescale => 1,
2282 padding_x => 6,
2283 padding_y => 3,
2284 force_w => $::WIDTH * 0.2,
2285 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2286 template => "two handed weapons 99%",
2287 );
2288
2289 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2290 expand => 1,
2291 align => 1, can_hover => 1, can_events => 1,
2292 text => "Range and Combat Slots",
2293 tooltip => "#stat_ranged",
2294 );
2295
2296 $MENUFRAME->show;
2297}
2298
2299sub open_string_query {
2300 my ($title, $cb, $txt, $tooltip) = @_;
2301 my $dialog = new DC::UI::Toplevel
2302 x => "center",
2303 y => "center",
2304 z => 50,
2305 force_w => $WIDTH * 4/5,
2306 title => $title;
2307
2308 $dialog->add (
2309 my $e = new DC::UI::Entry
2310 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2311 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2312 tooltip => $tooltip
2313 );
2314
2315 $e->grab_focus;
2316 $e->set_text ($txt) if $txt;
2317 $dialog->show;
2041} 2318}
2042 2319
2043sub show_tip_of_the_day { 2320sub show_tip_of_the_day {
2044 # find all tips 2321 # find all tips
2045 my @tod = DC::Pod::find tip_of_the_day => "*"; 2322 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2093 $dialog->show; 2370 $dialog->show;
2094 }; 2371 };
2095} 2372}
2096 2373
2097sub sdl_init { 2374sub sdl_init {
2098 DC::SDL_Init 2375 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2099 and die "SDL::Init failed!\n"; 2376 and die "SDL::Init failed!\n";
2100} 2377}
2101 2378
2102sub video_init { 2379sub video_init {
2380 DC::set_theme $CFG->{uitheme};
2381
2382 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2383 $SDL_REINIT = 0;
2384
2385 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2386 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2387 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2388 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2389
2390 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2391
2103 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2392 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2393 $CFG->{sdl_mode} = 0; # lowest resolution by default
2394
2395 # now choose biggest mode <= 1024x768
2396 for (0 .. $#SDL_MODES) {
2397 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2398 $CFG->{sdl_mode} = $_;
2399 }
2400 }
2401 }
2104 2402
2105 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2403 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2106 2404
2107 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2405 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2108 $FULLSCREEN = $CFG->{fullscreen}; 2406 $FULLSCREEN = $CFG->{fullscreen};
2109 $FAST = $CFG->{fast}; 2407 $FAST = $CFG->{fast};
2110 2408
2409 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2111 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2410 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2411 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2112 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2412 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2113 2413
2114 $SDL_ACTIVE = 1; 2414 $SDL_ACTIVE = 1;
2115 $LAST_REFRESH = time - 0.01; 2415 $LAST_REFRESH = time - 0.01;
2116 2416
… …
2146 force_x => "max", 2446 force_x => "max",
2147 force_y => 0; 2447 force_y => 0;
2148 $DEBUG_STATUS->show; 2448 $DEBUG_STATUS->show;
2149 2449
2150 $STATUSBOX = new DC::UI::Statusbox; 2450 $STATUSBOX = new DC::UI::Statusbox;
2151 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2451
2452 $MODBOX = new DC::UI::Label
2453 can_events => 1,
2454 can_hover => 1,
2455 markup => "",
2456 align => 0,
2457 font => $FONT_FIXED,
2458 tooltip => "#modifier_box",
2459 tooltip_width => 0.67,
2460 ;
2461
2462 update_modbox;
2152 2463
2153 (new DC::UI::Frame 2464 (new DC::UI::Frame
2154 bg => [0, 0, 0, 0.4], 2465 bg => [0, 0, 0, 0.4],
2155 force_x => 0, 2466 force_x => 0,
2156 force_y => "max", 2467 force_y => "max",
2157 child => $STATUSBOX, 2468 child => (my $LL = new DC::UI::VBox),
2158 )->show; 2469 )->show;
2470
2471 $LL->add ($STATUSBOX);
2472 $LL->add ($MODBOX);
2473 $LL->add (new DC::UI::Label
2474 align => 0,
2475 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2476 fontsize => 0.5,
2477 fg => [1, 1, 0, 0.7],
2478 );
2159 2479
2160 DC::UI::Toplevel->new ( 2480 DC::UI::Toplevel->new (
2161 title => "Minimap", 2481 title => "Minimap",
2162 name => "mapmap", 2482 name => "mapmap",
2163 x => 0, 2483 x => 0,
2164 y => $FONTSIZE + 8, 2484 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2165 border_bg => [1, 1, 1, 192/255], 2485 border_bg => [1, 1, 1, 192/255],
2166 bg => [1, 1, 1, 0], 2486 bg => [1, 1, 1, 0],
2167 child => ($MAPMAP = new DC::MapWidget::MapMap 2487 child => ($MAPMAP = new DC::MapWidget::MapMap
2168 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2488 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2169 ), 2489 ),
2170 )->show; 2490 )->show;
2171 2491
2172 $MAPWIDGET = new DC::MapWidget; 2492 $MAPWIDGET = new DC::MapWidget;
2173 $MAPWIDGET->connect (activate_console => sub { 2493 $MAPWIDGET->connect (activate_console => sub {
2174 my ($mapwidget, $preset) = @_; 2494 my ($mapwidget, $preset) = @_;
2175 2495
2176 $MESSAGE_WINDOW->activate_console ($preset) 2496 $MESSAGE_DIST->activate_console ($preset)
2177 if $MESSAGE_WINDOW; 2497 if $MESSAGE_DIST;
2178 }); 2498 });
2179 $MAPWIDGET->show; 2499 $MAPWIDGET->show;
2180 $MAPWIDGET->grab_focus; 2500 $MAPWIDGET->grab_focus;
2181 2501
2182 $COMPLETER = new DC::MapWidget::Command:: 2502 $COMPLETER = new DC::MapWidget::Command::
… …
2194 force_h => $::HEIGHT * 0.6, 2514 force_h => $::HEIGHT * 0.6,
2195 has_close_button => 1, 2515 has_close_button => 1,
2196 ; 2516 ;
2197 2517
2198 $METASERVER = metaserver_dialog; 2518 $METASERVER = metaserver_dialog;
2519 # the name is changed to not conflict with the older name as users could have hidden it
2199 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2520 $MESSAGE_WINDOW = new DC::UI::Dockbar
2521 name => "message_window2",
2522 title => 'Messages',
2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2524 force_w => $::WIDTH * 0.6,
2525 force_h => $::HEIGHT * 0.25,
2526 ;
2200 2527
2528 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2529
2201 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2530 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2202 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2531 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2203 2532
2204 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2533 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2205 "Configure the server to play on, your username and password."); 2534 "Configure the server to play on, your username and password.");
2206 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2535 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2219 . "After pressing the combo the binding will be saved automatically and the " 2548 . "After pressing the combo the binding will be saved automatically and the "
2220 . "binding editor closes"); 2549 . "binding editor closes");
2221 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2550 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2222 "Some debuggin' options. Do not ask."); 2551 "Some debuggin' options. Do not ask.");
2223 2552
2224 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2553 make_help_window;
2554 make_menubar;
2225 2555
2226 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2227 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2228
2229 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2230 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2231
2232 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2233
2234 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2235 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2236
2237 $BUTTONBAR->add (new DC::UI::Button
2238 text => "Save Config",
2239 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2240 on_activate => sub {
2241 $::CFG->{layout} = DC::UI::get_layout;
2242 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2243 status "Configuration Saved";
2244 0
2245 },
2246 );
2247
2248 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2249 tooltip => "View Documentation");
2250
2251
2252 $BUTTONBAR->add (new DC::UI::Button
2253 text => "Quit",
2254 tooltip => "Terminates the program",
2255 on_activate => sub {
2256 if ($CONN) {
2257 open_quit_dialog;
2258 } else {
2259 EV::unloop EV::UNLOOP_ALL;
2260 }
2261 0
2262 },
2263 );
2264
2265 $BUTTONBAR->show;
2266 $SETUP_DIALOG->show; 2556 $SETUP_DIALOG->show;
2267 $MESSAGE_WINDOW->show; 2557 $MESSAGE_WINDOW->show;
2268 } 2558 }
2269 2559
2560 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2561 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2562
2563 $CAVEAT_LABEL->set_text ("None :)");
2564 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2565 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2566
2270 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2567 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2271} 2568}
2272 2569
2273sub video_shutdown { 2570sub video_shutdown {
2274 DC::OpenGL::shutdown; 2571 DC::OpenGL::shutdown;
2572 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2275 2573
2276 undef $SDL_ACTIVE; 2574 undef $SDL_ACTIVE;
2277} 2575}
2278 2576
2279my %animate_object; 2577my %animate_object;
… …
2298my $want_refresh = EV::prepare_ns \&force_refresh; 2596my $want_refresh = EV::prepare_ns \&force_refresh;
2299 2597
2300my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2598my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2301 $NOW = EV::now; 2599 $NOW = EV::now;
2302 2600
2303 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2601 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2304 for DC::poll_events; 2602 for DC::poll_events;
2305 2603
2306 if (%animate_object) { 2604 if (%animate_object) {
2307 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2605 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2308 $WANT_REFRESH = 1; 2606 $WANT_REFRESH = 1;
… …
2320sub animation_stop { 2618sub animation_stop {
2321 my ($widget) = @_; 2619 my ($widget) = @_;
2322 delete $animate_object{$widget}; 2620 delete $animate_object{$widget};
2323} 2621}
2324 2622
2325%SDL_CB = (
2326 DC::SDL_QUIT => sub { 2623$SDL_CB[DC::SDL_QUIT] = sub {
2624 crash "SDL_QUIT";
2327 EV::unloop EV::UNLOOP_ALL; 2625 EV::unloop EV::UNLOOP_ALL;
2328 }, 2626};
2329 DC::SDL_VIDEORESIZE => sub { 2627$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2330 },
2331 DC::SDL_VIDEOEXPOSE => sub { 2628$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2332 DC::UI::full_refresh; 2629 DC::UI::full_refresh;
2333 }, 2630};
2334 DC::SDL_ACTIVEEVENT => sub { 2631$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2335# not useful, as APPACTIVE includes only iconified state, not unmapped 2632# not useful, as APPACTIVE includes only iconified state, not unmapped
2336# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2633# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2337# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2634# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2338# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2635# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2339# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2636# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2340# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2637# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2341 }, 2638};
2342 DC::SDL_KEYDOWN => sub { 2639$SDL_CB[DC::SDL_KEYDOWN] = sub {
2343 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2640 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2344 # alt-enter 2641 # alt-enter
2642 video_shutdown;
2345 $FULLSCREEN_ENABLE->toggle; 2643 $FULLSCREEN_ENABLE->toggle;
2346 video_shutdown;
2347 video_init; 2644 video_init;
2348 } else { 2645 } else {
2349 DC::UI::feed_sdl_key_down_event ($_[0]); 2646 &DC::UI::feed_sdl_key_down_event;
2350 }
2351 }, 2647 }
2352 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2648 update_modbox;
2649};
2650$SDL_CB[DC::SDL_KEYUP] = sub {
2651 &DC::UI::feed_sdl_key_up_event;
2652 update_modbox;
2653};
2353 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2654$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2354 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2655$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2355 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2656$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2356 DC::SDL_USEREVENT => sub { 2657$SDL_CB[DC::SDL_USEREVENT] = sub {
2357 if ($_[0]{code} == 1) { 2658 if ($_[0]{code} == 1) {
2358 audio_channel_finished $_[0]{data1}; 2659 audio_channel_finished $_[0]{data1};
2359 } elsif ($_[0]{code} == 0) { 2660 } elsif ($_[0]{code} == 0) {
2360 audio_music_finished; 2661 audio_music_finished;
2361 }
2362 }, 2662 }
2363); 2663};
2364 2664
2365############################################################################# 2665#############################################################################
2366 2666
2367$SIG{INT} = $SIG{TERM} = sub { 2667$SIG{INT} = $SIG{TERM} = sub {
2368 EV::unloop; 2668 EV::unloop;
2369 #d# TODO calling exit here hangs the process in some futex 2669 #d# TODO calling exit here hangs the process in some futex
2370}; 2670};
2371 2671
2372{ 2672# due to mac os x + sdl combined braindamage, we need this contortion
2673sub main {
2674 {
2675 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2676
2373 if (-e "$Deliantra::VARDIR/client.cf") { 2677 if (-e "$Deliantra::VARDIR/client.cf") {
2374 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2678 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2375 } else { 2679 } else {
2376 #TODO: compatibility cruft 2680 #TODO: compatibility cruft
2377 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2681 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2378 print STDERR "INFO: used old configuratrion file\n"; 2682 print STDERR "INFO: used old configuration file\n";
2379 } 2683 }
2380 2684
2381 DC::DB::Server::run; 2685 DC::DB::Server::run;
2382 2686
2687 if ($CFG->{db_schema} < 1) {
2688 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2689 DC::DB::nuke_db;
2690 $CFG->{db_schema} = 1;
2691 DC::write_cfg;
2692 }
2693
2694 DC::DB::open_db;
2695
2383 DC::UI::set_layout ($::CFG->{layout}); 2696 DC::UI::set_layout ($::CFG->{layout});
2384 2697
2385 my %DEF_CFG = ( 2698 my %DEF_CFG = (
2699 config_autosave => 1,
2386 sdl_mode => 0, 2700 sdl_mode => undef,
2387 fullscreen => 1, 2701 fullscreen => 1,
2388 fast => 0, 2702 fast => 0,
2389 force_opengl11 => undef, 2703 force_opengl11 => undef,
2704 disable_alpha => 0,
2705 smooth_movement => 1,
2390 texture_compression => 1, 2706 texture_compression => 1,
2391 map_scale => 1, 2707 map_scale => 1,
2392 fow_enable => 1, 2708 fow_enable => 1,
2393 fow_intensity => 0, 2709 fow_intensity => 0,
2394 map_smoothing => 1, 2710 map_smoothing => 1,
2395 gui_fontsize => 1, 2711 gui_fontsize => 1,
2396 log_fontsize => 0.7, 2712 log_fontsize => 0.7,
2397 gauge_fontsize => 1, 2713 gauge_fontsize => 1,
2398 gauge_size => 0.35, 2714 gauge_size => 0.35,
2399 stat_fontsize => 0.7, 2715 stat_fontsize => 0.7,
2400 mapsize => 100, 2716 mapsize => 100,
2401 audio_enable => 1, 2717 audio_enable => 1,
2402 audio_hw_channels => 0, 2718 audio_hw_channels => 0,
2403 audio_hw_frequency => 0, 2719 audio_hw_frequency => 0,
2404 audio_hw_chunksize => 0, 2720 audio_hw_chunksize => 0,
2405 audio_mix_channels => 8, 2721 audio_mix_channels => 8,
2406 effects_enable => 1, 2722 effects_enable => 1,
2407 effects_volume => 1, 2723 effects_volume => 1,
2408 bgm_enable => 1, 2724 bgm_enable => 1,
2409 bgm_volume => 0.5, 2725 bgm_volume => 0.5,
2410 output_rate => "", 2726 output_rate => "",
2411 pickup => 0, 2727 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2412 inv_sort => "mtime", 2728 inv_sort => "mtime",
2413 default => "profile", # default profile 2729 default => "profile", # default profile
2414 show_tips => 1, 2730 show_tips => 1,
2415 logview_max_par => 1000, 2731 logview_max_par => 1000,
2732 shift_fire_stop => 0,
2733 uitheme => "wood",
2734 map_shift_x => -24, # arbitrary
2735 map_shift_y => +24, # arbitrary
2416 ); 2736 );
2417 2737
2418 while (my ($k, $v) = each %DEF_CFG) { 2738 while (my ($k, $v) = each %DEF_CFG) {
2419 $CFG->{$k} = $v unless exists $CFG->{$k}; 2739 $CFG->{$k} = $v unless exists $CFG->{$k};
2420 } 2740 }
2421 2741
2422 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2742 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2423 $PROFILE = $CFG->{profile}{default}; 2743 $PROFILE = $CFG->{profile}{default};
2424 2744
2425 # convert old bindings (only default profile matters) 2745 # convert old bindings (only default profile matters)
2426 if (my $bindings = delete $PROFILE->{bindings}) { 2746 if (my $bindings = delete $PROFILE->{bindings}) {
2427 while (my ($mod, $syms) = each %$bindings) { 2747 while (my ($mod, $syms) = each %$bindings) {
2428 while (my ($sym, $cmds) = each %$syms) { 2748 while (my ($sym, $cmds) = each %$syms) {
2429 push @{ $PROFILE->{macro} }, { 2749 push @{ $PROFILE->{macro} }, {
2430 accelkey => [$mod*1, $sym*1], 2750 accelkey => [$mod*1, $sym*1],
2431 action => $cmds, 2751 action => $cmds,
2752 };
2432 }; 2753 }
2433 } 2754 }
2434 } 2755 }
2435 }
2436 2756
2437 sdl_init; 2757 sdl_init;
2438 2758
2439 @SDL_MODES = DC::SDL_ListModes 8, 8; 2759 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2440 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2760 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2441 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2442 2761
2443 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2762 {
2444
2445 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2446
2447 {
2448 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2763 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2449 DejaVuSans.ttf 2764 DejaVuSans.ttf
2450 DejaVuSansMono.ttf 2765 DejaVuSansMono.ttf
2451 DejaVuSans-Bold.ttf 2766 DejaVuSans-Bold.ttf
2452 DejaVuSansMono-Bold.ttf 2767 DejaVuSansMono-Bold.ttf
2453 DejaVuSans-Oblique.ttf 2768 DejaVuSans-Oblique.ttf
2454 DejaVuSansMono-Oblique.ttf 2769 DejaVuSansMono-Oblique.ttf
2455 DejaVuSans-BoldOblique.ttf 2770 DejaVuSans-BoldOblique.ttf
2456 DejaVuSansMono-BoldOblique.ttf 2771 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf
2457 ); 2773 );
2458 2774
2459 DC::add_font $_ for @fonts; 2775 DC::add_font $_ for @fonts;
2460 2776
2461 DC::pango_init;
2462
2463 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2777 $FONT_PROP = new_from_file DC::Font $fonts[0];
2464 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2778 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2465 2779
2466 $FONT_PROP->make_default; 2780 $FONT_PROP->make_default;
2467 } 2781
2782 DC::pango_init;
2783 }
2468 2784
2469# compare mono (ft) vs. rgba (cairo) 2785# compare mono (ft) vs. rgba (cairo)
2470# ft - 1.8s, cairo 3s, even in alpha-only mode 2786# ft - 1.8s, cairo 3s, even in alpha-only mode
2471# for my $rgba (0..1) { 2787# for my $rgba (0..1) {
2472# my $t1 = Time::HiRes::time; 2788# my $t1 = Time::HiRes::time;
… …
2477# } 2793# }
2478# my $t2 = Time::HiRes::time; 2794# my $t2 = Time::HiRes::time;
2479# warn $t2-$t1; 2795# warn $t2-$t1;
2480# } 2796# }
2481 2797
2482 video_init; 2798 video_init;
2483 audio_init; 2799 audio_init;
2484} 2800 }
2485 2801
2486show_tip_of_the_day if $CFG->{show_tips}; 2802 show_tip_of_the_day if $CFG->{show_tips};
2487 2803
2488our $STARTUP_CANCEL = EV::idle sub { 2804 our $STARTUP_CANCEL = EV::idle sub {
2489 undef $::STARTUP_CANCEL; 2805 undef $::STARTUP_CANCEL;
2490 $startup_done->(); 2806 $startup_done->();
2491}; 2807 };
2492 2808
2809 delete $SIG{__DIE__};
2493EV::loop; 2810 EV::loop;
2494 2811
2812 DC::write_cfg if $CFG->{config_autosave};
2813
2495#video_shutdown; 2814 #video_shutdown;
2496#audio_shutdown; 2815 #audio_shutdown;
2816
2497DC::OpenGL::quit; 2817 DC::OpenGL::quit;
2498DC::SDL_Quit; 2818 DC::SDL_Quit;
2499DC::DB::Server::stop; 2819 DC::DB::Server::stop;
2820}
2821
2822DC::SDL_braino; # see sub above
2500 2823
2501=head1 NAME 2824=head1 NAME
2502 2825
2503deliantra - A Deliantra MORPG game client 2826deliantra - A Deliantra MORPG game client
2504 2827
… …
2521 4 show fps 2844 4 show fps
2522 8 suppress tooltips 2845 8 suppress tooltips
2523 2846
2524=head1 AUTHOR 2847=head1 AUTHOR
2525 2848
2526Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2849Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2527 2850
2528 2851
2529 2852

Diff Legend

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