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.123 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.183 by root, Sun Jul 22 17:17:17 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines