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.19 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.95 by root, Sun Apr 26 19:10:57 2009 UTC

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

Diff Legend

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