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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.18 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.92 by root, Wed Jan 14 00:00:47 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;
127my $MIN_FPS = 5; # unused as of yet
128 140
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 142
131our $LAST_REFRESH; 143our $LAST_REFRESH;
132our $NOW; 144our $NOW;
133 145
134our $CFG; 146our $CFG;
135our $CONN;
136our $PROFILE; # current profile 147our $PROFILE; # current profile
137our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
138 149
139our $WANT_REFRESH; 150our $WANT_REFRESH;
140 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
141our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
142our $WIDTH; 157our $WIDTH;
143our $HEIGHT; 158our $HEIGHT;
144our $FULLSCREEN; 159our $FULLSCREEN;
145our $FONTSIZE; 160our $FONTSIZE;
146 161
147our $FONT_PROP; 162our $FONT_PROP;
148our $FONT_FIXED; 163our $FONT_FIXED;
149 164
165our $CONN;
166
150our $MAP; 167our $MAP;
151our $MAPMAP; 168our $MAPMAP;
152our $MAPWIDGET; 169our $MAPWIDGET;
153our $COMPLETER; 170our $COMPLETER;
154our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
155our $METASERVER; 175our $METASERVER;
156our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
157our $QUIT_DIALOG; 177our $QUIT_DIALOG;
158our $HOST_ENTRY; 178our $HOST_ENTRY;
159our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
179our $SPELL_PAGE; 199our $SPELL_PAGE;
180our $SPELL_LIST; 200our $SPELL_LIST;
181 201
182our $HELP_WINDOW; 202our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 203our $MESSAGE_WINDOW;
204our $MESSAGE_DIST;
184our $FLOORBOX; 205our $FLOORBOX;
185our $GAUGES; 206our $GAUGES;
186our $STATWIDS; 207our $STATWIDS;
187 208
188our $SDL_ACTIVE; 209our $SDL_ACTIVE;
189our %SDL_CB; 210our @SDL_CB;
190 211
191our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 213our $STATUSBOX;
214our $MODBOX;
193our $DEBUG_STATUS; 215our $DEBUG_STATUS;
194 216
195our $INV; 217our $INV;
196our $INVR; 218our $INVR;
197our $INVR_HB; 219our $INVR_HB;
198 220
199############################################################################# 221#############################################################################
200 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
201sub status { 263sub status {
202 $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]);
203} 265}
204 266
205sub debug { 267sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 268 $DEBUG_STATUS->set_text ($_[0]);
207} 269}
208 270
209sub message { 271sub message {
210 $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>");
211} 299}
212 300
213############################################################################# 301#############################################################################
214#TODO: maybe move into own audio module... 302#TODO: maybe move into own audio module...
215 303
258 or return; 346 or return;
259 347
260 $meta->{data} 348 $meta->{data}
261 or return; 349 or return;
262 350
263 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
264 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
265 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
266 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
267 &audio_music_push ($face); 355 &audio_music_push ($face);
268 } 356 }
269 } else { 357 } else {
270 # fetch from database 358 # fetch from database
271 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
272 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
273 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
274 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;
275 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
276 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
277 365
278 audio_sound_push ($face); 366 audio_sound_push ($face);
279 }; 367 };
326 414
327 audio_music_update_volume; 415 audio_music_update_volume;
328 416
329 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
330 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
331 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
332 ? 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
333 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
334 425
335 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
336 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
337 428
338 my $NOW = time; 429 my $NOW = time;
339 430
340 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
341 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
635 # right: accept 726 # right: accept
636 $table->add_at (4, 0, new DC::UI::Button 727 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 728 text => "Accept",
638 on_activate => sub { 729 on_activate => sub {
639 $conn->send ("reply n"); 730 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 731 destroy_query_dialog $conn;
642 0 732 0
643 }, 733 },
644 ); 734 );
645 735
654 [Cha => CS_STAT_CHA], 744 [Cha => CS_STAT_CHA],
655 ) { 745 ) {
656 my ($name, $id) = @$_; 746 my ($name, $id) = @$_;
657 $hbox->add (new DC::UI::Label 747 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 748 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 749 expand => 1,
661 can_events => 1, 750 can_events => 1,
662 can_hover => 1, 751 can_hover => 1,
663 tooltip => "#stat_$name", 752 tooltip => "#stat_$name",
664 ); 753 );
698 787
699 $vbox->add (@dialog); 788 $vbox->add (@dialog);
700 $dialog->show; 789 $dialog->show;
701} 790}
702 791
703sub start_game { 792sub dc_connect {
704 status "logging in..."; 793 my ($host, $port) = @_;
705 794
706 $LOGIN_BUTTON->set_text ("Logout");
707 $SETUP_DIALOG->hide;
708
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 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;
710 797
711 my ($host, $port) = split /:/, $PROFILE->{host};
712
713 $MAP = new DC::Map;
714
715 $CONN = eval { 798 $CONN =
716 new DC::Protocol 799 new DC::Protocol
717 host => $host, 800 host => $host,
718 port => $port || 13327, 801 port => $port,
719 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
721 mapw => $mapsize, 804 mapw => $mapw,
722 maph => $mapsize, 805 maph => $maph,
723 806
724 client => "cfplus $DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
725 808
726 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
728 map => $MAP, 811 map => $MAP,
729 mapmap => $MAPMAP, 812 mapmap => $MAPMAP,
730 query => \&server_query, 813 query => \&server_query,
731 814
732 setup_req => { 815 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 816 smoothing => $CFG->{map_smoothing}*1,
734 }, 817 },
735 };
736 818
737 if ($CONN) { 819 on_connect => sub {
820 if ($_[0]) {
738 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
739 822
740 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 };
741 } else { 854 } else {
742 status "unable to connect"; 855 dc_connect $host, $port;
743 stop_game();
744 } 856 }
745} 857}
746 858
747sub stop_game { 859sub stop_game {
860 crash "stop_game";
861
748 $LOGIN_BUTTON->set_text ("Login / Register"); 862 $LOGIN_BUTTON->set_text ("Login / Register");
749 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 863 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
750 $SETUP_DIALOG->show; 864 $SETUP_DIALOG->show;
751 $PL_WINDOW->hide; 865 $PL_WINDOW->hide;
752 $SPELL_LIST->clear_spells; 866 $SPELL_LIST->clear_spells;
766} 880}
767 881
768sub graphics_setup { 882sub graphics_setup {
769 my $vbox = new DC::UI::VBox; 883 my $vbox = new DC::UI::VBox;
770 884
885 {
886 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
887
771 $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]);
772 889
773 my $row = 0; 890 my $row = 0;
774 891
775 $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");
776 $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,
777 can_events => 1, 894 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 895 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 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
780 my $vidmode_tooltip = 918 my $vidmode_tooltip =
781 "<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). "
782 . "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>.";
783 921
784 $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");
785 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 923 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 924
787 $hbox->add (my $mode_slider = new DC::UI::Slider 925 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 926 c_rescale => 1,
927 force_w => $WIDTH * 0.1, expand => 1,
928 range => [ ($CFG->{sdl_mode}) x 3 ],
789 tooltip => $vidmode_tooltip); 929 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new DC::UI::Label 930 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 931 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 932 can_events => 1, tooltip => $vidmode_tooltip);
793 933
794 $mode_slider->connect (changed => sub { 934 $MODE_SLIDER->connect (changed => sub {
795 my ($self, $value) = @_; 935 my ($self, $value) = @_;
796 936
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 937 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $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]});
799 }); 939 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 940 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
801 941
802 $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");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 943 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 944 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 945 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 946 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 947 );
808 948
809 $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");
810 $table->add_at (1, $row++, new DC::UI::CheckBox 950 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 951 state => $CFG->{force_opengl11},
812 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 "
813 . "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 "
814 . "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. "
815 . "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, "
816 . "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. "
817 . "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>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 958 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 959 );
820 960
821 $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");
822 $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
823 state => $CFG->{texture_compression}, 980 state => $CFG->{texture_compression},
824 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 "
825 . "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). "
826 . "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 "
827 . "forced OpenGL 1.1 mode.", 984 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 985 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 986 );
830 987
831 $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");
832 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 990 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 991 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 993 );
837 994
838 $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");
839 $table->add_at (1, $row++, new DC::UI::Slider 996 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 997 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 998 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 999 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 1000 );
844 1001
845 $table->add_at (1, $row++, new DC::UI::Button 1002 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 1003 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 1004 tooltip => "Apply the video settings above.",
848 on_activate => sub { 1005 on_activate => sub {
849 video_shutdown (); 1006 video_shutdown ();
850 video_init (); 1007 video_init ();
1008 0
851 0 1009 }
852 } 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 }
853 ); 1026 );
854 1027
855 $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");
856 $table->add_at (1, $row++, new DC::UI::Slider 1029 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 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 }
860 ); 1033 );
861 1034
862 $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");
863 $table->add_at (1, $row++, new DC::UI::CheckBox 1036 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 1037 state => $CFG->{map_smoothing},
865 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. "
866 . "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. "
867 . "Changes take effect at next login only.", 1040 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1041 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 1042 );
870 1043
871 $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");
872 $table->add_at (1, $row++, new DC::UI::CheckBox 1045 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 1046 state => $CFG->{fow_enable},
874 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.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 1049 );
877 1050
878 $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");
879 $table->add_at (1, $row++, new DC::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1054 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1055 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 1056 );
884 1057
885 $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");
886 $table->add_at (1, $row++, new DC::UI::Slider 1059 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1060 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1061 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 1062 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1063 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 1064 );
892 1065
893 $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");
894 $table->add_at (1, $row++, new DC::UI::Slider 1067 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1068 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1069 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 1070 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 1071 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 1072 &set_gauge_window_fontsize;
1073 0
900 0 1074 }
901 } 1075 );
902 );
903 1076
904 $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");
905 $table->add_at (1, $row++, new DC::UI::Slider 1078 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 1079 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 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.",
908 on_changed => sub { 1081 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 1082 $CFG->{gauge_size} = $_[1];
910 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1083 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1084 0
911 0 1085 }
912 } 1086 );
913 ); 1087 }
914 1088
915 $vbox 1089 $vbox
916} 1090}
917 1091
918our $AUDIO_HW_CHUNKSIZE; 1092our $AUDIO_HW_CHUNKSIZE;
943 1117
944 $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]);
945 1119
946 my $row = 0; 1120 my $row = 0;
947 1121
948 $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");
949 $table->add_at (1, $row++, new DC::UI::CheckBox 1123 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 1124 state => $CFG->{audio_enable},
951 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 1126 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 1127 );
954 1128
955 $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");
956 $table->add_at (1, $row, new DC::UI::CheckBox 1130 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 1131 expand => 1, state => $CFG->{effects_enable},
958 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.",
959 on_changed => sub { 1133 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 1134 $CFG->{effects_enable} = $_[1];
967 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 "
968 . "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.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1143 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1144 );
971 1145
972 $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");
973 $table->add_at (1, $row, new DC::UI::CheckBox 1147 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1148 expand => 1, state => $CFG->{bgm_enable},
975 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.",
976 on_changed => sub { 1150 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1151 $CFG->{bgm_enable} = $_[1];
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1158 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1159 tooltip => "The volume of the background music. Changes are instant.",
986 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 }
987 ); 1161 );
988 1162
989 $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");
990 $table->add_at (1, $row++, new DC::UI::Selector 1164 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1165 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1166 value => $CFG->{audio_hw_frequency},
993 options => [ 1167 options => [
994 [ 0, "default" , "Use System Default"], 1168 [ 0, "default" , "Use System Default"],
1003 audio_tab_update; 1177 audio_tab_update;
1004 1 1178 1
1005 } 1179 }
1006 ); 1180 );
1007 1181
1008 $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");
1009 $table->add_at (1, $row++, new DC::UI::Selector 1183 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1184 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1185 value => $CFG->{audio_hw_channels},
1012 options => [ 1186 options => [
1013 [0, "default" , "Use System Default"], 1187 [0, "default" , "Use System Default"],
1022 audio_tab_update; 1196 audio_tab_update;
1023 1 1197 1
1024 } 1198 }
1025 ); 1199 );
1026 1200
1027 $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");
1028 $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
1029 c_colspan => 2, expand => 1, 1203 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1204 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1205 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1206 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1036 1 1210 1
1037 } 1211 }
1038 ); 1212 );
1039 1213
1040 # should really be a slider 1214 # should really be a slider
1041 $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");
1042 $table->add_at (1, $row++, new DC::UI::ValSlider 1216 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1217 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1218 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1219 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1220 template => ">= 99",
1052 1; 1226 1;
1053 } 1227 }
1054 ); 1228 );
1055 1229
1056 $table->add_at (1, $row++, new DC::UI::Button 1230 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1231 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1232 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1233 on_activate => sub {
1060 audio_shutdown (); 1234 audio_shutdown ();
1061 audio_init (); 1235 audio_init ();
1062 0 1236 0
1081} 1255}
1082 1256
1083sub make_gauge_window { 1257sub make_gauge_window {
1084 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1258 my $gh = int $HEIGHT * $CFG->{gauge_size};
1085 1259
1086 my $win = new DC::UI::Frame ( 1260 $GAUGES->{win} = my $win = new DC::UI::Frame (
1087 force_x => 0, 1261 force_x => 0,
1088 force_y => "max", 1262 force_y => "max",
1089 force_w => $WIDTH, 1263 force_w => $WIDTH,
1090 force_h => $gh, 1264 force_h => $gh,
1091 ); 1265 );
1107 (new DC::UI::Empty expand => 1), 1281 (new DC::UI::Empty expand => 1),
1108 (my $hb = new DC::UI::HBox), 1282 (my $hb = new DC::UI::HBox),
1109 ], 1283 ],
1110 ); 1284 );
1111 1285
1112 $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");
1113 $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");
1114 $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");
1115 $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");
1116
1117 $vbox->add (my $exp = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new DC::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121
1122 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1126 };
1127 1290
1128 &set_gauge_window_fontsize; 1291 &set_gauge_window_fontsize;
1129 1292
1130 $win 1293 $win
1131} 1294}
1141 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1304 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips"); 1305 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1306 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } ); 1307 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1308
1146 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153");#d# 1309 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1310
1148 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0); 1311 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new DC::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1312 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1313 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new DC::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1314 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1315 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new DC::UI::Label text => "e"); 1316 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1317
1155 $table->add_at (7, 6, my $c = new DC::UI::Canvas); 1318 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1319
1157 $c->add_items ({ 1320 $c->add_items ({
1191 $vb->add (new DC::UI::FancyFrame 1354 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1355 label => "Player",
1193 child => (my $pi = new DC::UI::VBox), 1356 child => (my $pi = new DC::UI::VBox),
1194 ); 1357 );
1195 1358
1196 $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,
1197 can_hover => 1, can_events => 1, 1360 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1361 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new DC::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1362 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1363 can_hover => 1, can_events => 1,
1201 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).");
1202 1365
1203 $pi->add (my $hb0 = new DC::UI::HBox); 1366 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1367 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1368 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1369 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1370 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1371 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1372 tooltip => "The weight limit: you cannot carry more than this.");
1210 1373
1211 $vb->add (new DC::UI::FancyFrame 1374 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1375 label => "Primary/Secondary Statistics",
1233 [2, 5, st_wspd => "WSp", 10.54], 1396 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1397 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1398 my ($col, $row, $id, $label, $template) = @$_;
1236 1399
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label 1400 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1401 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1402 align => 1, template => $template, tooltip => "#stat_$label");
1240 $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
1241 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,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1405 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1406 }
1244 1407
1245 $vb->add (new DC::UI::FancyFrame 1408 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1409 label => "Resistancies",
1247 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]),
1248 ); 1411 );
1249 1412
1250 my $row = 0; 1413 my $row = 0;
1251 my $col = 0; 1414 my $col = 0;
1252 1415
1291 1454
1292 for (qw/slow holyw conf fire depl magic 1455 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1456 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1457 blind fear tund elec cold ghit/)
1295 { 1458 {
1296 $tbl2->add_at ($col, $row, 1459 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1460 $STATWIDS->{"res_$_"} =
1298 new DC::UI::Label 1461 new DC::UI::Label
1299 font => $FONT_FIXED, 1462 font => $FONT_FIXED,
1300 template => "-100%", 1463 template => "-100%",
1301 align => +1, 1464 align => 1,
1302 valign => 0,
1303 can_events => 1, 1465 can_events => 1,
1304 can_hover => 1, 1466 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1467 tooltip => $resist_names{$_}->[1],
1306 ); 1468 );
1307 $tbl2->add_at ($col + 1, $row, new DC::UI::Image 1469 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1309 can_hover => 1, 1471 can_hover => 1,
1310 can_events => 1, 1472 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1473 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1474 tooltip => $resist_names{$_}->[1],
1313 ); 1475 );
1314 $tbl2->add_at ($col + 2, $row, new DC::UI::Label 1476 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1477 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1478 font => $FONT_FIXED,
1479 align => 1,
1317 can_hover => 1, 1480 can_hover => 1,
1318 can_events => 1, 1481 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1482 tooltip => $resist_names{$_}->[1],
1320 ); 1483 );
1321 1484
1322 $row++; 1485 $row++;
1323 if ($row % 6 == 0) { 1486 if ($row % 6 == 0) {
1324 $col += 3; 1487 $col += 4;
1325 $row = 0; 1488 $row = 0;
1326 } 1489 }
1327 } 1490 }
1328 1491
1329 #update_stats_window ({}); 1492 #update_stats_window ({});
1375 "The time this server has been running without being restarted.", 1538 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1539 "Short information about this server provided by its admins.",
1377 ); 1540 );
1378 my @col = qw(#Users Host Uptime Version Description); 1541 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new DC::UI::Label 1542 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1543 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1544 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1545 for 0 .. $#col;
1384 1546
1385 my @align = qw(1 0 1 1 -1); 1547 my @align = qw(1 0.5 1 1 0);
1386 1548
1387 my $y = 0; 1549 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1550 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1551 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$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)};
1471 $vbox->add (new DC::UI::FancyFrame 1633 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1634 label => "Login Settings",
1473 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]),
1474 ); 1636 );
1475 1637
1476 $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");
1477 $table->add_at (1, 4, new DC::UI::Entry 1639 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1640 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1641 tooltip => "The name of your character on the server. The name is case-sensitive!",
1480 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 }
1481 ); 1643 );
1482 1644
1483 $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");
1484 $table->add_at (1, 5, new DC::UI::Entry 1646 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1647 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1648 hidden => 1,
1487 tooltip => "The password for your character.", 1649 tooltip => "The password for your character.",
1488 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 }
1489 ); 1651 );
1490 1652
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1653 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1654 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1655 text => "Login / Register",
1495 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.",
1496 on_activate => sub { 1657 on_activate => sub {
1497 $CONN ? stop_game 1658 $CONN ? stop_game
1498 : start_game; 1659 : start_game;
1499 1 1660 1
1500 }, 1661 },
1501 ); 1662 );
1502 1663
1503 $vbox->add (new DC::UI::FancyFrame 1664 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1665 label => "How to Play",
1505 min_h => 200, 1666 min_h => 240,
1506 child => (new DC::UI::Label valign => -1, ellipsise => 0, 1667 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 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). "
1508 "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 "
1509 . "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.",
1510 ), 1673 ),
1511 ); 1674 );
1512 1675
1513 $vbox 1676 $vbox
1521 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]),
1522 ); 1685 );
1523 1686
1524 my $row = 0; 1687 my $row = 0;
1525 1688
1526 $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");
1527 { 1690 {
1528 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1691 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1692
1530 $vbox->add ( 1693 $vbox->add (
1531 $HOST_ENTRY = new DC::UI::Entry 1694 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1695 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1696 text => $CFG->{profile}{default}{host},
1534 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>)",
1535 on_changed => sub { 1698 on_changed => sub {
1536 my ($self, $value) = @_; 1699 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1700 $CFG->{profile}{default}{host} = $value;
1538 1 1701 1
1539 } 1702 }
1542 if (0) { #d# disabled 1705 if (0) { #d# disabled
1543 $vbox->add (new DC::UI::Button 1706 $vbox->add (new DC::UI::Button
1544 expand => 1, 1707 expand => 1,
1545 text => "Server List", 1708 text => "Server List",
1546 other => $METASERVER, 1709 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1710 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1711 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1712 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1713 );
1551 }#d# 1714 }#d#
1552 } 1715 }
1553 1716
1554 $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");
1555 $table->add_at (1, $row, new DC::UI::Slider 1718 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1719 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1720 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 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. "
1559 . "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, "
1560 . "but you also increase bandwidth requirements and latency. " 1723 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1724 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1725 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1726 );
1564 1727
1565 $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");
1566 $table->add_at (1, $row, new DC::UI::Entry 1729 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1730 text => $CFG->{output_rate},
1568 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 "
1569 . "when sending data. When 0 or unset, the server " 1732 . "when sending data. When 0 or unset, the server "
1570 . "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 "
1583sub client_setup { 1746sub client_setup {
1584 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];
1585 1748
1586 my $row = 0; 1749 my $row = 0;
1587 1750
1588 $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");
1589 $table->add_at (1, $row++, new DC::UI::CheckBox 1752 $table->add_at (1, $row++, new DC::UI::CheckBox
1753 c_colspan => 2,
1590 state => $CFG->{show_tips}, 1754 state => $CFG->{show_tips},
1591 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?",
1592 on_changed => sub { 1756 on_changed => sub {
1593 my ($self, $value) = @_; 1757 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1758 $CFG->{show_tips} = $value;
1595 0 1759 0
1596 } 1760 }
1597 ); 1761 );
1598 1762
1599 $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");
1600 $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,
1601 text => $CFG->{logview_max_par}, 1766 text => $CFG->{logview_max_par},
1602 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 "
1603 . "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 "
1604 . "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.",
1605 on_changed => sub { 1770 on_changed => sub {
1606 my ($self, $value) = @_; 1771 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1772 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1773 0
1609 }, 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 }
1610 ); 1797 );
1611 1798
1612 $table 1799 $table
1613} 1800}
1614 1801
1622 col_expand => [0, 1, 0, 1], 1809 col_expand => [0, 1, 0, 1],
1623 ); 1810 );
1624 1811
1625 for ( 1812 for (
1626 ["General", 0, 0, 1813 ["General", 0, 0,
1627 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1628 ["Inhibit autopickup" => PICKUP_INHIBIT], 1814# ["Inhibit autopickup" => PICKUP_INHIBIT],
1629 ["Stop before pickup" => PICKUP_STOP], 1815 ["Stop before pickup" => PICKUP_STOP],
1630 ["Debug autopickup" => PICKUP_DEBUG], 1816 ["Debug autopickup" => PICKUP_DEBUG],
1631 ], 1817 ],
1632 ["Weapons", 0, 6, 1818 ["Weapons", 0, 6,
1633 ["All weapons" => PICKUP_ALLWEAPON], 1819 ["All weapons" => PICKUP_ALLWEAPON],
1659 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1845 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1660 ["Ignore cursed" => PICKUP_NOT_CURSED], 1846 ["Ignore cursed" => PICKUP_NOT_CURSED],
1661 ["Jewelery" => PICKUP_JEWELS], 1847 ["Jewelery" => PICKUP_JEWELS],
1662 ["Flesh" => PICKUP_FLESH], 1848 ["Flesh" => PICKUP_FLESH],
1663 ], 1849 ],
1664 ["Weight/Value ratio", 2, 17] 1850 ["Value/Weight ratio", 2, 17]
1665 ) 1851 )
1666 { 1852 {
1667 my ($title, $x, $y, @bits) = @$_; 1853 my ($title, $x, $y, @bits) = @$_;
1668 $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]);
1669 1855
1681 $::CFG->{pickup} |= $mask; 1867 $::CFG->{pickup} |= $mask;
1682 } else { 1868 } else {
1683 $::CFG->{pickup} &= ~$mask; 1869 $::CFG->{pickup} &= ~$mask;
1684 } 1870 }
1685 1871
1686 $::CONN->send_command ("pickup $::CFG->{pickup}") 1872 $::CONN->send_pickup ($::CFG->{pickup})
1687 if defined $::CONN; 1873 if defined $::CONN;
1688 1874
1689 0 1875 0
1690 }); 1876 });
1691 1877
1694 } 1880 }
1695 1881
1696 $table->add_at (2, 18, new DC::UI::ValSlider 1882 $table->add_at (2, 18, new DC::UI::ValSlider
1697 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1883 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1698 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).",
1699 to_value => sub { ">= " . 5 * $_[0] }, 1886 to_value => sub { ">= " . 5 * $_[0] },
1700 on_changed => sub { 1887 on_changed => sub {
1701 my ($slider, $value) = @_; 1888 my ($slider, $value) = @_;
1702 1889
1703 $::CFG->{pickup} &= ~0xF; 1890 $::CFG->{pickup} &= ~0xF;
1707 }); 1894 });
1708 1895
1709 $table->add_at (3, 18, new DC::UI::Button 1896 $table->add_at (3, 18, new DC::UI::Button
1710 text => "set", 1897 text => "set",
1711 on_activate => sub { 1898 on_activate => sub {
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1899 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1900 if defined $::CONN;
1714 0 1901 0
1715 }); 1902 });
1716 1903
1717 $r 1904 $r
1718} 1905}
1719 1906
1720my %SORT_ORDER = ( 1907my %SORT_ORDER = (
1721 type => undef, 1908 type => sub {
1909 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1910 },
1722 mtime => sub { 1911 mtime => sub {
1723 my $NOW = time; 1912 my $NOW = time;
1724 sort { 1913 sort {
1725 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;
1726 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;
1738 1927
1739sub inventory_widget { 1928sub inventory_widget {
1740 my $hb = new DC::UI::HBox homogeneous => 1; 1929 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1930
1742 $hb->add (my $vb1 = new DC::UI::VBox); 1931 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new DC::UI::Label align => 0, text => "Player"); 1932 $vb1->add (new DC::UI::Label text => "Player");
1744 1933
1745 $vb1->add (my $hb1 = new DC::UI::HBox); 1934 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1935
1747 use sort 'stable'; 1936 use sort 'stable';
1748 1937
1757 $::CFG->{inv_sort} = $_[1]; 1946 $::CFG->{inv_sort} = $_[1];
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1947 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1948 },
1760 ); 1949 );
1761 $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);
1762 #TODO# update to weigh/maxweight 1951 #TODO# update to weight/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => -1); 1952 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1953
1765 $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);
1766 $sw1->add ($INV = new DC::UI::Inventory); 1955 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1956 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1957
1828 $PL_NOTEBOOK->set_current_page ($widget); 2017 $PL_NOTEBOOK->set_current_page ($widget);
1829 $PL_WINDOW->show; 2018 $PL_WINDOW->show;
1830 } 2019 }
1831} 2020}
1832 2021
1833sub player_window { 2022sub make_playerbook {
1834 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2023 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1835 x => "center", 2024 x => "center",
1836 y => "center", 2025 y => "center",
1837 force_w => $WIDTH * 9/10, 2026 force_w => $WIDTH * 9/10,
1838 force_h => $HEIGHT * 9/10, 2027 force_h => $HEIGHT * 9/10,
1872 "License, Author and Source info for media sent by the server."); 2061 "License, Author and Source info for media sent by the server.");
1873 2062
1874 $ntb->set_current_page ($INVENTORY_PAGE); 2063 $ntb->set_current_page ($INVENTORY_PAGE);
1875 2064
1876 $plwin->add ($ntb); 2065 $plwin->add ($ntb);
1877 $plwin
1878} 2066}
1879 2067
1880sub keyboard_setup { 2068sub keyboard_setup {
1881 DC::Macro::keyboard_setup 2069 DC::Macro::keyboard_setup
1882} 2070}
1883 2071
1884sub help_window { 2072sub make_help_window {
1885 my $win = new DC::UI::Toplevel 2073 my $win = new DC::UI::Toplevel
1886 x => 'center', 2074 x => 'center',
1887 y => 'center', 2075 y => 'center',
1888 z => 4, 2076 z => 4,
1889 name => 'doc_browser', 2077 name => 'doc_browser',
1948 my @path = DC::Pod::full_path_of $node; 2136 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 2137 pop @path; # drop current node
1950 2138
1951 for my $node (@path) { 2139 for my $node (@path) {
1952 $buttons->add (new DC::UI::Button 2140 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 2141 text => $node->[DC::Pod::N_KW][0],
1954 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>",
1955 on_activate => sub { 2143 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2144 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 2145 $load_node->($node);
1958 }, 2146 },
1959 ); 2147 );
1960 $buttons->add (new DC::UI::Label text => "/"); 2148 $buttons->add (new DC::UI::Label text => "/");
1961 } 2149 }
1962 2150
1963 $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);
1964 2152
1965 $curnode = $node; 2153 $curnode = $node;
1966 2154
1967 $viewer->clear; 2155 $viewer->clear;
1968 $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);
1978 2166
1979 $load_node->((DC::Pod::find @path)[0]); 2167 $load_node->((DC::Pod::find @path)[0]);
1980 $win->show; 2168 $win->show;
1981 }; 2169 };
1982 2170
1983 $win 2171 $HELP_WINDOW = $win;
1984}
1985
1986sub open_string_query {
1987 my ($title, $cb, $txt, $tooltip) = @_;
1988 my $dialog = new DC::UI::Toplevel
1989 x => "center",
1990 y => "center",
1991 z => 50,
1992 force_w => $WIDTH * 4/5,
1993 title => $title;
1994
1995 $dialog->add (
1996 my $e = new DC::UI::Entry
1997 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1998 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1999 tooltip => $tooltip
2000 );
2001
2002 $e->grab_focus;
2003 $e->set_text ($txt) if $txt;
2004 $dialog->show;
2005} 2172}
2006 2173
2007sub open_quit_dialog { 2174sub open_quit_dialog {
2008 unless ($QUIT_DIALOG) { 2175 unless ($QUIT_DIALOG) {
2009 $QUIT_DIALOG = new DC::UI::Toplevel 2176 $QUIT_DIALOG = new DC::UI::Toplevel
2031 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2032 ); 2199 );
2033 $hb->add (new DC::UI::Button 2200 $hb->add (new DC::UI::Button
2034 text => "Quit anyway", 2201 text => "Quit anyway",
2035 expand => 1, 2202 expand => 1,
2036 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2203 on_activate => sub {
2204 crash "Quit anyway";
2205 EV::unloop EV::UNLOOP_ALL;
2206 },
2037 ); 2207 );
2038 } 2208 }
2039 2209
2040 $QUIT_DIALOG->show; 2210 $QUIT_DIALOG->show;
2041 $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;
2042} 2320}
2043 2321
2044sub show_tip_of_the_day { 2322sub show_tip_of_the_day {
2045 # find all tips 2323 # find all tips
2046 my @tod = DC::Pod::find tip_of_the_day => "*"; 2324 my @tod = DC::Pod::find tip_of_the_day => "*";
2094 $dialog->show; 2372 $dialog->show;
2095 }; 2373 };
2096} 2374}
2097 2375
2098sub sdl_init { 2376sub sdl_init {
2099 DC::SDL_Init 2377 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2100 and die "SDL::Init failed!\n"; 2378 and die "SDL::Init failed!\n";
2101} 2379}
2102 2380
2103sub 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
2104 $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 }
2105 2404
2106 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2405 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2107 2406
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2407 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2408 $FULLSCREEN = $CFG->{fullscreen};
2110 $FAST = $CFG->{fast}; 2409 $FAST = $CFG->{fast};
2111 2410
2411 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2112 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2412 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2413 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2113 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2414 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2114 2415
2115 $SDL_ACTIVE = 1; 2416 $SDL_ACTIVE = 1;
2116 $LAST_REFRESH = time - 0.01; 2417 $LAST_REFRESH = time - 0.01;
2117 2418
2147 force_x => "max", 2448 force_x => "max",
2148 force_y => 0; 2449 force_y => 0;
2149 $DEBUG_STATUS->show; 2450 $DEBUG_STATUS->show;
2150 2451
2151 $STATUSBOX = new DC::UI::Statusbox; 2452 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 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;
2153 2465
2154 (new DC::UI::Frame 2466 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2467 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2468 force_x => 0,
2157 force_y => "max", 2469 force_y => "max",
2158 child => $STATUSBOX, 2470 child => (my $LL = new DC::UI::VBox),
2159 )->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 );
2160 2481
2161 DC::UI::Toplevel->new ( 2482 DC::UI::Toplevel->new (
2162 title => "Minimap", 2483 title => "Minimap",
2163 name => "mapmap", 2484 name => "mapmap",
2164 x => 0, 2485 x => 0,
2165 y => $FONTSIZE + 8, 2486 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2166 border_bg => [1, 1, 1, 192/255], 2487 border_bg => [1, 1, 1, 192/255],
2167 bg => [1, 1, 1, 0], 2488 bg => [1, 1, 1, 0],
2168 child => ($MAPMAP = new DC::MapWidget::MapMap 2489 child => ($MAPMAP = new DC::MapWidget::MapMap
2169 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2170 ), 2491 ),
2171 )->show; 2492 )->show;
2172 2493
2173 $MAPWIDGET = new DC::MapWidget; 2494 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2495 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2496 my ($mapwidget, $preset) = @_;
2176 2497
2177 $MESSAGE_WINDOW->activate_console ($preset) 2498 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2499 if $MESSAGE_DIST;
2179 }); 2500 });
2180 $MAPWIDGET->show; 2501 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2502 $MAPWIDGET->grab_focus;
2182 2503
2183 $COMPLETER = new DC::MapWidget::Command:: 2504 $COMPLETER = new DC::MapWidget::Command::
2195 force_h => $::HEIGHT * 0.6, 2516 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2517 has_close_button => 1,
2197 ; 2518 ;
2198 2519
2199 $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
2200 $MESSAGE_WINDOW = new DC::UI::MessageWindow; 2522 $MESSAGE_WINDOW = new DC::UI::Dockbar
2523 name => "message_window2",
2524 title => 'Messages',
2525 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2526 force_w => $::WIDTH * 0.6,
2527 force_h => $::HEIGHT * 0.25,
2528 ;
2201 2529
2530 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2531
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2532 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2533 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2534
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2535 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2536 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2537 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2220 . "After pressing the combo the binding will be saved automatically and the " 2550 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2551 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2552 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2553 "Some debuggin' options. Do not ask.");
2224 2554
2225 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2555 make_help_window;
2556 make_menubar;
2226 2557
2227 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229
2230 $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232
2233 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2234
2235 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237
2238 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub {
2242 $::CFG->{layout} = DC::UI::get_layout;
2243 DC::write_cfg "$Deliantra::VARDIR/client.cf";
2244 status "Configuration Saved";
2245 0
2246 },
2247 );
2248
2249 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation");
2251
2252
2253 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit",
2255 tooltip => "Terminates the program",
2256 on_activate => sub {
2257 if ($CONN) {
2258 open_quit_dialog;
2259 } else {
2260 EV::unloop EV::UNLOOP_ALL;
2261 }
2262 0
2263 },
2264 );
2265
2266 $BUTTONBAR->show;
2267 $SETUP_DIALOG->show; 2558 $SETUP_DIALOG->show;
2268 $MESSAGE_WINDOW->show; 2559 $MESSAGE_WINDOW->show;
2269 } 2560 }
2270 2561
2562 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2563 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2564
2565 $CAVEAT_LABEL->set_text ("None :)");
2566 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2567 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2568
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2569 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2570}
2273 2571
2274sub video_shutdown { 2572sub video_shutdown {
2275 DC::OpenGL::shutdown; 2573 DC::OpenGL::shutdown;
2574 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2276 2575
2277 undef $SDL_ACTIVE; 2576 undef $SDL_ACTIVE;
2278} 2577}
2279 2578
2280my %animate_object; 2579my %animate_object;
2294 $DC::UI::ROOT->draw; 2593 $DC::UI::ROOT->draw;
2295 DC::SDL_GL_SwapBuffers; 2594 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2595 $LAST_REFRESH = $NOW;
2297} 2596}
2298 2597
2299my $want_refresh = EV::idle_ns \&force_refresh; 2598my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2599
2301my $input = EV::periodic 0, 1/60, undef, sub { 2600my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2601 $NOW = EV::now;
2303 2602
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2603 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2305 for DC::poll_events; 2604 for DC::poll_events;
2306 2605
2307 if (%animate_object) { 2606 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2607 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2608 $WANT_REFRESH = 1;
2321sub animation_stop { 2620sub animation_stop {
2322 my ($widget) = @_; 2621 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2622 delete $animate_object{$widget};
2324} 2623}
2325 2624
2326%SDL_CB = (
2327 DC::SDL_QUIT => sub { 2625$SDL_CB[DC::SDL_QUIT] = sub {
2626 crash "SDL_QUIT";
2328 EV::unloop EV::UNLOOP_ALL; 2627 EV::unloop EV::UNLOOP_ALL;
2329 }, 2628};
2330 DC::SDL_VIDEORESIZE => sub { 2629$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2331 },
2332 DC::SDL_VIDEOEXPOSE => sub { 2630$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2333 DC::UI::full_refresh; 2631 DC::UI::full_refresh;
2334 }, 2632};
2335 DC::SDL_ACTIVEEVENT => sub { 2633$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2634# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2635# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2636# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2637# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2638# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2639# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2640};
2343 DC::SDL_KEYDOWN => sub { 2641$SDL_CB[DC::SDL_KEYDOWN] = sub {
2344 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2642 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2643 # alt-enter
2644 video_shutdown;
2346 $FULLSCREEN_ENABLE->toggle; 2645 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown;
2348 video_init; 2646 video_init;
2349 } else { 2647 } else {
2350 DC::UI::feed_sdl_key_down_event ($_[0]); 2648 &DC::UI::feed_sdl_key_down_event;
2351 }
2352 }, 2649 }
2353 DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event, 2650 update_modbox;
2651};
2652$SDL_CB[DC::SDL_KEYUP] = sub {
2653 &DC::UI::feed_sdl_key_up_event;
2654 update_modbox;
2655};
2354 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2656$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2355 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2657$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2356 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2658$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2357 DC::SDL_USEREVENT => sub { 2659$SDL_CB[DC::SDL_USEREVENT] = sub {
2358 if ($_[0]{code} == 1) { 2660 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2661 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2662 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2663 audio_music_finished;
2362 }
2363 }, 2664 }
2364); 2665};
2365 2666
2366############################################################################# 2667#############################################################################
2367 2668
2368$SIG{INT} = $SIG{TERM} = sub { 2669$SIG{INT} = $SIG{TERM} = sub {
2369 EV::unloop; 2670 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2671 #d# TODO calling exit here hangs the process in some futex
2371}; 2672};
2372 2673
2373{ 2674# due to mac os x + sdl combined braindamage, we need this contortion
2675sub main {
2676 {
2677 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2678
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2679 if (-e "$Deliantra::VARDIR/client.cf") {
2375 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2680 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2681 } else {
2377 #TODO: compatibility cruft 2682 #TODO: compatibility cruft
2378 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2683 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2684 print STDERR "INFO: used old configuration file\n";
2380 } 2685 }
2381 2686
2382 DC::DB::Server::run; 2687 DC::DB::Server::run;
2383 2688
2689 if ($CFG->{db_schema} < 1) {
2690 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2691 DC::DB::nuke_db;
2692 $CFG->{db_schema} = 1;
2693 DC::write_cfg;
2694 }
2695
2696 DC::DB::open_db;
2697
2384 DC::UI::set_layout ($::CFG->{layout}); 2698 DC::UI::set_layout ($::CFG->{layout});
2385 2699
2386 my %DEF_CFG = ( 2700 my %DEF_CFG = (
2701 config_autosave => 1,
2387 sdl_mode => 0, 2702 sdl_mode => undef,
2388 fullscreen => 1, 2703 fullscreen => 1,
2389 fast => 0, 2704 fast => 0,
2390 force_opengl11 => undef, 2705 force_opengl11 => undef,
2706 disable_alpha => 0,
2707 smooth_movement => 1,
2391 texture_compression => 1, 2708 texture_compression => 1,
2392 map_scale => 1, 2709 map_scale => 1,
2393 fow_enable => 1, 2710 fow_enable => 1,
2394 fow_intensity => 0, 2711 fow_intensity => 0,
2395 map_smoothing => 1, 2712 map_smoothing => 1,
2396 gui_fontsize => 1, 2713 gui_fontsize => 1,
2397 log_fontsize => 0.7, 2714 log_fontsize => 0.7,
2398 gauge_fontsize => 1, 2715 gauge_fontsize => 1,
2399 gauge_size => 0.35, 2716 gauge_size => 0.35,
2400 stat_fontsize => 0.7, 2717 stat_fontsize => 0.7,
2401 mapsize => 100, 2718 mapsize => 100,
2402 audio_enable => 1, 2719 audio_enable => 1,
2403 audio_hw_channels => 0, 2720 audio_hw_channels => 0,
2404 audio_hw_frequency => 0, 2721 audio_hw_frequency => 0,
2405 audio_hw_chunksize => 0, 2722 audio_hw_chunksize => 0,
2406 audio_mix_channels => 8, 2723 audio_mix_channels => 8,
2407 effects_enable => 1, 2724 effects_enable => 1,
2408 effects_volume => 1, 2725 effects_volume => 1,
2409 bgm_enable => 1, 2726 bgm_enable => 1,
2410 bgm_volume => 0.5, 2727 bgm_volume => 0.5,
2411 output_rate => "", 2728 output_rate => "",
2412 pickup => 0, 2729 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2413 inv_sort => "mtime", 2730 inv_sort => "mtime",
2414 default => "profile", # default profile 2731 default => "profile", # default profile
2415 show_tips => 1, 2732 show_tips => 1,
2416 logview_max_par => 1000, 2733 logview_max_par => 1000,
2734 shift_fire_stop => 0,
2735 uitheme => "wood",
2736 map_shift_x => -24, # arbitrary
2737 map_shift_y => +24, # arbitrary
2417 ); 2738 );
2418 2739
2419 while (my ($k, $v) = each %DEF_CFG) { 2740 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2741 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2742 }
2422 2743
2423 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2744 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2424 $PROFILE = $CFG->{profile}{default}; 2745 $PROFILE = $CFG->{profile}{default};
2425 2746
2426 # convert old bindings (only default profile matters) 2747 # convert old bindings (only default profile matters)
2427 if (my $bindings = delete $PROFILE->{bindings}) { 2748 if (my $bindings = delete $PROFILE->{bindings}) {
2428 while (my ($mod, $syms) = each %$bindings) { 2749 while (my ($mod, $syms) = each %$bindings) {
2429 while (my ($sym, $cmds) = each %$syms) { 2750 while (my ($sym, $cmds) = each %$syms) {
2430 push @{ $PROFILE->{macro} }, { 2751 push @{ $PROFILE->{macro} }, {
2431 accelkey => [$mod*1, $sym*1], 2752 accelkey => [$mod*1, $sym*1],
2432 action => $cmds, 2753 action => $cmds,
2754 };
2433 }; 2755 }
2434 } 2756 }
2435 } 2757 }
2436 }
2437 2758
2438 sdl_init; 2759 sdl_init;
2439 2760
2440 @SDL_MODES = DC::SDL_ListModes 8, 8; 2761 {
2441 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447
2448 {
2449 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2762 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2763 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2764 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2765 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2766 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2767 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2768 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2769 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2770 DejaVuSansMono-BoldOblique.ttf
2458 ); 2771 );
2459 2772
2460 DC::add_font $_ for @fonts; 2773 DC::add_font $_ for @fonts;
2461 2774
2462 DC::pango_init;
2463
2464 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2775 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2776 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2777
2467 $FONT_PROP->make_default; 2778 $FONT_PROP->make_default;
2468 } 2779
2780 DC::pango_init;
2781 }
2469 2782
2470# compare mono (ft) vs. rgba (cairo) 2783# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2784# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2785# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2786# my $t1 = Time::HiRes::time;
2478# } 2791# }
2479# my $t2 = Time::HiRes::time; 2792# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2793# warn $t2-$t1;
2481# } 2794# }
2482 2795
2483 video_init; 2796 video_init;
2484 audio_init; 2797 audio_init;
2485} 2798 }
2486 2799
2487show_tip_of_the_day if $CFG->{show_tips}; 2800 show_tip_of_the_day if $CFG->{show_tips};
2488 2801
2489our $STARTUP_CANCEL = EV::idle sub { 2802 our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2803 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2804 $startup_done->();
2492}; 2805 };
2493 2806
2807 delete $SIG{__DIE__};
2494EV::loop; 2808 EV::loop;
2495 2809
2810 DC::write_cfg if $CFG->{config_autosave};
2811
2496#video_shutdown; 2812 #video_shutdown;
2497#audio_shutdown; 2813 #audio_shutdown;
2814
2498DC::OpenGL::quit; 2815 DC::OpenGL::quit;
2499DC::SDL_Quit; 2816 DC::SDL_Quit;
2500DC::DB::Server::stop; 2817 DC::DB::Server::stop;
2818}
2819
2820DC::SDL_braino; # see sub above
2501 2821
2502=head1 NAME 2822=head1 NAME
2503 2823
2504deliantra - A Deliantra MORPG game client 2824deliantra - A Deliantra MORPG game client
2505 2825
2522 4 show fps 2842 4 show fps
2523 8 suppress tooltips 2843 8 suppress tooltips
2524 2844
2525=head1 AUTHOR 2845=head1 AUTHOR
2526 2846
2527Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2847Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2528 2848
2529 2849
2530 2850

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines