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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines