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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines