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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFPlus; 82use CFPlus;
38use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
39use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
41use CFPlus::Pod; 91use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 92use CFPlus::MapWidget;
93use CFPlus::Macro;
44 94
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 96$SIG{PIPE} = 'IGNORE';
47 97
48$Event::Eval = 0; 98$Event::Eval = 1;
49$Event::DIED = sub { 99$Event::DIED = sub {
50 # TODO: display dialog box or so 100 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 101};
55
56our $VERSION = '0.9';
57 102
58my $MAX_FPS = 60; 103my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 104my $MIN_FPS = 5; # unused as of yet
60 105
61our $META_SERVER = "crossfire.real-time.com:13326"; 106our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62 107
63our $LAST_REFRESH; 108our $LAST_REFRESH;
64our $NOW; 109our $NOW;
65 110
66our $CFG; 111our $CFG;
67our $CONN; 112our $CONN;
113our $PROFILE; # current profile
68our $FAST; # fast, low-quality mode, possibly useful for software-rendering 114our $FAST; # fast, low-quality mode, possibly useful for software-rendering
69 115
70our $WANT_REFRESH; 116our $WANT_REFRESH;
71our $CAN_REFRESH; 117our $CAN_REFRESH;
72 118
81 127
82our $MAP; 128our $MAP;
83our $MAPMAP; 129our $MAPMAP;
84our $MAPWIDGET; 130our $MAPWIDGET;
85our $BUTTONBAR; 131our $BUTTONBAR;
86our $LOGVIEW;
87our $CONSOLE;
88our $METASERVER; 132our $METASERVER;
89our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
90our $QUIT_DIALOG; 134our $QUIT_DIALOG;
91our $HOST_ENTRY; 135our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
103 147
104our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
105our $STATS_PAGE; 149our $STATS_PAGE;
106our $SKILL_PAGE; 150our $SKILL_PAGE;
107our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
108 153
109our $HELP_WINDOW; 154our $HELP_WINDOW;
110our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
111our $FLOORBOX; 156our $FLOORBOX;
112our $GAUGES; 157our $GAUGES;
114 159
115our $SDL_ACTIVE; 160our $SDL_ACTIVE;
116our %SDL_CB; 161our %SDL_CB;
117 162
118our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
119our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
120our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
121 172
122our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
123our $STATUSBOX; 174our $STATUSBOX;
125 176
126our $INV; 177our $INV;
127our $INVR; 178our $INVR;
128our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
129 180
130our $BIND_EDITOR;
131our $BIND_UPD_CB;
132
133our $PICKUP_CFG; 181our $PICKUP_CFG;
134 182
135sub status { 183sub status {
136 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137} 185}
138 186
139sub debug { 187sub debug {
140 $DEBUG_STATUS->set_text ($_[0]); 188 $DEBUG_STATUS->set_text ($_[0]);
189}
190
191sub message {
192 my ($para) = @_;
193 $MESSAGE_WINDOW->message ($para);
141} 194}
142 195
143sub destroy_query_dialog { 196sub destroy_query_dialog {
144 (delete $_[0]{query_dialog})->destroy 197 (delete $_[0]{query_dialog})->destroy
145 if $_[0]{query_dialog}; 198 if $_[0]{query_dialog};
146} 199}
147 200
201# FIXME: a very ugly hack to wait for stat update look below! #d#
202our $QUERY_TIMER; #d#
203
148# server query dialog 204# server query dialog
149sub server_query { 205sub server_query {
150 my ($conn, $flags, $prompt) = @_; 206 my ($conn, $flags, $prompt) = @_;
207
208 # FIXME: a very ugly hack to wait for stat update #d#
209 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
210 unless ($QUERY_TIMER) {
211 $QUERY_TIMER =
212 Event->timer (
213 after => 1,
214 cb => sub {
215 server_query ($conn, $flags, $prompt, 1);
216 $QUERY_TIMER = undef
217 }
218 );
219 return;
220 }
221 }
151 222
152 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 223 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153 x => "center", 224 x => "center",
154 y => "center", 225 y => "center",
155 title => "Server Query", 226 title => "Server Query",
156 child => my $vbox = new CFPlus::UI::VBox, 227 child => my $vbox = new CFPlus::UI::VBox,
157 ; 228 ;
158 229
159 my @dialog = my $label = new CFPlus::UI::Label 230 my @dialog = my $label = new CFPlus::UI::Label
160 max_w => $::WIDTH * 0.4, 231 max_w => $::WIDTH * 0.8,
161 ellipsise => 0, 232 ellipsise => 0,
162 text => $prompt; 233 text => $prompt;
163 234
164 if ($flags & CS_QUERY_YESNO) { 235 if ($flags & CS_QUERY_YESNO) {
165 push @dialog, my $hbox = new CFPlus::UI::HBox; 236 push @dialog, my $hbox = new CFPlus::UI::HBox;
182 ); 253 );
183 254
184 $dialog->grab_focus; 255 $dialog->grab_focus;
185 256
186 } elsif ($flags & CS_QUERY_SINGLECHAR) { 257 } elsif ($flags & CS_QUERY_SINGLECHAR) {
187 $dialog->{tooltip} = "#charcreation_focus";
188
189 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 258 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190 $MESSAGE_WINDOW->show; 259 $dialog->{tooltip} = "#charcreation_focus";
191 260
192 unshift @dialog, new CFPlus::UI::Label 261 unshift @dialog, new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 262 max_w => $::WIDTH * 0.8,
194 ellipsise => 0, 263 ellipsise => 0,
195 markup => "\nOr use your keyboard and the text entry below:\n"; 264 markup => "\nOr use your keyboard and the text entry below:\n";
196 265
197 unshift @dialog, my $table = new CFPlus::UI::Table; 266 unshift @dialog, my $table = new CFPlus::UI::Table;
198 267
199 $table->add (0, 0, new CFPlus::UI::Button 268 $table->add_at (0, 0, new CFPlus::UI::Button
200 text => "Next Race", 269 text => "Next Race",
201 on_activate => sub { 270 on_activate => sub {
202 $conn->send ("reply n"); 271 $conn->send ("reply n");
203 destroy_query_dialog $conn; 272 destroy_query_dialog $conn;
204 0 273 0
205 }, 274 },
206 ); 275 );
207 $table->add (2, 0, new CFPlus::UI::Button 276 $table->add_at (2, 0, new CFPlus::UI::Button
208 text => "Accept", 277 text => "Accept",
209 on_activate => sub { 278 on_activate => sub {
210 $conn->send ("reply d"); 279 $conn->send ("reply d");
211 destroy_query_dialog $conn; 280 destroy_query_dialog $conn;
212 0 281 0
213 }, 282 },
214 ); 283 );
215 284
285 if ($conn->{chargen_race_description}) {
286 unshift @dialog, new CFPlus::UI::Label
287 max_w => $::WIDTH * 0.8,
288 ellipsise => 0,
289 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
290 ;
291 }
292
293 unshift @dialog, new CFPlus::UI::Face
294 face => $conn->{player}{face},
295 bg => [.2, .2, .2, 1],
296 min_w => 64,
297 min_h => 64,
298 ;
299
300 if ($conn->{chargen_race_title}) {
301 unshift @dialog, new CFPlus::UI::Label
302 allign => 1,
303 ellipsise => 0,
304 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
305 ;
306 }
307
216 unshift @dialog, new CFPlus::UI::Label 308 unshift @dialog, new CFPlus::UI::Label
217 max_w => $::WIDTH * 0.4, 309 max_w => $::WIDTH * 0.4,
218 ellipsise => 0, 310 ellipsise => 0,
219 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 311 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220 ; 312 ;
224 $conn->send ("reply $stat"); 316 $conn->send ("reply $stat");
225 destroy_query_dialog $conn; 317 destroy_query_dialog $conn;
226 return; 318 return;
227 } 319 }
228 320
229 $STATS_PAGE->show;
230 $MESSAGE_WINDOW->hide;
231
232 unshift @dialog, new CFPlus::UI::Label 321 unshift @dialog, new CFPlus::UI::Label
233 max_w => $::WIDTH * 0.4, 322 max_w => $::WIDTH * 0.4,
234 ellipsise => 0, 323 ellipsise => 0,
235 markup => "\nOr use your keyboard and the text entry below:\n"; 324 markup => "\nOr use your keyboard and the text entry below:\n";
236 325
237 unshift @dialog, my $table = new CFPlus::UI::Table; 326 unshift @dialog, my $table = new CFPlus::UI::Table;
238 327
239 # left: re-roll 328 # left: re-roll
240 $table->add (0, 0, new CFPlus::UI::Button 329 $table->add_at (0, 0, new CFPlus::UI::Button
241 text => "Roll Again", 330 text => "Roll Again",
242 on_activate => sub { 331 on_activate => sub {
243 $conn->send ("reply y"); 332 $conn->send ("reply y");
244 destroy_query_dialog $conn; 333 destroy_query_dialog $conn;
245 0 334 0
259 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 348 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
260 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 349 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
261 ], 350 ],
262 ), 1 .. 2; 351 ), 1 .. 2;
263 352
264 $table->add (2, 0, new CFPlus::UI::Button 353 $table->add_at (2, 0, new CFPlus::UI::Button
265 text => "Swap Stats", 354 text => "Swap Stats",
266 on_activate => sub { 355 on_activate => sub {
267 $conn->{stat_change_with} = $sw2->{value}; 356 $conn->{stat_change_with} = $sw2->{value};
268 $conn->send ("reply $sw1->{value}"); 357 $conn->send ("reply $sw1->{value}");
269 destroy_query_dialog $conn; 358 destroy_query_dialog $conn;
270 0 359 0
271 }, 360 },
272 ); 361 );
273 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 362 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
274 363
275 # right: accept 364 # right: accept
276 $table->add (4, 0, new CFPlus::UI::Button 365 $table->add_at (4, 0, new CFPlus::UI::Button
277 text => "Accept", 366 text => "Accept",
278 on_activate => sub { 367 on_activate => sub {
279 $conn->send ("reply n"); 368 $conn->send ("reply n");
280 $STATS_PAGE->hide; 369 $STATS_PAGE->hide;
281 destroy_query_dialog $conn; 370 destroy_query_dialog $conn;
346 $LOGIN_BUTTON->set_text ("Logout"); 435 $LOGIN_BUTTON->set_text ("Logout");
347 $SETUP_DIALOG->hide; 436 $SETUP_DIALOG->hide;
348 437
349 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 438 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
350 439
351 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 440 my ($host, $port) = split /:/, $PROFILE->{host};
352 441
353 $MAP = new CFPlus::Map $mapsize, $mapsize; 442 $MAP = new CFPlus::Map;
354 443
355 $CONN = eval { 444 $CONN = eval {
356 new CFPlus::Protocol 445 new CFPlus::Protocol
357 host => $host, 446 host => $host,
358 port => $port || 13327, 447 port => $port || 13327,
359 user => $CFG->{profile}{default}{user}, 448 user => $PROFILE->{user},
360 pass => $CFG->{profile}{default}{password}, 449 pass => $PROFILE->{password},
361 mapw => $mapsize, 450 mapw => $mapsize,
362 maph => $mapsize, 451 maph => $mapsize,
363 452
364 client => "cfplus $VERSION $] $^O", 453 client => "cfplus $CFPlus::VERSION $] $^O",
365 454
366 map_widget => $MAPWIDGET, 455 map_widget => $MAPWIDGET,
367 logview => $LOGVIEW,
368 statusbox => $STATUSBOX, 456 statusbox => $STATUSBOX,
369 map => $MAP, 457 map => $MAP,
370 mapmap => $MAPMAP, 458 mapmap => $MAPMAP,
371 query => \&server_query, 459 query => \&server_query,
460
461 setup_req => {
462 smoothing => $CFG->{map_smoothing}*1,
463 },
372 464
373 sound_play => sub { 465 sound_play => sub {
374 my ($x, $y, $soundnum, $type) = @_; 466 my ($x, $y, $soundnum, $type) = @_;
375 467
376 $SDL_MIXER 468 $SDL_MIXER
396sub stop_game { 488sub stop_game {
397 $LOGIN_BUTTON->set_text ("Login"); 489 $LOGIN_BUTTON->set_text ("Login");
398 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 490 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
399 $SETUP_DIALOG->show; 491 $SETUP_DIALOG->show;
400 $PL_WINDOW->hide; 492 $PL_WINDOW->hide;
401 $SPELL_PAGE->clear_spells; 493 $SPELL_LIST->clear_spells;
494 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
495
496 &audio_music_set ([]);
402 497
403 return unless $CONN; 498 return unless $CONN;
404 499
405 status "connection closed"; 500 status "connection closed";
406 501
414sub graphics_setup { 509sub graphics_setup {
415 my $vbox = new CFPlus::UI::VBox; 510 my $vbox = new CFPlus::UI::VBox;
416 511
417 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 512 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
418 513
514 my $row = 0;
515
516 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
517 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
518 can_events => 1,
519 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
520
521 my $vidmode_tooltip =
522 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
523 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
524
419 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 525 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
420 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 526 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
421 527
528 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
422 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 529 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
423 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 530 tooltip => $vidmode_tooltip);
531 $hbox->add (my $mode_label = new CFPlus::UI::Label
532 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
533 can_events => 1, tooltip => $vidmode_tooltip);
424 534
425 $mode_slider->connect (changed => sub { 535 $mode_slider->connect (changed => sub {
426 my ($self, $value) = @_; 536 my ($self, $value) = @_;
427 537
428 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 538 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
429 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 539 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
430 }); 540 });
431 $mode_slider->emit (changed => $mode_slider->{range}[0]); 541 $mode_slider->emit (changed => $mode_slider->{range}[0]);
432 542
433 my $row = 1;
434
435 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 543 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
436 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 544 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
437 state => $CFG->{fullscreen}, 545 state => $CFG->{fullscreen},
438 tooltip => "Bring the client into fullscreen mode.", 546 tooltip => "Bring the client into fullscreen mode.",
439 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 547 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
440 ); 548 );
441 549
442 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 550 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
443 $table->add (1, $row++, new CFPlus::UI::CheckBox 551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
444 state => $CFG->{fast}, 552 state => $CFG->{fast},
445 tooltip => "Lower the visual quality considerably to speed up rendering.", 553 tooltip => "Lower the visual quality considerably to speed up rendering.",
446 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 554 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
447 ); 555 );
448 556
557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
558 $table->add_at (1, $row++, new CFPlus::UI::Slider
559 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
560 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
561 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
562 );
563
564 $table->add_at (1, $row++, new CFPlus::UI::Button
565 expand => 1, align => 0, text => "Apply",
566 tooltip => "Apply the video settings above.",
567 on_activate => sub {
568 video_shutdown ();
569 video_init ();
570 0
571 }
572 );
573
449 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 574 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
450 $table->add (1, $row++, new CFPlus::UI::Slider 575 $table->add_at (1, $row++, new CFPlus::UI::Slider
451 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 576 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
452 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 577 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
453 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 578 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
454 ); 579 );
455 580
581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
583 state => $CFG->{map_smoothing},
584 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
585 . "This increases load on the graphics subsystem and works only with 2.x servers. "
586 . "Changes take effect at next connection only.",
587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
588 );
589
456 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 590 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
457 $table->add (1, $row++, new CFPlus::UI::CheckBox 591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
458 state => $CFG->{fow_enable}, 592 state => $CFG->{fow_enable},
459 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 593 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
460 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 594 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
461 ); 595 );
462 596
463 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 597 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
464 $table->add (1, $row++, new CFPlus::UI::Slider 598 $table->add_at (1, $row++, new CFPlus::UI::Slider
465 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 599 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
466 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 600 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
467 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 601 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
468 ); 602 );
469 603
470 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
471 $table->add (1, $row++, new CFPlus::UI::CheckBox
472 state => $CFG->{fow_smooth},
473 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
474 on_changed => sub {
475 my ($self, $value) = @_;
476 $CFG->{fow_smooth} = $value;
477 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
478 0
479 }
480 );
481
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
483 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
485 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
486 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
487 );
488
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 604 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
490 $table->add (1, $row++, new CFPlus::UI::Slider 605 $table->add_at (1, $row++, new CFPlus::UI::Slider
491 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
492 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 607 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
493 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 608 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
494 ); 609 );
495 610
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 611 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
497 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
499 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 614 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
500 on_changed => sub { 615 on_changed => sub {
501 $CFG->{gauge_fontsize} = $_[1]; 616 $CFG->{gauge_fontsize} = $_[1];
502 &set_gauge_window_fontsize; 617 &set_gauge_window_fontsize;
503 0 618 0
504 } 619 }
505 ); 620 );
506 621
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 622 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
508 $table->add (1, $row++, new CFPlus::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{gauge_size}, 0.2, 0.8], 624 range => [$CFG->{gauge_size}, 0.2, 0.8],
510 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 625 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
511 on_changed => sub { 626 on_changed => sub {
512 $CFG->{gauge_size} = $_[1]; 627 $CFG->{gauge_size} = $_[1];
513 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 628 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
514 0 629 0
515 } 630 }
516 ); 631 );
517 632
518 $table->add (1, $row++, new CFPlus::UI::Button
519 expand => 1, align => 0, text => "Apply",
520 tooltip => "Apply the video settings",
521 on_activate => sub {
522 video_shutdown ();
523 video_init ();
524 0
525 }
526 );
527
528 $vbox 633 $vbox
529} 634}
530 635
531sub audio_setup { 636sub audio_setup {
532 my $vbox = new CFPlus::UI::VBox; 637 my $vbox = new CFPlus::UI::VBox;
533 638
534 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 639 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
535 640
536 my $row = 0; 641 my $row = 0;
537 642
538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
539 $table->add (1, $row++, new CFPlus::UI::CheckBox 644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
540 state => $CFG->{audio_enable}, 645 state => $CFG->{audio_enable},
541 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.", 646 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.",
542 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 647 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
543 ); 648 );
544# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 649# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
545# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 650# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
546# $CFG->{effects_volume} = $_[1]; 651# $CFG->{effects_volume} = $_[1];
547# }); 652# });
548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
549 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
550 $hbox->add (new CFPlus::UI::CheckBox 655 $hbox->add (new CFPlus::UI::CheckBox
551 expand => 1, state => $CFG->{bgm_enable}, 656 expand => 1, state => $CFG->{bgm_enable},
552 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 657 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
553 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 658 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
554 ); 659 );
556 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
557 tooltip => "The volume of the background music. Changes are instant.", 662 tooltip => "The volume of the background music. Changes are instant.",
558 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 663 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
559 ); 664 );
560 665
561 $table->add (1, $row++, new CFPlus::UI::Button 666 $table->add_at (1, $row++, new CFPlus::UI::Button
562 expand => 1, align => 0, text => "Apply", 667 expand => 1, align => 0, text => "Apply",
563 tooltip => "Apply the audio settings", 668 tooltip => "Apply the audio settings",
564 on_activate => sub { 669 on_activate => sub {
565 audio_shutdown (); 670 audio_shutdown ();
566 audio_init (); 671 audio_init ();
625} 730}
626 731
627sub debug_setup { 732sub debug_setup {
628 my $table = new CFPlus::UI::Table; 733 my $table = new CFPlus::UI::Table;
629 734
630 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 735 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
631 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 736 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
632 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 737 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
633 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 738 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
634 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 739 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
635 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 740 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
636 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 741 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
637 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 742 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
743 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
638 744
639 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 745 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
640 746
641 for my $x (0..2) { 747 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
642 for my $y (0 .. 2) { 748 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
643 $table->add ($x + 3, $y, 749 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
644 new CFPlus::UI::Entry 750 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
645 text => $default_smooth[$x * 3 + $y], 751 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
646 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 752 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
647 ); 753
648 } 754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755
756 $c->add_items ({
757 type => "line_loop",
758 color => [0, 1, 0],
759 width => 9,
760 coord_mode => "abs",
761 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
649 } 762 });
650 763
764 $c->add_items ({
765 type => "lines",
766 color => [1, 1, 0],
767 width => 2,
768 coord_mode => "rel",
769 coord => [[0,0], [1,1], [1,0], [0,1]],
770 });
771
772 $c->add_items ({
773 type => "polygon",
774 color => [0, 0.43, 0],
775 width => 2,
776 coord_mode => "rel",
777 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
778 });
651 779
652 $table 780 $table
653} 781}
654 782
655sub stats_window { 783sub stats_window {
703 [2, 4, st_spd => "Spd", 10.54], 831 [2, 4, st_spd => "Spd", 10.54],
704 [2, 5, st_wspd => "WSp", 10.54], 832 [2, 5, st_wspd => "WSp", 10.54],
705 ) { 833 ) {
706 my ($col, $row, $id, $label, $template) = @$_; 834 my ($col, $row, $id, $label, $template) = @$_;
707 835
708 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 836 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
709 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 837 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
710 align => +1, template => $template, tooltip => "#stat_$label"); 838 align => +1, template => $template, tooltip => "#stat_$label");
711 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 839 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
712 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
713 align => -1, text => $label, tooltip => "#stat_$label"); 841 align => -1, text => $label, tooltip => "#stat_$label");
714 } 842 }
715 843
716 $vb->add (new CFPlus::UI::FancyFrame 844 $vb->add (new CFPlus::UI::FancyFrame
757 cold => ["Cold", 885 cold => ["Cold",
758 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 886 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
759 ghit => ["Ghost hit", 887 ghit => ["Ghost hit",
760 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 888 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
761 ); 889 );
890
762 for (qw/slow holyw conf fire depl magic 891 for (qw/slow holyw conf fire depl magic
763 drain acid pois para deat phys 892 drain acid pois para deat phys
764 blind fear tund elec cold ghit/) 893 blind fear tund elec cold ghit/)
765 { 894 {
766 $tbl2->add ($col, $row, 895 $tbl2->add_at ($col, $row,
767 $STATWIDS->{"res_$_"} = 896 $STATWIDS->{"res_$_"} =
768 new CFPlus::UI::Label 897 new CFPlus::UI::Label
769 font => $FONT_FIXED, 898 font => $FONT_FIXED,
770 template => "-100%", 899 template => "-100%",
771 align => +1, 900 align => +1,
772 valign => 0, 901 valign => 0,
773 can_events => 1, 902 can_events => 1,
774 can_hover => 1, 903 can_hover => 1,
775 tooltip => $resist_names{$_}->[1], 904 tooltip => $resist_names{$_}->[1],
776 ); 905 );
777 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 906 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
778 font => $FONT_FIXED, 907 font => $FONT_FIXED,
779 can_hover => 1, 908 can_hover => 1,
780 can_events => 1, 909 can_events => 1,
781 path => "ui/resist/resist_$_.png", 910 path => "ui/resist/resist_$_.png",
782 tooltip => $resist_names{$_}->[1], 911 tooltip => $resist_names{$_}->[1],
783 ); 912 );
784 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 913 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
785 text => $resist_names{$_}->[0], 914 text => $resist_names{$_}->[0],
786 font => $FONT_FIXED, 915 font => $FONT_FIXED,
787 can_hover => 1, 916 can_hover => 1,
788 can_events => 1, 917 can_events => 1,
789 tooltip => $resist_names{$_}->[1], 918 tooltip => $resist_names{$_}->[1],
822 return if $METASERVER_ATIME > time; 951 return if $METASERVER_ATIME > time;
823 $METASERVER_ATIME = time + 60; 952 $METASERVER_ATIME = time + 60;
824 953
825 my $table = $METASERVER->{table}; 954 my $table = $METASERVER->{table};
826 $table->clear; 955 $table->clear;
827 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 956 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
828 957
829 my $buf; 958 my $ok = 0;
830 959
831 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 960 CFPlus::background {
961 my $ua = CFPlus::lwp_useragent;
832 962
833 unless ($fh) { 963 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
834 $label->set_text ("unable to contact metaserver: $!"); 964 } sub {
835 return; 965 my ($msg) = @_;
836 } 966 if ($msg) {
837
838 Event->io (fd => $fh, poll => 'r', cb => sub {
839 my $res = sysread $fh, $buf, 8192, length $buf;
840
841 if (!defined $res) {
842 $_[0]->w->cancel;
843 $label->set_text ("error while retrieving server list: $!");
844 } elsif ($res == 0) {
845 $_[0]->w->cancel;
846 status "server list retrieved";
847
848 utf8::decode $buf if utf8::valid $buf;
849
850 $table->clear; 967 $table->clear;
851 968
852 my @tip = ( 969 my @tip = (
853 "The current number of users logged in on the server.", 970 "The current number of users logged in on the server.",
854 "The hostname of the server.", 971 "The hostname of the server.",
855 "The time this server has been running without being restarted.", 972 "The time this server has been running without being restarted.",
856 "The server software version - a '+' indicates a Crossfire+ server.", 973 "The server software version - a '+' indicates a Crossfire+ server.",
857 "Short information about this server provided by its admins.", 974 "Short information about this server provided by its admins.",
858 ); 975 );
859 my @col = qw(#Users Host Uptime Version Description); 976 my @col = qw(#Users Host Uptime Version Description);
860 $table->add ($_, 0, new CFPlus::UI::Label 977 $table->add_at ($_, 0, new CFPlus::UI::Label
861 can_hover => 1, can_events => 1, 978 can_hover => 1, can_events => 1,
862 align => 0, fg => [1, 1, 0], 979 align => 0, fg => [1, 1, 0],
863 text => $col[$_], tooltip => $tip[$_]) 980 text => $col[$_], tooltip => $tip[$_])
864 for 0 .. $#col; 981 for 0 .. $#col;
865 982
866 my @align = qw(1 0 1 1 -1); 983 my @align = qw(1 0 1 1 -1);
867 984
868 my $y = 0; 985 my $y = 0;
869 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 986 for my $m (@{ $msg->{servers} }) {
870 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 987 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
988 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
871 989
872 for ($desc) { 990 for ($desc) {
873 s/<br>/\n/gi; 991 s/<br>/\n/gi;
874 s/<li>/\n· /gi; 992 s/<li>/\n· /gi;
875 s/<.*?>//sgi; 993 s/<.*?>//sgi;
876 s/&/&amp;/g; 994 s/&amp;/&/g;
877 s/</&lt;/g; 995 s/&lt;/</g;
878 s/>/&gt;/g; 996 s/&gt;/>/g;
879 } 997 }
880 998
881 $uptime = sprintf "%dd %02d:%02d:%02d", 999 $uptime = sprintf "%dd %02d:%02d:%02d",
882 (int $m->[8] / 86400), 1000 (int $uptime / 86400),
883 (int $m->[8] / 3600) % 24, 1001 (int $uptime / 3600) % 24,
884 (int $m->[8] / 60) % 60, 1002 (int $uptime / 60) % 60,
885 $m->[8] % 60; 1003 $uptime % 60;
886 1004
887 $m = [$users, $host, $uptime, $version, $desc]; 1005 $m = [$users, $host, $uptime, $version, $desc];
888 1006
889 $y++; 1007 $y++;
890 1008
891 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1009 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
892 (new CFPlus::UI::Button 1010 (new CFPlus::UI::Button
893 text => "Use", 1011 text => "Use",
894 tooltip => "Put this server into the <b>Host:Port</b> field", 1012 tooltip => "Put this server into the <b>Host:Port</b> field",
895 on_activate => sub { 1013 on_activate => sub {
896 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1014 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
899 }, 1017 },
900 ), 1018 ),
901 (new CFPlus::UI::Empty expand => 1), 1019 (new CFPlus::UI::Empty expand => 1),
902 ]); 1020 ]);
903 1021
904 $table->add ($_, $y, new CFPlus::UI::Label 1022 $table->add_at ($_, $y, new CFPlus::UI::Label
1023 max_w => $::WIDTH * 0.4,
905 ellipsise => 0, 1024 ellipsise => 0,
906 align => $align[$_], 1025 align => $align[$_],
907 text => $m->[$_], 1026 text => $m->[$_],
908 tooltip => $tip[$_], 1027 tooltip => $tip[$_],
1028 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
909 can_hover => 1, 1029 can_hover => 1,
910 can_events => 1, 1030 can_events => 1,
911 fontsize => 0.8) 1031 fontsize => 0.8)
912 for 0 .. $#$m; 1032 for 0 .. $#$m;
913 } 1033 }
1034 } else {
1035 $ok or $label->set_text ("error while contacting metaserver");
914 } 1036 }
915 }); 1037 };
1038
916} 1039}
917 1040
918sub metaserver_dialog { 1041sub metaserver_dialog {
919 my $vbox = new CFPlus::UI::VBox; 1042 my $vbox = new CFPlus::UI::VBox;
920 my $table = new CFPlus::UI::Table; 1043 my $table = new CFPlus::UI::Table;
924 title => "Server List", 1047 title => "Server List",
925 name => 'metaserver_dialog', 1048 name => 'metaserver_dialog',
926 x => 'center', 1049 x => 'center',
927 y => 'center', 1050 y => 'center',
928 z => 3, 1051 z => 3,
1052 force_w => $::WIDTH * 0.9,
929 force_h => $::HEIGHT * 0.4, 1053 force_h => $::HEIGHT * 0.7,
930 child => $vbox, 1054 child => $vbox,
931 has_close_button => 1, 1055 has_close_button => 1,
932 table => $table, 1056 table => $table,
933 on_visibility_change => sub { 1057 on_visibility_change => sub {
934 update_metaserver ($_[0]) if $_[1]; 1058 update_metaserver ($_[0]) if $_[1];
944 1068
945 $vbox->add (new CFPlus::UI::FancyFrame 1069 $vbox->add (new CFPlus::UI::FancyFrame
946 label => "Connection Settings", 1070 label => "Connection Settings",
947 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1071 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
948 ); 1072 );
949 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1073 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
950 1074
951 { 1075 {
952 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1076 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
953 1077
954 $vbox->add ( 1078 $vbox->add (
955 $HOST_ENTRY = new CFPlus::UI::Entry 1079 $HOST_ENTRY = new CFPlus::UI::Entry
956 expand => 1, 1080 expand => 1,
957 text => $CFG->{profile}{default}{host}, 1081 text => $CFG->{profile}{default}{host},
971 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1095 on_activate => sub { $METASERVER->toggle_visibility; 0 },
972 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
973 ); 1097 );
974 } 1098 }
975 1099
976 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
977 $table->add (1, 4, new CFPlus::UI::Entry 1101 $table->add_at (1, 4, new CFPlus::UI::Entry
978 text => $CFG->{profile}{default}{user}, 1102 text => $CFG->{profile}{default}{user},
979 tooltip => "The name of your character on the server", 1103 tooltip => "The name of your character on the server",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
981 ); 1105 );
982 1106
983 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
984 $table->add (1, 5, new CFPlus::UI::Entry 1108 $table->add_at (1, 5, new CFPlus::UI::Entry
985 text => $CFG->{profile}{default}{password}, 1109 text => $CFG->{profile}{default}{password},
986 hidden => 1, 1110 hidden => 1,
987 tooltip => "The password for your character", 1111 tooltip => "The password for your character",
988 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
989 ); 1113 );
990 1114
991 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
992 $table->add (1, 7, new CFPlus::UI::Slider 1116 $table->add_at (1, 7, new CFPlus::UI::Slider
993 force_w => 100, 1117 force_w => 100,
994 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1118 range => [$CFG->{mapsize}, 10, 100, 0, 1],
995 tooltip => "This is the size of the portion of the map update the server sends you. " 1119 tooltip => "This is the size of the portion of the map update the server sends you. "
996 . "If you set this to a high value you will be able to see further, " 1120 . "If you set this to a high value you will be able to see further, "
997 . "but you also increase bandwidth requirements and latency. " 1121 . "but you also increase bandwidth requirements and latency. "
998 . "This option is only used once at log-in.", 1122 . "This option is only used once at log-in.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1000 ); 1124 );
1001 1125
1002 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1003 $table->add (1, 8, new CFPlus::UI::CheckBox 1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1004 state => $CFG->{face_prefetch}, 1128 state => $CFG->{face_prefetch},
1005 tooltip => "<b>Background Image Prefetch</b>\n\n" 1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
1006 . "If enabled, the client automatically pre-fetches images from the server. " 1130 . "If enabled, the client automatically pre-fetches images from the server. "
1007 . "This might increase or create lag, but increases the chances " 1131 . "This might increase or create lag, but increases the chances "
1008 . "of faces being ready for display when you encounter them. " 1132 . "of faces being ready for display when you encounter them. "
1010 . "so only set it if you really need to prefetch images. " 1134 . "so only set it if you really need to prefetch images. "
1011 . "This option can be set and unset any time.", 1135 . "This option can be set and unset any time.",
1012 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1013 ); 1137 );
1014 1138
1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1140 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_rate},
1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1144 . "default will be used, which is usually around 100kb/s.",
1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1146 );
1147
1015 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1016 $table->add (1, 9, new CFPlus::UI::Entry 1149 $table->add_at (1, 10, new CFPlus::UI::Entry
1017 text => $CFG->{output_count}, 1150 text => $CFG->{output_count},
1018 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1019 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1020 ); 1153 );
1021 1154
1022 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1023 $table->add (1, 10, new CFPlus::UI::Entry 1156 $table->add_at (1, 11, new CFPlus::UI::Entry
1024 text => $CFG->{output_sync}, 1157 text => $CFG->{output_sync},
1025 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1026 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1027 ); 1160 );
1028 1161
1029 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1030 expand => 1, 1163 expand => 1,
1031 align => 0, 1164 align => 0,
1032 text => "Login", 1165 text => "Login",
1033 on_activate => sub { 1166 on_activate => sub {
1034 $CONN ? stop_game 1167 $CONN ? stop_game
1035 : start_game; 1168 : start_game;
1036 0 1169 0
1037 }, 1170 },
1038 ); 1171 );
1039 1172
1040 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1173 $vbox->add (new CFPlus::UI::FancyFrame
1041 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1174 label => "Server Info",
1042 text => $CFG->{say_command}, 1175 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1043 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1044 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1045 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1046 on_changed => sub {
1047 my ($self, $value) = @_;
1048 $CFG->{say_command} = $value;
1049 0
1050 }
1051 ); 1176 );
1052 1177
1178 $vbox
1179}
1180
1181sub client_setup {
1182 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1183
1184 my $row = 0;
1185
1053 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1186 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1054 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1187 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1055 state => $CFG->{show_tips}, 1188 state => $CFG->{show_tips},
1056 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1057 on_changed => sub { 1190 on_changed => sub {
1058 my ($self, $value) = @_; 1191 my ($self, $value) = @_;
1059 $CFG->{shop_tips} = $value; 1192 $CFG->{show_tips} = $value;
1060 0 1193 0
1061 } 1194 }
1062 ); 1195 );
1063 1196
1064 $vbox->add (new CFPlus::UI::FancyFrame 1197 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1065 label => "Server Info", 1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1066 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1199 text => $CFG->{logview_max_par},
1067 ); 1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1068 1201 . "sends more messages than this number, older messages get removed to save memory and "
1069 $vbox 1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1070}
1071
1072sub message_window {
1073 my $window = new CFPlus::UI::Toplevel
1074 name => "message_window",
1075 title => "Messages",
1076 border_bg => [1, 1, 1, 1],
1077 x => "max",
1078 y => 0,
1079 force_w => $::WIDTH * 0.4,
1080 force_h => $::HEIGHT * 0.5,
1081 child => (my $vbox = new CFPlus::UI::VBox),
1082 has_close_button => 1;
1083
1084 $vbox->add ($LOGVIEW);
1085
1086 $vbox->add (my $input = new CFPlus::UI::Entry
1087 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1088 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1089 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1090 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1091 on_focus_in => sub { 1203 on_changed => sub {
1092 my ($input, $prev_focus) = @_; 1204 my ($self, $value) = @_;
1093 1205 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1094 delete $input->{refocus_map};
1095
1096 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1097 $input->{refocus_map} = 1;
1098 }
1099 delete $input->{auto_activated};
1100
1101 0 1206 0
1102 }, 1207 },
1103 on_activate => sub {
1104 my ($input, $text) = @_;
1105 $input->set_text ('');
1106
1107 if ($text =~ /^\/(.*)/) {
1108 $::CONN->user_send ($1);
1109 } else {
1110 my $say_cmd = $::CFG->{say_command} || 'say';
1111 $::CONN->user_send ("$say_cmd $text");
1112 }
1113 if ($input->{refocus_map}) {
1114 delete $input->{refocus_map};
1115 $MAPWIDGET->focus_in
1116 }
1117
1118 0
1119 },
1120 on_escape => sub {
1121 $MAPWIDGET->grab_focus;
1122
1123 0
1124 },
1125 );
1126
1127 $CONSOLE = {
1128 window => $window,
1129 input => $input,
1130 }; 1208 );
1131 1209
1132 $window 1210 $table
1133} 1211}
1134 1212
1135sub autopickup_setup { 1213sub autopickup_setup {
1214 my $r = new CFPlus::UI::ScrolledWindow (
1215 expand => 1,
1216 scroll_y => 1
1217 );
1136 my $table = new CFPlus::UI::Table; 1218 $r->add (my $table = new CFPlus::UI::Table
1219 row_expand => [0],
1220 col_expand => [0, 1, 0, 1],
1221 );
1137 1222
1138 for ( 1223 for (
1139 ["General", 0, 0, 1224 ["General", 0, 0,
1140 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1225 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1141 ["Inhibit autopickup" => PICKUP_INHIBIT], 1226 ["Inhibit autopickup" => PICKUP_INHIBIT],
1155 ["Boots" => PICKUP_BOOTS], 1240 ["Boots" => PICKUP_BOOTS],
1156 ["Gloves" => PICKUP_GLOVES], 1241 ["Gloves" => PICKUP_GLOVES],
1157 ["Cloaks" => PICKUP_CLOAK], 1242 ["Cloaks" => PICKUP_CLOAK],
1158 ], 1243 ],
1159 1244
1160 ["Readables", 2, 2, 1245 ["Readables", 2, 0,
1161 ["Spellbooks" => PICKUP_SPELLBOOK], 1246 ["Spellbooks" => PICKUP_SPELLBOOK],
1162 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1247 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1163 ["Normal Books/Scrolls" => PICKUP_READABLES], 1248 ["Normal Books/Scrolls" => PICKUP_READABLES],
1164 ], 1249 ],
1165 ["Misc", 2, 7, 1250 ["Misc", 2, 5,
1166 ["Food" => PICKUP_FOOD], 1251 ["Food" => PICKUP_FOOD],
1167 ["Drinks" => PICKUP_DRINK], 1252 ["Drinks" => PICKUP_DRINK],
1168 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1253 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1169 ["Keys" => PICKUP_KEY], 1254 ["Keys" => PICKUP_KEY],
1170 ["Magical Items" => PICKUP_MAGICAL], 1255 ["Magical Items" => PICKUP_MAGICAL],
1171 ["Potions" => PICKUP_POTION], 1256 ["Potions" => PICKUP_POTION],
1172 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1257 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1173 ["Ignore cursed" => PICKUP_NOT_CURSED], 1258 ["Ignore cursed" => PICKUP_NOT_CURSED],
1174 ["Jewelery" => PICKUP_JEWELS], 1259 ["Jewelery" => PICKUP_JEWELS],
1260 ["Flesh" => PICKUP_FLESH],
1175 ], 1261 ],
1176 ["Weight/Value ratio", 2, 17] 1262 ["Weight/Value ratio", 2, 17]
1177 ) 1263 )
1178 { 1264 {
1179 my ($title, $x, $y, @bits) = @$_; 1265 my ($title, $x, $y, @bits) = @$_;
1180 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1266 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1181 1267
1182 for (@bits) { 1268 for (@bits) {
1183 ++$y; 1269 ++$y;
1184 1270
1185 my $mask = $_->[1]; 1271 my $mask = $_->[1];
1186 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1272 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1187 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1273 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1188 state => $::CFG->{pickup} & $mask, 1274 state => $::CFG->{pickup} & $mask,
1189 on_changed => sub { 1275 on_changed => sub {
1190 my ($box, $value) = @_; 1276 my ($box, $value) = @_;
1191 1277
1192 if ($value) { 1278 if ($value) {
1203 1289
1204 ${$_->[2]} = $checkbox if $_->[2]; 1290 ${$_->[2]} = $checkbox if $_->[2];
1205 } 1291 }
1206 } 1292 }
1207 1293
1208 $table->add (2, 18, new CFPlus::UI::ValSlider 1294 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1209 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1295 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1210 template => ">= 99", 1296 template => ">= 99",
1211 to_value => sub { ">= " . 5 * $_[0] }, 1297 to_value => sub { ">= " . 5 * $_[0] },
1212 on_changed => sub { 1298 on_changed => sub {
1213 my ($slider, $value) = @_; 1299 my ($slider, $value) = @_;
1216 $::CFG->{pickup} |= int $value 1302 $::CFG->{pickup} |= int $value
1217 if $value; 1303 if $value;
1218 1; 1304 1;
1219 }); 1305 });
1220 1306
1221 $table->add (3, 18, new CFPlus::UI::Button 1307 $table->add_at (3, 18, new CFPlus::UI::Button
1222 text => "set", 1308 text => "set",
1223 on_activate => sub { 1309 on_activate => sub {
1224 $::CONN->send_command ("pickup $::CFG->{pickup}") 1310 $::CONN->send_command ("pickup $::CFG->{pickup}")
1225 if defined $::CONN; 1311 if defined $::CONN;
1226 0 1312 0
1227 }); 1313 });
1228 1314
1229 $table 1315 $r
1230} 1316}
1231 1317
1232my %SORT_ORDER = ( 1318my %SORT_ORDER = (
1233 type => undef, 1319 type => undef,
1234 mtime => sub { sort { 1320 mtime => sub {
1321 my $NOW = time;
1322 sort {
1323 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1324 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1325
1235 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1326 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1236 or $b->{mtime} <=> $a->{mtime} 1327 or $btime <=> $atime
1237 or $a->{type} <=> $b->{type} 1328 or $a->{type} <=> $b->{type}
1329 } @_
1238 } @_ }, 1330 },
1239 weight => sub { sort { 1331 weight => sub { sort {
1240 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1332 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1241 or $a->{type} <=> $b->{type} 1333 or $a->{type} <=> $b->{type}
1242 } @_ }, 1334 } @_ },
1243); 1335);
1268 #TODO# update to weigh/maxweight 1360 #TODO# update to weigh/maxweight
1269 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1361 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1270 1362
1271 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1363 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 $sw1->add ($INV = new CFPlus::UI::Inventory); 1364 $sw1->add ($INV = new CFPlus::UI::Inventory);
1365 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1273 1366
1274 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1367 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1275 1368
1276 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1369 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1277 1370
1306 has_close_button => 1 1399 has_close_button => 1
1307 ; 1400 ;
1308 1401
1309 my $ntb = 1402 my $ntb =
1310 $PL_NOTEBOOK = 1403 $PL_NOTEBOOK =
1311 new CFPlus::UI::Notebook expand => 1, debug => 1; 1404 new CFPlus::UI::Notebook expand => 1;
1312 1405
1313 $ntb->add ( 1406 $ntb->add_tab (
1314 "Statistics (F2)" => $STATS_PAGE = stats_window, 1407 "Statistics (F2)" => $STATS_PAGE = stats_window,
1315 "Shows statistics, where all your Stats and Resistances are shown." 1408 "Shows statistics, where all your Stats and Resistances are shown."
1316 ); 1409 );
1317 $ntb->add ( 1410 $ntb->add_tab (
1318 "Skills (F3)" => $SKILL_PAGE = skill_window, 1411 "Skills (F3)" => $SKILL_PAGE = skill_window,
1319 "Shows all your Skills." 1412 "Shows all your Skills."
1320 ); 1413 );
1321 1414
1322 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1415 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1323 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1416 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1324 $ntb->add ( 1417 $ntb->add_tab (
1325 "Spellbook (F4)" => $spellsw, 1418 "Spellbook (F4)" => $spellsw,
1326 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1419 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1327 ); 1420 );
1328 $ntb->add ( 1421 $ntb->add_tab (
1329 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1422 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1330 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1423 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1331 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1424 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1332 ); 1425 );
1426 $ntb->add_tab (Pickup => autopickup_setup,
1427 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1333 1428
1334 $ntb->set_current_page ($INVENTORY_PAGE); 1429 $ntb->set_current_page ($INVENTORY_PAGE);
1335 1430
1336 $plwin->add ($ntb); 1431 $plwin->add ($ntb);
1337 $plwin 1432 $plwin
1338} 1433}
1339 1434
1340sub update_bindings {
1341 $BIND_UPD_CB->() if $BIND_UPD_CB;
1342}
1343
1344sub keyboard_setup { 1435sub keyboard_setup {
1345 my $binding_list = new CFPlus::UI::VBox; 1436 CFPlus::Macro::keyboard_setup
1346
1347 my $refresh;
1348 $refresh = $BIND_UPD_CB = sub {
1349 $binding_list->clear ();
1350
1351 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1352 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1353 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1354 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1355
1356 my $lbl = join "; ", @$cmds;
1357 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1358 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1359 $hb->add (new CFPlus::UI::Button
1360 text => "delete",
1361 tooltip => "Deletes the binding",
1362 on_activate => sub {
1363 $binding_list->remove ($hb);
1364 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1365 0
1366 });
1367
1368 $hb->add (new CFPlus::UI::Button
1369 text => "edit",
1370 tooltip => "Edits the binding",
1371 on_activate => sub {
1372 $::BIND_EDITOR->set_binding (
1373 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1374 sub {
1375 my ($nmod, $nsym, $ncmds) = @_;
1376 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1377 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1378 $refresh->();
1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1380 $SETUP_DIALOG->show;
1381 },
1382 sub {
1383 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1384 $SETUP_DIALOG->show;
1385 });
1386 $::BIND_EDITOR->show;
1387 $SETUP_DIALOG->hide;
1388 0
1389 });
1390
1391 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1392 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1393 }
1394 }
1395 };
1396
1397 my $vb = new CFPlus::UI::VBox;
1398 $vb->add (new CFPlus::UI::FancyFrame
1399 label => "Options",
1400 child => (my $hb = new CFPlus::UI::HBox),
1401 );
1402 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1403 $hb->add (new CFPlus::UI::CheckBox
1404 expand => 1,
1405 state => $CFG->{shift_fire_stop},
1406 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1407 on_changed => sub {
1408 my ($cbox, $value) = @_;
1409 $CFG->{shift_fire_stop} = $value;
1410 0
1411 });
1412
1413 $vb->add (new CFPlus::UI::FancyFrame
1414 label => "Bindings",
1415 child => $binding_list);
1416 $vb->add (my $hb = new CFPlus::UI::HBox);
1417
1418 $hb->add (new CFPlus::UI::Button
1419 text => "record new",
1420 expand => 1,
1421 tooltip => "This button opens the binding editor with an empty binding.",
1422 on_activate => sub {
1423 $::BIND_EDITOR->set_binding (undef, undef, [],
1424 sub {
1425 my ($mod, $sym, $cmds) = @_;
1426 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1427 $refresh->();
1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1429 $SETUP_DIALOG->show;
1430 },
1431 sub {
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 },
1435 );
1436 $SETUP_DIALOG->hide;
1437 $::BIND_EDITOR->show;
1438 0
1439 },
1440 );
1441
1442 $hb->add (new CFPlus::UI::Button
1443 text => "close",
1444 tooltip => "Closes the binding window",
1445 expand => 1,
1446 on_activate => sub {
1447 $SETUP_DIALOG->hide;
1448 0
1449 }
1450 );
1451
1452 $refresh->();
1453
1454 $vb
1455} 1437}
1456 1438
1457sub help_window { 1439sub help_window {
1458 my $win = new CFPlus::UI::Toplevel 1440 my $win = new CFPlus::UI::Toplevel
1459 x => 'center', 1441 x => 'center',
1616 1598
1617sub show_tip_of_the_day { 1599sub show_tip_of_the_day {
1618 # find all tips 1600 # find all tips
1619 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1601 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1620 1602
1621 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1603 CFPlus::DB::get state => "tip_of_the_day", sub {
1604 my ($todindex) = @_;
1622 $todindex = 0 if $todindex >= @tod; 1605 $todindex = 0 if $todindex >= @tod;
1623 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1606 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1624 1607
1625 # create dialog 1608 # create dialog
1626 my $dialog; 1609 my $dialog;
1627 1610
1628 my $close = sub { 1611 my $close = sub {
1629 $dialog->destroy; 1612 $dialog->destroy;
1613 };
1614
1615 $dialog = new CFPlus::UI::Toplevel
1616 x => "center",
1617 y => "center",
1618 z => 3,
1619 name => 'tip_of_the_day',
1620 force_w => int $WIDTH * 4/9,
1621 force_h => int $WIDTH * 2/9,
1622 title => "Tip of the day #" . (1 + $todindex),
1623 child => my $vbox = new CFPlus::UI::VBox,
1624 has_close_button => 1,
1625 on_delete => $close,
1626 ;
1627
1628 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1629 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1630 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1631
1632 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1633
1634 $table->add_at (0, 0, new CFPlus::UI::Button
1635 text => "Close",
1636 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1637 on_activate => $close,
1638 );
1639
1640 $table->add_at (2, 0, new CFPlus::UI::Button
1641 text => "Next",
1642 tooltip => "Show the next <b>Tip of the day</b>.",
1643 on_activate => sub {
1644 $close->();
1645 &show_tip_of_the_day;
1646 },
1647 );
1648
1649 $dialog->show;
1630 }; 1650 };
1631
1632 $dialog = new CFPlus::UI::Toplevel
1633 x => "center",
1634 y => "center",
1635 z => 3,
1636 name => 'tip_of_the_day',
1637 force_w => int $WIDTH * 4/9,
1638 force_h => int $WIDTH * 2/9,
1639 title => "Tip of the day #" . (1 + $todindex),
1640 child => my $vbox = new CFPlus::UI::VBox,
1641 has_close_button => 1,
1642 on_delete => $close,
1643 ;
1644
1645 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1647 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1648
1649 $vbox->add (my $table = new CFPlus::UI::Table);
1650
1651 $table->add (0, 0, new CFPlus::UI::Button
1652 text => "Close",
1653 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1654 on_activate => $close,
1655 );
1656
1657 $table->add (2, 0, new CFPlus::UI::Button
1658 text => "Next",
1659 tooltip => "Show the next <b>Tip of the day</b>.",
1660 on_activate => sub {
1661 $close->();
1662 &show_tip_of_the_day;
1663 },
1664 );
1665
1666 $dialog->show;
1667} 1651}
1668 1652
1669sub sdl_init { 1653sub sdl_init {
1670 CFPlus::SDL_Init 1654 CFPlus::SDL_Init
1671 and die "SDL::Init failed!\n"; 1655 and die "SDL::Init failed!\n";
1672} 1656}
1673 1657
1674sub video_init { 1658sub video_init {
1675 sdl_init;
1676
1677 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1659 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1678 1660
1679 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1661 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1680 1662
1681 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1663 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1682 $FULLSCREEN = $CFG->{fullscreen}; 1664 $FULLSCREEN = $CFG->{fullscreen};
1683 $FAST = $CFG->{fast}; 1665 $FAST = $CFG->{fast};
1684 1666
1685 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1667 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1686 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1668 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1687 1669
1688 $SDL_ACTIVE = 1; 1670 $SDL_ACTIVE = 1;
1689 $LAST_REFRESH = time - 0.01; 1671 $LAST_REFRESH = time - 0.01;
1690 1672
1705 padding => 0, 1687 padding => 0,
1706 z => 100, 1688 z => 100,
1707 force_x => "max", 1689 force_x => "max",
1708 force_y => 0; 1690 force_y => 0;
1709 $DEBUG_STATUS->show; 1691 $DEBUG_STATUS->show;
1710
1711 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1712 1692
1713 $STATUSBOX = new CFPlus::UI::Statusbox; 1693 $STATUSBOX = new CFPlus::UI::Statusbox;
1714 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1694 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1715 1695
1716 (new CFPlus::UI::Frame 1696 (new CFPlus::UI::Frame
1734 1714
1735 $MAPWIDGET = new CFPlus::MapWidget; 1715 $MAPWIDGET = new CFPlus::MapWidget;
1736 $MAPWIDGET->connect (activate_console => sub { 1716 $MAPWIDGET->connect (activate_console => sub {
1737 my ($mapwidget, $preset) = @_; 1717 my ($mapwidget, $preset) = @_;
1738 1718
1739 if ($CONSOLE) { 1719 $MESSAGE_WINDOW->activate_console ($preset)
1740 $CONSOLE->{input}->{auto_activated} = 1; 1720 if $MESSAGE_WINDOW;
1741 $CONSOLE->{input}->grab_focus;
1742
1743 if ($preset && $CONSOLE->{input}->get_text eq '') {
1744 $CONSOLE->{input}->set_text ($preset);
1745 }
1746 }
1747 }); 1721 });
1748 $MAPWIDGET->show; 1722 $MAPWIDGET->show;
1749 $MAPWIDGET->grab_focus; 1723 $MAPWIDGET->grab_focus;
1750
1751 $LOGVIEW = new CFPlus::UI::TextScroller
1752 expand => 1,
1753 font => $FONT_FIXED,
1754 fontsize => $::CFG->{log_fontsize},
1755 indent => -4,
1756 can_hover => 1,
1757 can_events => 1,
1758 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1759 ;
1760 1724
1761 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1725 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1762 title => "Setup", 1726 title => "Setup",
1763 name => "setup_dialog", 1727 name => "setup_dialog",
1764 x => 'center', 1728 x => 'center',
1768 force_h => $::HEIGHT * 0.6, 1732 force_h => $::HEIGHT * 0.6,
1769 has_close_button => 1, 1733 has_close_button => 1,
1770 ; 1734 ;
1771 1735
1772 $METASERVER = metaserver_dialog; 1736 $METASERVER = metaserver_dialog;
1737 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1773 1738
1774 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1739 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1775 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1740 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1776 1741
1777 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1742 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1778 "Configure the server to play on, your username, password and other server-related options."); 1743 "Configure the server to play on, your username, password and other server-related options.");
1779 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1744 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1780 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1745 "Configure various client-specific settings.");
1781 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1746 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1782 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1747 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1783 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1748 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1784 "Configure the use of audio, sound effects and background music."); 1749 "Configure the use of audio, sound effects and background music.");
1785 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1750 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1786 "Lets you define, edit and delete key bindings." 1751 "Lets you define, edit and delete key bindings."
1787 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1752 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1788 . "with nothing set and the recording started. After doing the actions you " 1753 . "with nothing set and the recording started. After doing the actions you "
1789 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1754 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1790 . "After pressing the combo the binding will be saved automatically and the " 1755 . "After pressing the combo the binding will be saved automatically and the "
1791 . "binding editor closes"); 1756 . "binding editor closes");
1792 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1757 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1793 "Some debuggin' options. Do not ask."); 1758 "Some debuggin' options. Do not ask.");
1794 1759
1795 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1760 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1796 1761
1797 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1762 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1798 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1763 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1799 1764
1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1765 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1801 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1766 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1802 1767
1803 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 1768 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
1804 1769
1805 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1770 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1816 }, 1781 },
1817 ); 1782 );
1818 1783
1819 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1784 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1820 tooltip => "View Documentation"); 1785 tooltip => "View Documentation");
1786
1821 1787
1822 $BUTTONBAR->add (new CFPlus::UI::Button 1788 $BUTTONBAR->add (new CFPlus::UI::Button
1823 text => "Quit", 1789 text => "Quit",
1824 tooltip => "Terminates the program", 1790 tooltip => "Terminates the program",
1825 on_activate => sub { 1791 on_activate => sub {
1843 CFPlus::OpenGL::shutdown; 1809 CFPlus::OpenGL::shutdown;
1844 1810
1845 undef $SDL_ACTIVE; 1811 undef $SDL_ACTIVE;
1846} 1812}
1847 1813
1848my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1849my $bgmusic;#TODO#hack#d#
1850
1851sub audio_channel_finished { 1814sub audio_channel_finished {
1852 my ($channel) = @_; 1815 my ($channel) = @_;
1853 1816
1854 #warn "channel $channel finished\n";#d# 1817 #warn "channel $channel finished\n";#d#
1855} 1818}
1856 1819
1820sub audio_music_set {
1821 my ($songs) = @_;
1822
1823 my @want =
1824 grep $_,
1825 map $CONN->{music_meta}{$_},
1826 @$songs;
1827
1828 if (@want) {
1829 @MUSIC_WANT = @want;
1830 &audio_music_changed ();
1831 }
1832}
1833
1834sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path}
1836 or return;
1837
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1839 return unless $SDL_MIXER;
1840
1841 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path}
1843 or return &audio_music_start ();
1844
1845 my $rwops = new_from_file CFPlus::RW $path;
1846 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops;
1847
1848 my $NOW = time;
1849
1850 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1851 my $pos = $MUSIC_PLAYING->{stop_pos};
1852 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1853 $MUSIC_START = time - $pos;
1854 } else {
1855 $MUSIC_PLAYER->play (0);
1856 $MUSIC_START = time;
1857 }
1858
1859 delete $MUSIC_PLAYING->{stop_time};
1860 delete $MUSIC_PLAYING->{stop_pos};
1861 }
1862}
1863
1864sub audio_music_changed {
1865 return unless $CFG->{bgm_enable};
1866 return unless $SDL_MIXER;
1867
1868 # default MUSIC_WANT == MUSIC_DEFAULT
1869 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1870
1871 # if the currently playing song is acceptable, let it continue
1872 return if $MUSIC_PLAYING
1873 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1874
1875 my $NOW = time;
1876
1877 if ($MUSIC_PLAYING) {
1878 $MUSIC_PLAYING->{stop_time} = $NOW;
1879 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1880 CFPlus::MixMusic::fade_out 1000;
1881 } else {
1882 # sort by stop time, oldest first
1883 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1884
1885 # if the most recently-played piece played very recently,
1886 # resume it, else choose the oldest piece for rotation.
1887 $MUSIC_PLAYING =
1888 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1889 ? $MUSIC_WANT[-1]
1890 : $MUSIC_WANT[0];
1891
1892 audio_music_start;
1893 }
1894}
1895
1857sub audio_music_finished { 1896sub audio_music_finished {
1858 return unless $CFG->{bgm_enable}; 1897 $MUSIC_PLAYING = undef;
1898 undef $MUSIC_PLAYER;
1859 1899
1860 # TODO: hack, do play loop and mood music 1900 audio_music_changed;
1861 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1862 $bgmusic->play (0);
1863
1864 push @bgmusic, shift @bgmusic;
1865} 1901}
1866 1902
1867sub audio_init { 1903sub audio_init {
1868 if ($CFG->{audio_enable}) { 1904 if ($CFG->{audio_enable}) {
1869 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1870 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1907 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1871 1908
1872 unless ($SDL_MIXER) { 1909 unless ($SDL_MIXER) {
1873 status "Unable to open sound device: there will be no sound"; 1910 status "Unable to open sound device: there will be no sound";
1874 return; 1911 return;
1877 CFPlus::Mix_AllocateChannels 8; 1914 CFPlus::Mix_AllocateChannels 8;
1878 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1915 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1879 1916
1880 audio_music_finished; 1917 audio_music_finished;
1881 1918
1919 local $_;
1882 while (<$fh>) { 1920 while (<$fh>) {
1883 next if /^\s*#/; 1921 next if /^\s*#/;
1884 next if /^\s*$/; 1922 next if /^\s*$/;
1885 1923
1886 my ($file, $volume, $event) = split /\s+/, $_, 3; 1924 my ($file, $volume, $event) = split /\s+/, $_, 3;
1887 1925
1888 push @SOUNDS, "$volume,$file"; 1926 push @SOUNDS, "$volume,$file";
1889 1927
1890 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1928 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1891 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file"; 1929 my $rwops = new_from_file CFPlus::RW CFPlus::find_rcfile "sounds/$file";
1930 my $chunk = new CFPlus::MixChunk $rwops;
1892 $chunk->volume ($volume * 128 / 100); 1931 $chunk->volume ($volume * 128 / 100);
1893 $chunk 1932 $chunk
1894 }; 1933 };
1895 } 1934 }
1896 } else { 1935 } else {
1897 status "unable to open sound config: $!"; 1936 status "unable to open sound config: $!";
1898 } 1937 }
1938 } else {
1939 undef $SDL_MIXER;
1899 } 1940 }
1900} 1941}
1901 1942
1902sub audio_shutdown { 1943sub audio_shutdown {
1903 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1944 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1918 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1959 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1919 1960
1920 $CFPlus::UI::ROOT->draw; 1961 $CFPlus::UI::ROOT->draw;
1921 1962
1922 $WANT_REFRESH = 0; 1963 $WANT_REFRESH = 0;
1923 $CAN_REFRESH = 0; 1964 $CAN_REFRESH = 0;
1924 $LAST_REFRESH = $NOW; 1965 $LAST_REFRESH = $NOW;
1925 1966
1926 CFPlus::SDL_GL_SwapBuffers; 1967 CFPlus::SDL_GL_SwapBuffers;
1927} 1968}
1928 1969
1929my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1970my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1930 $NOW = time; 1971 $NOW = time;
1931 1972
1932 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1973 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1933 for CFPlus::SDL_PollEvent; 1974 for CFPlus::poll_events;
1934 1975
1935 if (%animate_object) { 1976 if (%animate_object) {
1936 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1977 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1937 $WANT_REFRESH++; 1978 ++$WANT_REFRESH;
1938 } 1979 }
1939 1980
1940 if ($WANT_REFRESH) { 1981 if ($WANT_REFRESH) {
1941 force_refresh; 1982 force_refresh;
1942 } else { 1983 } else {
1963 if $CONN; 2004 if $CONN;
1964}); 2005});
1965 2006
1966%SDL_CB = ( 2007%SDL_CB = (
1967 CFPlus::SDL_QUIT => sub { 2008 CFPlus::SDL_QUIT => sub {
1968 Event::unloop -1; 2009 exit;
1969 }, 2010 },
1970 CFPlus::SDL_VIDEORESIZE => sub { 2011 CFPlus::SDL_VIDEORESIZE => sub {
1971 }, 2012 },
1972 CFPlus::SDL_VIDEOEXPOSE => sub { 2013 CFPlus::SDL_VIDEOEXPOSE => sub {
1973 CFPlus::UI::full_refresh; 2014 CFPlus::UI::full_refresh;
1974 }, 2015 },
1975 CFPlus::SDL_ACTIVEEVENT => sub { 2016 CFPlus::SDL_ACTIVEEVENT => sub {
1976# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2017# not useful, as APPACTIVE include sonly iconified state, not unmapped
2018# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2019# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2020# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2021# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2022# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1977 }, 2023 },
1978 CFPlus::SDL_KEYDOWN => sub { 2024 CFPlus::SDL_KEYDOWN => sub {
1979 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2025 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1980 # alt-enter 2026 # alt-enter
1981 $FULLSCREEN_ENABLE->toggle; 2027 $FULLSCREEN_ENABLE->toggle;
2002 2048
2003$SIG{INT} = $SIG{TERM} = sub { exit }; 2049$SIG{INT} = $SIG{TERM} = sub { exit };
2004 2050
2005{ 2051{
2006 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2052 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2053 CFPlus::DB::Server::run;
2054
2007 CFPlus::UI::set_layout ($::CFG->{layout}); 2055 CFPlus::UI::set_layout ($::CFG->{layout});
2008 2056
2009 my %DEF_CFG = ( 2057 my %DEF_CFG = (
2010 sdl_mode => 0, 2058 sdl_mode => 0,
2011 width => 640, 2059 width => 640,
2012 height => 480, 2060 height => 480,
2013 fullscreen => 0, 2061 fullscreen => 0,
2014 fast => 0, 2062 fast => 0,
2015 map_scale => 1, 2063 map_scale => 1,
2016 fow_enable => 1, 2064 fow_enable => 1,
2017 fow_intensity => 0.45, 2065 fow_intensity => 0,
2018 fow_smooth => 0, 2066 map_smoothing => 1,
2019 gui_fontsize => 1, 2067 gui_fontsize => 1,
2020 log_fontsize => 0.7, 2068 log_fontsize => 0.7,
2021 gauge_fontsize => 1, 2069 gauge_fontsize => 1,
2022 gauge_size => 0.35, 2070 gauge_size => 0.35,
2023 stat_fontsize => 0.7, 2071 stat_fontsize => 0.7,
2024 mapsize => 100, 2072 mapsize => 100,
2025 say_command => 'say',
2026 audio_enable => 1, 2073 audio_enable => 1,
2027 bgm_enable => 1, 2074 bgm_enable => 1,
2028 bgm_volume => 0.25, 2075 bgm_volume => 0.25,
2029 face_prefetch => 0, 2076 face_prefetch => 0,
2030 output_sync => 1, 2077 output_sync => 1,
2031 output_count => 1, 2078 output_count => 1,
2079 output_rate => "",
2032 pickup => 0, 2080 pickup => 0,
2033 inv_sort => "mtime", 2081 inv_sort => "mtime",
2034 default => "profile", # default profile 2082 default => "profile", # default profile
2035 show_tips => 1, 2083 show_tips => 1,
2084 logview_max_par => 1000,
2036 ); 2085 );
2037 2086
2038 while (my ($k, $v) = each %DEF_CFG) { 2087 while (my ($k, $v) = each %DEF_CFG) {
2039 $CFG->{$k} = $v unless exists $CFG->{$k}; 2088 $CFG->{$k} = $v unless exists $CFG->{$k};
2040 } 2089 }
2041 2090
2042 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2091 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2092 $PROFILE = $CFG->{profile}{default};
2093
2094 # convert old bindings (only default profile matters)
2095 if (my $bindings = delete $PROFILE->{bindings}) {
2096 while (my ($mod, $syms) = each %$bindings) {
2097 while (my ($sym, $cmds) = each %$syms) {
2098 push @{ $PROFILE->{macro} }, {
2099 accelkey => [$mod*1, $sym*1],
2100 action => $cmds,
2101 };
2102 }
2103 }
2104 }
2043 2105
2044 sdl_init; 2106 sdl_init;
2045 2107
2046 @SDL_MODES = reverse 2108 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2047 grep $_->[0] >= 640 && $_->[1] >= 480, 2109 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2048 CFPlus::SDL_ListModes;
2049
2050 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2110 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2111
2112 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2051 2113
2052 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2114 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2053 2115
2054 { 2116 {
2055 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2117 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2084# } 2146# }
2085# my $t2 = Time::HiRes::time; 2147# my $t2 = Time::HiRes::time;
2086# warn $t2-$t1; 2148# warn $t2-$t1;
2087# } 2149# }
2088 2150
2151 $startup_done->();
2152
2089 video_init; 2153 video_init;
2090 audio_init; 2154 audio_init;
2091} 2155}
2092 2156
2093show_tip_of_the_day if $CFG->{show_tips}; 2157show_tip_of_the_day if $CFG->{show_tips};
2094 2158
2095Event::loop; 2159Event::loop;
2096#CFPlus::SDL_Quit; 2160#CFPlus::SDL_Quit;
2097#CFPlus::_exit 0; 2161#CFPlus::_exit 0;
2098 2162
2163END {
2099END { CFPlus::SDL_Quit } 2164 CFPlus::SDL_Quit;
2165 CFPlus::DB::Server::stop;
2166}
2100 2167
2101=head1 NAME 2168=head1 NAME
2102 2169
2103cfplus - A Crossfire+ and Crossfire game client 2170cfplus - A Crossfire+ and Crossfire game client
2104 2171

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines