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.117 by elmex, Tue Aug 15 06:30:05 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 CFPlus::error $_[1];
53}; 101};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 102
66my $MAX_FPS = 60; 103my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 104my $MIN_FPS = 5; # unused as of yet
68 105
69our $META_SERVER = "crossfire.real-time.com:13326"; 106our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 107
71our $LAST_REFRESH; 108our $LAST_REFRESH;
72our $NOW; 109our $NOW;
73 110
74our $CFG; 111our $CFG;
75our $CONN; 112our $CONN;
113our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 114our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 115
78our $WANT_REFRESH; 116our $WANT_REFRESH;
79our $CAN_REFRESH; 117our $CAN_REFRESH;
80 118
… …
89 127
90our $MAP; 128our $MAP;
91our $MAPMAP; 129our $MAPMAP;
92our $MAPWIDGET; 130our $MAPWIDGET;
93our $BUTTONBAR; 131our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 132our $METASERVER;
97our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 134our $QUIT_DIALOG;
99our $HOST_ENTRY; 135our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
111 147
112our $INVENTORY_PAGE; 148our $INVENTORY_PAGE;
113our $STATS_PAGE; 149our $STATS_PAGE;
114our $SKILL_PAGE; 150our $SKILL_PAGE;
115our $SPELL_PAGE; 151our $SPELL_PAGE;
152our $SPELL_LIST;
116 153
117our $HELP_WINDOW; 154our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
119our $FLOORBOX; 156our $FLOORBOX;
120our $GAUGES; 157our $GAUGES;
… …
122 159
123our $SDL_ACTIVE; 160our $SDL_ACTIVE;
124our %SDL_CB; 161our %SDL_CB;
125 162
126our $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
127our @SOUNDS; # event => file mapping 171our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files 172our %AUDIO_CHUNKS; # audio files
129 173
130our $ALT_ENTER_MESSAGE; 174our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 175our $STATUSBOX;
… …
133 177
134our $INV; 178our $INV;
135our $INVR; 179our $INVR;
136our $INV_RIGHT_HB; 180our $INV_RIGHT_HB;
137 181
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 182our $PICKUP_CFG;
142 183
143sub status { 184sub status {
144 $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]);
145} 186}
146 187
147sub debug { 188sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 189 $DEBUG_STATUS->set_text ($_[0]);
190}
191
192sub message {
193 my ($para) = @_;
194 $MESSAGE_WINDOW->message ($para);
149} 195}
150 196
151sub destroy_query_dialog { 197sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 198 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 199 if $_[0]{query_dialog};
154} 200}
155 201
202# FIXME: a very ugly hack to wait for stat update look below! #d#
203our $QUERY_TIMER; #d#
204
156# server query dialog 205# server query dialog
157sub server_query { 206sub server_query {
158 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 }
159 223
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 224 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 225 x => "center",
162 y => "center", 226 y => "center",
163 title => "Server Query", 227 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 228 child => my $vbox = new CFPlus::UI::VBox,
165 ; 229 ;
166 230
167 my @dialog = my $label = new CFPlus::UI::Label 231 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 232 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 233 ellipsise => 0,
170 text => $prompt; 234 text => $prompt;
171 235
172 if ($flags & CS_QUERY_YESNO) { 236 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 237 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 254 );
191 255
192 $dialog->grab_focus; 256 $dialog->grab_focus;
193 257
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 258 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 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) {
198 $MESSAGE_WINDOW->show; 260 $dialog->{tooltip} = "#charcreation_focus";
199 261
200 unshift @dialog, new CFPlus::UI::Label 262 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 263 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 264 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 265 markup => "\nOr use your keyboard and the text entry below:\n";
204 266
205 unshift @dialog, my $table = new CFPlus::UI::Table; 267 unshift @dialog, my $table = new CFPlus::UI::Table;
206 268
207 $table->add (0, 0, new CFPlus::UI::Button 269 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 270 text => "Next Race",
209 on_activate => sub { 271 on_activate => sub {
210 $conn->send ("reply n"); 272 $conn->send ("reply n");
211 destroy_query_dialog $conn; 273 destroy_query_dialog $conn;
212 0 274 0
213 }, 275 },
214 ); 276 );
215 $table->add (2, 0, new CFPlus::UI::Button 277 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 278 text => "Accept",
217 on_activate => sub { 279 on_activate => sub {
218 $conn->send ("reply d"); 280 $conn->send ("reply d");
219 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
220 0 282 0
221 }, 283 },
222 ); 284 );
223 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
224 unshift @dialog, new CFPlus::UI::Label 309 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 310 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 311 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 312 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 313 ;
… …
232 $conn->send ("reply $stat"); 317 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
234 return; 319 return;
235 } 320 }
236 321
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 322 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 324 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 325 markup => "\nOr use your keyboard and the text entry below:\n";
244 326
245 unshift @dialog, my $table = new CFPlus::UI::Table; 327 unshift @dialog, my $table = new CFPlus::UI::Table;
246 328
247 # left: re-roll 329 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 330 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 331 text => "Roll Again",
250 on_activate => sub { 332 on_activate => sub {
251 $conn->send ("reply y"); 333 $conn->send ("reply y");
252 destroy_query_dialog $conn; 334 destroy_query_dialog $conn;
253 0 335 0
… …
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 349 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 350 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 351 ],
270 ), 1 .. 2; 352 ), 1 .. 2;
271 353
272 $table->add (2, 0, new CFPlus::UI::Button 354 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 355 text => "Swap Stats",
274 on_activate => sub { 356 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 357 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 358 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 359 destroy_query_dialog $conn;
278 0 360 0
279 }, 361 },
280 ); 362 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 363 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 364
283 # right: accept 365 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 366 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 367 text => "Accept",
286 on_activate => sub { 368 on_activate => sub {
287 $conn->send ("reply n"); 369 $conn->send ("reply n");
288 $STATS_PAGE->hide; 370 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 371 destroy_query_dialog $conn;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 436 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 437 $SETUP_DIALOG->hide;
356 438
357 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;
358 440
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 441 my ($host, $port) = split /:/, $PROFILE->{host};
360 442
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 443 $MAP = new CFPlus::Map;
362 444
363 $CONN = eval { 445 $CONN = eval {
364 new CFPlus::Protocol 446 new CFPlus::Protocol
365 host => $host, 447 host => $host,
366 port => $port || 13327, 448 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 449 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 450 pass => $PROFILE->{password},
369 mapw => $mapsize, 451 mapw => $mapsize,
370 maph => $mapsize, 452 maph => $mapsize,
371 453
454 client => "cfplus $CFPlus::VERSION $] $^O",
455
372 map_widget => $MAPWIDGET, 456 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 457 statusbox => $STATUSBOX,
375 map => $MAP, 458 map => $MAP,
376 mapmap => $MAPMAP, 459 mapmap => $MAPMAP,
377 query => \&server_query, 460 query => \&server_query,
461
462 setup_req => {
463 smoothing => $CFG->{map_smoothing}*1,
464 },
378 465
379 sound_play => sub { 466 sound_play => sub {
380 my ($x, $y, $soundnum, $type) = @_; 467 my ($x, $y, $soundnum, $type) = @_;
381 468
382 $SDL_MIXER 469 $SDL_MIXER
… …
402sub stop_game { 489sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 490 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 491 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 492 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 493 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 494 $SPELL_LIST->clear_spells;
495 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
496
497 &audio_music_set ([]);
408 498
409 return unless $CONN; 499 return unless $CONN;
410 500
411 status "connection closed"; 501 status "connection closed";
412 502
… …
420sub graphics_setup { 510sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 511 my $vbox = new CFPlus::UI::VBox;
422 512
423 $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]);
424 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
425 $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");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 527 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 528
529 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
428 $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],
429 $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);
430 535
431 $mode_slider->connect (changed => sub { 536 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 537 my ($self, $value) = @_;
433 538
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 540 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 541 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 542 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 543
439 my $row = 1;
440
441 $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");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 545 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 546 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 547 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 549 );
447 550
448 $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");
449 $table->add (1, $row++, new CFPlus::UI::CheckBox 552 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 553 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 554 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 556 );
454 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
455 $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");
456 $table->add (1, $row++, new CFPlus::UI::Slider 576 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 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 }
460 ); 580 );
461 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
462 $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");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 593 state => $CFG->{fow_enable},
465 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.",
466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 596 );
468 597
469 $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");
470 $table->add (1, $row++, new CFPlus::UI::Slider 599 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472 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.",
473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 603 );
475 604
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub {
481 my ($self, $value) = @_;
482 $CFG->{fow_smooth} = $value;
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $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");
496 $table->add (1, $row++, new CFPlus::UI::Slider 606 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 607 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 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.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 609 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 610 );
501 611
502 $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");
503 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 614 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505 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.",
506 on_changed => sub { 616 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 617 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 618 &set_gauge_window_fontsize;
509 0 619 0
510 } 620 }
511 ); 621 );
512 622
513 $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");
514 $table->add (1, $row++, new CFPlus::UI::Slider 624 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 625 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 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.",
517 on_changed => sub { 627 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 628 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 629 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 630 0
521 } 631 }
522 ); 632 );
523 633
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0
531 }
532 );
533
534 $vbox 634 $vbox
535} 635}
536 636
537sub audio_setup { 637sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 638 my $vbox = new CFPlus::UI::VBox;
539 639
540 $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]);
541 641
542 my $row = 0; 642 my $row = 0;
543 643
544 $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");
545 $table->add (1, $row++, new CFPlus::UI::CheckBox 645 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 646 state => $CFG->{audio_enable},
547 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.",
548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 648 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 649 );
550# $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");
551# $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 {
552# $CFG->{effects_volume} = $_[1]; 652# $CFG->{effects_volume} = $_[1];
553# }); 653# });
554 $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");
555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 655 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
556 $hbox->add (new CFPlus::UI::CheckBox 656 $hbox->add (new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 657 expand => 1, state => $CFG->{bgm_enable},
558 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.",
559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 659 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560 ); 660 );
… …
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 662 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 663 tooltip => "The volume of the background music. Changes are instant.",
564 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 }
565 ); 665 );
566 666
567 $table->add (1, $row++, new CFPlus::UI::Button 667 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 668 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 669 tooltip => "Apply the audio settings",
570 on_activate => sub { 670 on_activate => sub {
571 audio_shutdown (); 671 audio_shutdown ();
572 audio_init (); 672 audio_init ();
… …
631} 731}
632 732
633sub debug_setup { 733sub debug_setup {
634 my $table = new CFPlus::UI::Table; 734 my $table = new CFPlus::UI::Table;
635 735
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 736 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $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 });
638 $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");
639 $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 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 740 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $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 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 742 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $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() } );
644 745
645 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#
646 747
647 for my $x (0..2) { 748 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 749 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
649 $table->add ($x + 3, $y, 750 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
650 new CFPlus::UI::Entry 751 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
651 text => $default_smooth[$x * 3 + $y], 752 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
652 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");
653 ); 754
654 } 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]],
655 } 763 });
656 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 });
657 780
658 $table 781 $table
659} 782}
660 783
661sub stats_window { 784sub stats_window {
… …
709 [2, 4, st_spd => "Spd", 10.54], 832 [2, 4, st_spd => "Spd", 10.54],
710 [2, 5, st_wspd => "WSp", 10.54], 833 [2, 5, st_wspd => "WSp", 10.54],
711 ) { 834 ) {
712 my ($col, $row, $id, $label, $template) = @$_; 835 my ($col, $row, $id, $label, $template) = @$_;
713 836
714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 837 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 838 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label"); 839 align => +1, template => $template, tooltip => "#stat_$label");
717 $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
718 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,
719 align => -1, text => $label, tooltip => "#stat_$label"); 842 align => -1, text => $label, tooltip => "#stat_$label");
720 } 843 }
721 844
722 $vb->add (new CFPlus::UI::FancyFrame 845 $vb->add (new CFPlus::UI::FancyFrame
… …
763 cold => ["Cold", 886 cold => ["Cold",
764 "<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, ...)"],
765 ghit => ["Ghost hit", 888 ghit => ["Ghost hit",
766 "<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)"],
767 ); 890 );
891
768 for (qw/slow holyw conf fire depl magic 892 for (qw/slow holyw conf fire depl magic
769 drain acid pois para deat phys 893 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 894 blind fear tund elec cold ghit/)
771 { 895 {
772 $tbl2->add ($col, $row, 896 $tbl2->add_at ($col, $row,
773 $STATWIDS->{"res_$_"} = 897 $STATWIDS->{"res_$_"} =
774 new CFPlus::UI::Label 898 new CFPlus::UI::Label
775 font => $FONT_FIXED, 899 font => $FONT_FIXED,
776 template => "-100%", 900 template => "-100%",
777 align => +1, 901 align => +1,
778 valign => 0, 902 valign => 0,
779 can_events => 1, 903 can_events => 1,
780 can_hover => 1, 904 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 905 tooltip => $resist_names{$_}->[1],
782 ); 906 );
783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 907 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 908 font => $FONT_FIXED,
785 can_hover => 1, 909 can_hover => 1,
786 can_events => 1, 910 can_events => 1,
787 path => "ui/resist/resist_$_.png", 911 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 912 tooltip => $resist_names{$_}->[1],
789 ); 913 );
790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 914 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 915 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 916 font => $FONT_FIXED,
793 can_hover => 1, 917 can_hover => 1,
794 can_events => 1, 918 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 919 tooltip => $resist_names{$_}->[1],
… …
828 return if $METASERVER_ATIME > time; 952 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 953 $METASERVER_ATIME = time + 60;
830 954
831 my $table = $METASERVER->{table}; 955 my $table = $METASERVER->{table};
832 $table->clear; 956 $table->clear;
833 $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...");
834 958
835 my $buf; 959 my $ok = 0;
836 960
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 961 CFPlus::background {
962 my $ua = CFPlus::lwp_useragent;
838 963
839 unless ($fh) { 964 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 965 } sub {
841 return; 966 my ($msg) = @_;
842 } 967 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 968 $table->clear;
857 969
858 my @tip = ( 970 my @tip = (
859 "The current number of users logged in on the server.", 971 "The current number of users logged in on the server.",
860 "The hostname of the server.", 972 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 973 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 974 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 975 "Short information about this server provided by its admins.",
864 ); 976 );
865 my @col = qw(#Users Host Uptime Version Description); 977 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFPlus::UI::Label 978 $table->add_at ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 979 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 980 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 981 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 982 for 0 .. $#col;
871 983
872 my @align = qw(1 0 1 1 -1); 984 my @align = qw(1 0 1 1 -1);
873 985
874 my $y = 0; 986 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 987 for my $m (@{ $msg->{servers} }) {
876 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)};
877 990
878 for ($desc) { 991 for ($desc) {
879 s/<br>/\n/gi; 992 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 993 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 994 s/<.*?>//sgi;
882 s/&/&amp;/g; 995 s/&amp;/&/g;
883 s/</&lt;/g; 996 s/&lt;/</g;
884 s/>/&gt;/g; 997 s/&gt;/>/g;
885 } 998 }
886 999
887 $uptime = sprintf "%dd %02d:%02d:%02d", 1000 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 1001 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 1002 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 1003 (int $uptime / 60) % 60,
891 $m->[8] % 60; 1004 $uptime % 60;
892 1005
893 $m = [$users, $host, $uptime, $version, $desc]; 1006 $m = [$users, $host, $uptime, $version, $desc];
894 1007
895 $y++; 1008 $y++;
896 1009
897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1010 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFPlus::UI::Button 1011 (new CFPlus::UI::Button
899 text => "Use", 1012 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 1013 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 1014 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1015 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
905 }, 1018 },
906 ), 1019 ),
907 (new CFPlus::UI::Empty expand => 1), 1020 (new CFPlus::UI::Empty expand => 1),
908 ]); 1021 ]);
909 1022
910 $table->add ($_, $y, new CFPlus::UI::Label 1023 $table->add_at ($_, $y, new CFPlus::UI::Label
1024 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 1025 ellipsise => 0,
912 align => $align[$_], 1026 align => $align[$_],
913 text => $m->[$_], 1027 text => $m->[$_],
914 tooltip => $tip[$_], 1028 tooltip => $tip[$_],
1029 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 1030 can_hover => 1,
916 can_events => 1, 1031 can_events => 1,
917 fontsize => 0.8) 1032 fontsize => 0.8)
918 for 0 .. $#$m; 1033 for 0 .. $#$m;
919 } 1034 }
1035 } else {
1036 $ok or $label->set_text ("error while contacting metaserver");
920 } 1037 }
921 }); 1038 };
1039
922} 1040}
923 1041
924sub metaserver_dialog { 1042sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 1043 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 1044 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 1048 title => "Server List",
931 name => 'metaserver_dialog', 1049 name => 'metaserver_dialog',
932 x => 'center', 1050 x => 'center',
933 y => 'center', 1051 y => 'center',
934 z => 3, 1052 z => 3,
1053 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 1054 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 1055 child => $vbox,
937 has_close_button => 1, 1056 has_close_button => 1,
938 table => $table, 1057 table => $table,
939 on_visibility_change => sub { 1058 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 1059 update_metaserver ($_[0]) if $_[1];
… …
950 1069
951 $vbox->add (new CFPlus::UI::FancyFrame 1070 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings", 1071 label => "Connection Settings",
953 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]),
954 ); 1073 );
955 $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");
956 1075
957 { 1076 {
958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1077 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
959 1078
960 $vbox->add ( 1079 $vbox->add (
961 $HOST_ENTRY = new CFPlus::UI::Entry 1080 $HOST_ENTRY = new CFPlus::UI::Entry
962 expand => 1, 1081 expand => 1,
963 text => $CFG->{profile}{default}{host}, 1082 text => $CFG->{profile}{default}{host},
… …
977 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1096 on_activate => sub { $METASERVER->toggle_visibility; 0 },
978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1097 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
979 ); 1098 );
980 } 1099 }
981 1100
982 $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");
983 $table->add (1, 4, new CFPlus::UI::Entry 1102 $table->add_at (1, 4, new CFPlus::UI::Entry
984 text => $CFG->{profile}{default}{user}, 1103 text => $CFG->{profile}{default}{user},
985 tooltip => "The name of your character on the server", 1104 tooltip => "The name of your character on the server",
986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
987 ); 1106 );
988 1107
989 $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");
990 $table->add (1, 5, new CFPlus::UI::Entry 1109 $table->add_at (1, 5, new CFPlus::UI::Entry
991 text => $CFG->{profile}{default}{password}, 1110 text => $CFG->{profile}{default}{password},
992 hidden => 1, 1111 hidden => 1,
993 tooltip => "The password for your character", 1112 tooltip => "The password for your character",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
995 ); 1114 );
996 1115
997 $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");
998 $table->add (1, 7, new CFPlus::UI::Slider 1117 $table->add_at (1, 7, new CFPlus::UI::Slider
999 force_w => 100, 1118 force_w => 100,
1000 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1119 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1001 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. "
1002 . "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, "
1003 . "but you also increase bandwidth requirements and latency. " 1122 . "but you also increase bandwidth requirements and latency. "
1004 . "This option is only used once at log-in.", 1123 . "This option is only used once at log-in.",
1005 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 },
1006 ); 1125 );
1007 1126
1008 $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");
1009 $table->add (1, 8, new CFPlus::UI::CheckBox 1128 $table->add_at (1, 8, new CFPlus::UI::Entry
1010 state => $CFG->{face_prefetch}, 1129 text => $CFG->{output_rate},
1011 tooltip => "<b>Background Image Prefetch</b>\n\n" 1130 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1012 . "If enabled, the client automatically pre-fetches images from the server. " 1131 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1013 . "This might increase or create lag, but increases the chances " 1132 . "default will be used, which is usually around 100kb/s.",
1014 . "of faces being ready for display when you encounter them. "
1015 . "It also uses up server bandwidth on every connect, "
1016 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1133 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1019 ); 1134 );
1020 1135
1021 $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");
1022 $table->add (1, 9, new CFPlus::UI::Entry 1137 $table->add_at (1, 9, new CFPlus::UI::Entry
1023 text => $CFG->{output_count}, 1138 text => $CFG->{output_count},
1024 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.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1140 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1026 ); 1141 );
1027 1142
1028 $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");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1144 $table->add_at (1, 10, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1145 text => $CFG->{output_sync},
1031 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.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1033 ); 1148 );
1034 1149
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1150 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1151 expand => 1,
1037 align => 0, 1152 align => 0,
1038 text => "Login", 1153 text => "Login",
1039 on_activate => sub { 1154 on_activate => sub {
1040 $CONN ? stop_game 1155 $CONN ? stop_game
1041 : start_game; 1156 : start_game;
1042 0 1157 0
1043 }, 1158 },
1044 ); 1159 );
1045 1160
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command},
1049 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. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub {
1053 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value;
1055 0
1056 }
1057 );
1058
1059 $vbox->add (new CFPlus::UI::FancyFrame 1161 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Server Info", 1162 label => "Server Info",
1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1163 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 ); 1164 );
1063 1165
1064 $vbox 1166 $vbox
1065} 1167}
1066 1168
1067sub message_window { 1169sub client_setup {
1068 my $window = new CFPlus::UI::Toplevel 1170 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1069 name => "message_window",
1070 title => "Messages",
1071 border_bg => [1, 1, 1, 1],
1072 x => "max",
1073 y => 0,
1074 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFPlus::UI::VBox),
1077 has_close_button => 1;
1078 1171
1079 $vbox->add ($LOGVIEW); 1172 my $row = 0;
1080 1173
1081 $vbox->add (my $input = new CFPlus::UI::Entry 1174 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1175 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1176 state => $CFG->{show_tips},
1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1177 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086 on_focus_in => sub { 1178 on_changed => sub {
1087 my ($input, $prev_focus) = @_; 1179 my ($self, $value) = @_;
1088 1180 $CFG->{show_tips} = $value;
1089 delete $input->{refocus_map};
1090
1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092 $input->{refocus_map} = 1;
1093 } 1181 0
1094 delete $input->{auto_activated}; 1182 }
1183 );
1095 1184
1185 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1186 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1187 text => $CFG->{logview_max_par},
1188 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1189 . "sends more messages than this number, older messages get removed to save memory and "
1190 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1191 on_changed => sub {
1192 my ($self, $value) = @_;
1193 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1096 0 1194 0
1097 }, 1195 },
1098 on_activate => sub {
1099 my ($input, $text) = @_;
1100 $input->set_text ('');
1101
1102 if ($text =~ /^\/(.*)/) {
1103 $::CONN->user_send ($1);
1104 } else {
1105 my $say_cmd = $::CFG->{say_command} || 'say';
1106 $::CONN->user_send ("$say_cmd $text");
1107 }
1108 if ($input->{refocus_map}) {
1109 delete $input->{refocus_map};
1110 $MAPWIDGET->focus_in
1111 }
1112
1113 0
1114 },
1115 on_escape => sub {
1116 $MAPWIDGET->grab_focus;
1117
1118 0
1119 },
1120 );
1121
1122 $CONSOLE = {
1123 window => $window,
1124 input => $input,
1125 }; 1196 );
1126 1197
1127 $window 1198 $table
1128}
1129
1130sub open_string_query {
1131 my ($title, $cb, $txt, $tooltip) = @_;
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $title;
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 tooltip => $tooltip
1144 );
1145
1146 $e->grab_focus;
1147 $e->set_text ($txt) if $txt;
1148 $dialog->show;
1149}
1150
1151sub open_quit_dialog {
1152 unless ($QUIT_DIALOG) {
1153 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 on_key_down => sub {
1159 my ($dialog, $ev) = @_;
1160 $ev->{sym} == 27 and $dialog->hide;
1161 }
1162 ;
1163
1164 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1165
1166 $vb->add (new CFPlus::UI::Label
1167 text => "You should find a savebed and apply it first!",
1168 max_w => $WIDTH * 0.25,
1169 ellipsize => 0,
1170 );
1171 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1172 $hb->add (new CFPlus::UI::Button
1173 text => "Ok",
1174 expand => 1,
1175 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1176 );
1177 $hb->add (new CFPlus::UI::Button
1178 text => "Quit anyway",
1179 expand => 1,
1180 on_activate => sub { exit },
1181 );
1182 }
1183
1184 $QUIT_DIALOG->show;
1185 $QUIT_DIALOG->grab_focus;
1186} 1199}
1187 1200
1188sub autopickup_setup { 1201sub autopickup_setup {
1202 my $r = new CFPlus::UI::ScrolledWindow (
1203 expand => 1,
1204 scroll_y => 1
1205 );
1189 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 );
1190 1210
1191 for ( 1211 for (
1192 ["General", 0, 0, 1212 ["General", 0, 0,
1193 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1213 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1194 ["Inhibit autopickup" => PICKUP_INHIBIT], 1214 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1208 ["Boots" => PICKUP_BOOTS], 1228 ["Boots" => PICKUP_BOOTS],
1209 ["Gloves" => PICKUP_GLOVES], 1229 ["Gloves" => PICKUP_GLOVES],
1210 ["Cloaks" => PICKUP_CLOAK], 1230 ["Cloaks" => PICKUP_CLOAK],
1211 ], 1231 ],
1212 1232
1213 ["Readables", 2, 2, 1233 ["Readables", 2, 0,
1214 ["Spellbooks" => PICKUP_SPELLBOOK], 1234 ["Spellbooks" => PICKUP_SPELLBOOK],
1215 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1235 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1216 ["Normal Books/Scrolls" => PICKUP_READABLES], 1236 ["Normal Books/Scrolls" => PICKUP_READABLES],
1217 ], 1237 ],
1218 ["Misc", 2, 7, 1238 ["Misc", 2, 5,
1219 ["Food" => PICKUP_FOOD], 1239 ["Food" => PICKUP_FOOD],
1220 ["Drinks" => PICKUP_DRINK], 1240 ["Drinks" => PICKUP_DRINK],
1221 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1241 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1222 ["Keys" => PICKUP_KEY], 1242 ["Keys" => PICKUP_KEY],
1223 ["Magical Items" => PICKUP_MAGICAL], 1243 ["Magical Items" => PICKUP_MAGICAL],
1224 ["Potions" => PICKUP_POTION], 1244 ["Potions" => PICKUP_POTION],
1225 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1245 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1226 ["Ignore cursed" => PICKUP_NOT_CURSED], 1246 ["Ignore cursed" => PICKUP_NOT_CURSED],
1227 ["Jewelery" => PICKUP_JEWELS], 1247 ["Jewelery" => PICKUP_JEWELS],
1248 ["Flesh" => PICKUP_FLESH],
1228 ], 1249 ],
1229 ["Weight/Value ratio", 2, 17] 1250 ["Weight/Value ratio", 2, 17]
1230 ) 1251 )
1231 { 1252 {
1232 my ($title, $x, $y, @bits) = @$_; 1253 my ($title, $x, $y, @bits) = @$_;
1233 $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]);
1234 1255
1235 for (@bits) { 1256 for (@bits) {
1236 ++$y; 1257 ++$y;
1237 1258
1238 my $mask = $_->[1]; 1259 my $mask = $_->[1];
1239 $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);
1240 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1261 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1241 state => $::CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
1242 on_changed => sub { 1263 on_changed => sub {
1243 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1244 1265
1245 if ($value) { 1266 if ($value) {
… …
1256 1277
1257 ${$_->[2]} = $checkbox if $_->[2]; 1278 ${$_->[2]} = $checkbox if $_->[2];
1258 } 1279 }
1259 } 1280 }
1260 1281
1261 $table->add (2, 18, new CFPlus::UI::ValSlider 1282 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1262 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1263 template => ">= 99", 1284 template => ">= 99",
1264 to_value => sub { ">= " . 5 * $_[0] }, 1285 to_value => sub { ">= " . 5 * $_[0] },
1265 on_changed => sub { 1286 on_changed => sub {
1266 my ($slider, $value) = @_; 1287 my ($slider, $value) = @_;
… …
1269 $::CFG->{pickup} |= int $value 1290 $::CFG->{pickup} |= int $value
1270 if $value; 1291 if $value;
1271 1; 1292 1;
1272 }); 1293 });
1273 1294
1274 $table->add (3, 18, new CFPlus::UI::Button 1295 $table->add_at (3, 18, new CFPlus::UI::Button
1275 text => "set", 1296 text => "set",
1276 on_activate => sub { 1297 on_activate => sub {
1277 $::CONN->send_command ("pickup $::CFG->{pickup}") 1298 $::CONN->send_command ("pickup $::CFG->{pickup}")
1278 if defined $::CONN; 1299 if defined $::CONN;
1279 0 1300 0
1280 }); 1301 });
1281 1302
1282 $table 1303 $r
1283} 1304}
1284 1305
1285my %SORT_ORDER = ( 1306my %SORT_ORDER = (
1286 type => undef, 1307 type => undef,
1287 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
1288 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1314 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1289 or $b->{mtime} <=> $a->{mtime} 1315 or $btime <=> $atime
1290 or $a->{type} <=> $b->{type} 1316 or $a->{type} <=> $b->{type}
1317 } @_
1291 } @_ }, 1318 },
1292 weight => sub { sort { 1319 weight => sub { sort {
1293 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1320 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1294 or $a->{type} <=> $b->{type} 1321 or $a->{type} <=> $b->{type}
1295 } @_ }, 1322 } @_ },
1296); 1323);
… …
1321 #TODO# update to weigh/maxweight 1348 #TODO# update to weigh/maxweight
1322 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1349 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1323 1350
1324 $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);
1325 $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}});
1326 1354
1327 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1355 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1328 1356
1329 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1357 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1330 1358
… …
1359 has_close_button => 1 1387 has_close_button => 1
1360 ; 1388 ;
1361 1389
1362 my $ntb = 1390 my $ntb =
1363 $PL_NOTEBOOK = 1391 $PL_NOTEBOOK =
1364 new CFPlus::UI::Notebook expand => 1, debug => 1; 1392 new CFPlus::UI::Notebook expand => 1;
1365 1393
1366 $ntb->add ( 1394 $ntb->add_tab (
1367 "Statistics (F2)" => $STATS_PAGE = stats_window, 1395 "Statistics (F2)" => $STATS_PAGE = stats_window,
1368 "Shows statistics, where all your Stats and Resistances are shown." 1396 "Shows statistics, where all your Stats and Resistances are shown."
1369 ); 1397 );
1370 $ntb->add ( 1398 $ntb->add_tab (
1371 "Skills (F3)" => $SKILL_PAGE = skill_window, 1399 "Skills (F3)" => $SKILL_PAGE = skill_window,
1372 "Shows all your Skills." 1400 "Shows all your Skills."
1373 ); 1401 );
1374 1402
1375 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);
1376 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1404 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1377 $ntb->add ( 1405 $ntb->add_tab (
1378 "Spellbook (F4)" => $spellsw, 1406 "Spellbook (F4)" => $spellsw,
1379 "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."
1380 ); 1408 );
1381 $ntb->add ( 1409 $ntb->add_tab (
1382 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1410 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1383 "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 :). "
1384 . "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."
1385 ); 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.");
1386 1416
1387 $ntb->set_current_page ($INVENTORY_PAGE); 1417 $ntb->set_current_page ($INVENTORY_PAGE);
1388 1418
1389 $plwin->add ($ntb); 1419 $plwin->add ($ntb);
1390 $plwin 1420 $plwin
1391} 1421}
1392 1422
1393sub update_bindings {
1394 $BIND_UPD_CB->() if $BIND_UPD_CB;
1395}
1396
1397sub keyboard_setup { 1423sub keyboard_setup {
1398 my $binding_list = new CFPlus::UI::VBox; 1424 CFPlus::Macro::keyboard_setup
1399
1400 my $refresh;
1401 $refresh = $BIND_UPD_CB = sub {
1402 $binding_list->clear ();
1403
1404 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1405 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1406 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1407 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1408
1409 my $lbl = join "; ", @$cmds;
1410 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1411 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1412 $hb->add (new CFPlus::UI::Button
1413 text => "delete",
1414 tooltip => "Deletes the binding",
1415 on_activate => sub {
1416 $binding_list->remove ($hb);
1417 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1418 0
1419 });
1420
1421 $hb->add (new CFPlus::UI::Button
1422 text => "edit",
1423 tooltip => "Edits the binding",
1424 on_activate => sub {
1425 $::BIND_EDITOR->set_binding (
1426 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1427 sub {
1428 my ($nmod, $nsym, $ncmds) = @_;
1429 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1430 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1431 $refresh->();
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 },
1435 sub {
1436 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1437 $SETUP_DIALOG->show;
1438 });
1439 $::BIND_EDITOR->show;
1440 $SETUP_DIALOG->hide;
1441 0
1442 });
1443
1444 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1445 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1446 }
1447 }
1448 };
1449
1450 my $vb = new CFPlus::UI::VBox;
1451 $vb->add (new CFPlus::UI::FancyFrame
1452 label => "Options",
1453 child => (my $hb = new CFPlus::UI::HBox),
1454 );
1455 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1456 $hb->add (new CFPlus::UI::CheckBox
1457 expand => 1,
1458 state => $CFG->{shift_fire_stop},
1459 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1460 on_changed => sub {
1461 my ($cbox, $value) = @_;
1462 $CFG->{shift_fire_stop} = $value;
1463 0
1464 });
1465
1466 $vb->add (new CFPlus::UI::FancyFrame
1467 label => "Bindings",
1468 child => $binding_list);
1469 $vb->add (my $hb = new CFPlus::UI::HBox);
1470
1471 $hb->add (new CFPlus::UI::Button
1472 text => "record new",
1473 expand => 1,
1474 tooltip => "This button opens the binding editor with an empty binding.",
1475 on_activate => sub {
1476 $::BIND_EDITOR->set_binding (undef, undef, [],
1477 sub {
1478 my ($mod, $sym, $cmds) = @_;
1479 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1480 $refresh->();
1481 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1482 $SETUP_DIALOG->show;
1483 },
1484 sub {
1485 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1486 $SETUP_DIALOG->show;
1487 },
1488 );
1489 $SETUP_DIALOG->hide;
1490 $::BIND_EDITOR->show;
1491 0
1492 },
1493 );
1494
1495 $hb->add (new CFPlus::UI::Button
1496 text => "close",
1497 tooltip => "Closes the binding window",
1498 expand => 1,
1499 on_activate => sub {
1500 $SETUP_DIALOG->hide;
1501 0
1502 }
1503 );
1504
1505 $refresh->();
1506
1507 $vb
1508} 1425}
1509 1426
1510sub help_window { 1427sub help_window {
1511 my $win = new CFPlus::UI::Toplevel 1428 my $win = new CFPlus::UI::Toplevel
1512 x => 'center', 1429 x => 'center',
1513 y => 'center', 1430 y => 'center',
1514 z => 2, 1431 z => 4,
1515 name => 'doc_browser', 1432 name => 'doc_browser',
1516 force_w => int $WIDTH * 7/8, 1433 force_w => int $WIDTH * 7/8,
1517 force_h => int $HEIGHT * 7/8, 1434 force_h => int $HEIGHT * 7/8,
1518 title => "Help Browser", 1435 title => "Help Browser",
1519 has_close_button => 1; 1436 has_close_button => 1;
… …
1607 }; 1524 };
1608 1525
1609 $win 1526 $win
1610} 1527}
1611 1528
1529sub open_string_query {
1530 my ($title, $cb, $txt, $tooltip) = @_;
1531 my $dialog = new CFPlus::UI::Toplevel
1532 x => "center",
1533 y => "center",
1534 z => 50,
1535 force_w => $WIDTH * 4/5,
1536 title => $title;
1537
1538 $dialog->add (
1539 my $e = new CFPlus::UI::Entry
1540 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1541 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1542 tooltip => $tooltip
1543 );
1544
1545 $e->grab_focus;
1546 $e->set_text ($txt) if $txt;
1547 $dialog->show;
1548}
1549
1550sub open_quit_dialog {
1551 unless ($QUIT_DIALOG) {
1552 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1553 x => "center",
1554 y => "center",
1555 z => 50,
1556 title => "Really Quit?",
1557 on_key_down => sub {
1558 my ($dialog, $ev) = @_;
1559 $ev->{sym} == 27 and $dialog->hide;
1560 }
1561 ;
1562
1563 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1564
1565 $vb->add (new CFPlus::UI::Label
1566 text => "You should find a savebed and apply it first!",
1567 max_w => $WIDTH * 0.25,
1568 ellipsize => 0,
1569 );
1570 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1571 $hb->add (new CFPlus::UI::Button
1572 text => "Ok",
1573 expand => 1,
1574 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1575 );
1576 $hb->add (new CFPlus::UI::Button
1577 text => "Quit anyway",
1578 expand => 1,
1579 on_activate => sub { exit },
1580 );
1581 }
1582
1583 $QUIT_DIALOG->show;
1584 $QUIT_DIALOG->grab_focus;
1585}
1586
1587sub show_tip_of_the_day {
1588 # find all tips
1589 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1590
1591 CFPlus::DB::get state => "tip_of_the_day", sub {
1592 my ($todindex) = @_;
1593 $todindex = 0 if $todindex >= @tod;
1594 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1595
1596 # create dialog
1597 my $dialog;
1598
1599 my $close = sub {
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;
1638 };
1639}
1640
1612sub sdl_init { 1641sub sdl_init {
1613 CFPlus::SDL_Init 1642 CFPlus::SDL_Init
1614 and die "SDL::Init failed!\n"; 1643 and die "SDL::Init failed!\n";
1615} 1644}
1616 1645
1617sub video_init { 1646sub video_init {
1618 sdl_init;
1619
1620 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1647 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621 1648
1622 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1649 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623 1650
1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1651 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625 $FULLSCREEN = $CFG->{fullscreen}; 1652 $FULLSCREEN = $CFG->{fullscreen};
1626 $FAST = $CFG->{fast}; 1653 $FAST = $CFG->{fast};
1627 1654
1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1655 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1656 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630 1657
1631 $SDL_ACTIVE = 1; 1658 $SDL_ACTIVE = 1;
1632 $LAST_REFRESH = time - 0.01; 1659 $LAST_REFRESH = time - 0.01;
1633 1660
… …
1648 padding => 0, 1675 padding => 0,
1649 z => 100, 1676 z => 100,
1650 force_x => "max", 1677 force_x => "max",
1651 force_y => 0; 1678 force_y => 0;
1652 $DEBUG_STATUS->show; 1679 $DEBUG_STATUS->show;
1653
1654 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1655 1680
1656 $STATUSBOX = new CFPlus::UI::Statusbox; 1681 $STATUSBOX = new CFPlus::UI::Statusbox;
1657 $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]);
1658 1683
1659 (new CFPlus::UI::Frame 1684 (new CFPlus::UI::Frame
… …
1677 1702
1678 $MAPWIDGET = new CFPlus::MapWidget; 1703 $MAPWIDGET = new CFPlus::MapWidget;
1679 $MAPWIDGET->connect (activate_console => sub { 1704 $MAPWIDGET->connect (activate_console => sub {
1680 my ($mapwidget, $preset) = @_; 1705 my ($mapwidget, $preset) = @_;
1681 1706
1682 if ($CONSOLE) { 1707 $MESSAGE_WINDOW->activate_console ($preset)
1683 $CONSOLE->{input}->{auto_activated} = 1; 1708 if $MESSAGE_WINDOW;
1684 $CONSOLE->{input}->grab_focus;
1685
1686 if ($preset && $CONSOLE->{input}->get_text eq '') {
1687 $CONSOLE->{input}->set_text ($preset);
1688 }
1689 }
1690 }); 1709 });
1691 $MAPWIDGET->show; 1710 $MAPWIDGET->show;
1692 $MAPWIDGET->grab_focus; 1711 $MAPWIDGET->grab_focus;
1693
1694 $LOGVIEW = new CFPlus::UI::TextScroller
1695 expand => 1,
1696 font => $FONT_FIXED,
1697 fontsize => $::CFG->{log_fontsize},
1698 indent => -4,
1699 can_hover => 1,
1700 can_events => 1,
1701 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1702 ;
1703 1712
1704 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1713 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1705 title => "Setup", 1714 title => "Setup",
1706 name => "setup_dialog", 1715 name => "setup_dialog",
1707 x => 'center', 1716 x => 'center',
… …
1711 force_h => $::HEIGHT * 0.6, 1720 force_h => $::HEIGHT * 0.6,
1712 has_close_button => 1, 1721 has_close_button => 1,
1713 ; 1722 ;
1714 1723
1715 $METASERVER = metaserver_dialog; 1724 $METASERVER = metaserver_dialog;
1725 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1716 1726
1717 $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,
1718 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1728 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1719 1729
1720 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1730 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1721 "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.");
1722 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1732 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1723 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1733 "Configure various client-specific settings.");
1724 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1734 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1725 "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.");
1726 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1736 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1727 "Configure the use of audio, sound effects and background music."); 1737 "Configure the use of audio, sound effects and background music.");
1728 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1738 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1729 "Lets you define, edit and delete key bindings." 1739 "Lets you define, edit and delete key bindings."
1730 . "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 "
1731 . "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 "
1732 . "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. "
1733 . "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 "
1734 . "binding editor closes"); 1744 . "binding editor closes");
1735 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1745 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1736 "Some debuggin' options. Do not ask."); 1746 "Some debuggin' options. Do not ask.");
1737 1747
1738 $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
1739 1749
1740 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1750 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1741 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.");
1742 1752
1743 $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,
1744 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.");
1745 1755
1746 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
1747 1757
1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1758 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1759 }, 1769 },
1760 ); 1770 );
1761 1771
1762 $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,
1763 tooltip => "View Documentation"); 1773 tooltip => "View Documentation");
1774
1764 1775
1765 $BUTTONBAR->add (new CFPlus::UI::Button 1776 $BUTTONBAR->add (new CFPlus::UI::Button
1766 text => "Quit", 1777 text => "Quit",
1767 tooltip => "Terminates the program", 1778 tooltip => "Terminates the program",
1768 on_activate => sub { 1779 on_activate => sub {
… …
1786 CFPlus::OpenGL::shutdown; 1797 CFPlus::OpenGL::shutdown;
1787 1798
1788 undef $SDL_ACTIVE; 1799 undef $SDL_ACTIVE;
1789} 1800}
1790 1801
1791my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1792my $bgmusic;#TODO#hack#d#
1793
1794sub audio_channel_finished { 1802sub audio_channel_finished {
1795 my ($channel) = @_; 1803 my ($channel) = @_;
1796 1804
1797 #warn "channel $channel finished\n";#d# 1805 #warn "channel $channel finished\n";#d#
1798} 1806}
1799 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
1800sub audio_music_finished { 1889sub audio_music_finished {
1801 return unless $CFG->{bgm_enable}; 1890 undef $MUSIC_PLAYER;
1891 undef $MUSIC_PLAYING_META;
1892 undef $MUSIC_PLAYING_DATA;
1802 1893
1803 # TODO: hack, do play loop and mood music 1894 audio_music_changed;
1804 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1805 $bgmusic->play (0);
1806
1807 push @bgmusic, shift @bgmusic;
1808} 1895}
1809 1896
1810sub audio_init { 1897sub audio_init {
1811 if ($CFG->{audio_enable}) { 1898 if ($CFG->{audio_enable}) {
1812 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1899 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1900 $ENV{MIX_EFFECTSMAXSPEED} = 1;
1813 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1901 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1814 1902
1815 unless ($SDL_MIXER) { 1903 unless ($SDL_MIXER) {
1816 status "Unable to open sound device: there will be no sound"; 1904 status "Unable to open sound device: there will be no sound";
1817 return; 1905 return;
… …
1820 CFPlus::Mix_AllocateChannels 8; 1908 CFPlus::Mix_AllocateChannels 8;
1821 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1909 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1822 1910
1823 audio_music_finished; 1911 audio_music_finished;
1824 1912
1913 local $_;
1825 while (<$fh>) { 1914 while (<$fh>) {
1826 next if /^\s*#/; 1915 next if /^\s*#/;
1827 next if /^\s*$/; 1916 next if /^\s*$/;
1828 1917
1829 my ($file, $volume, $event) = split /\s+/, $_, 3; 1918 my ($file, $volume, $event) = split /\s+/, $_, 3;
1830 1919
1831 push @SOUNDS, "$volume,$file"; 1920 push @SOUNDS, "$volume,$file";
1832 1921
1833 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1922 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1834 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;
1835 $chunk->volume ($volume * 128 / 100); 1925 $chunk->volume ($volume * 128 / 100);
1836 $chunk 1926 $chunk
1837 }; 1927 };
1838 } 1928 }
1839 } else { 1929 } else {
1840 status "unable to open sound config: $!"; 1930 status "unable to open sound config: $!";
1841 } 1931 }
1932 } else {
1933 undef $SDL_MIXER;
1842 } 1934 }
1843} 1935}
1844 1936
1845sub audio_shutdown { 1937sub audio_shutdown {
1846 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1938 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
1861 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1862 1954
1863 $CFPlus::UI::ROOT->draw; 1955 $CFPlus::UI::ROOT->draw;
1864 1956
1865 $WANT_REFRESH = 0; 1957 $WANT_REFRESH = 0;
1866 $CAN_REFRESH = 0; 1958 $CAN_REFRESH = 0;
1867 $LAST_REFRESH = $NOW; 1959 $LAST_REFRESH = $NOW;
1868 1960
1869 CFPlus::SDL_GL_SwapBuffers; 1961 CFPlus::SDL_GL_SwapBuffers;
1870} 1962}
1871 1963
1872my $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 {
1873 $NOW = time; 1965 $NOW = time;
1874 1966
1875 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1967 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1876 for CFPlus::SDL_PollEvent; 1968 for CFPlus::poll_events;
1877 1969
1878 if (%animate_object) { 1970 if (%animate_object) {
1879 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1971 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1880 $WANT_REFRESH++; 1972 ++$WANT_REFRESH;
1881 } 1973 }
1882 1974
1883 if ($WANT_REFRESH) { 1975 if ($WANT_REFRESH) {
1884 force_refresh; 1976 force_refresh;
1885 } else { 1977 } else {
… …
1895sub animation_stop { 1987sub animation_stop {
1896 my ($widget) = @_; 1988 my ($widget) = @_;
1897 delete $animate_object{$widget}; 1989 delete $animate_object{$widget};
1898} 1990}
1899 1991
1900# check once/second for faces that need to be prefetched
1901# this should, of course, only run on demand, but
1902# SDL forces worse things on us....
1903
1904Event->timer (after => 1, interval => 0.25, cb => sub {
1905 $CONN->face_prefetch
1906 if $CONN;
1907});
1908
1909%SDL_CB = ( 1992%SDL_CB = (
1910 CFPlus::SDL_QUIT => sub { 1993 CFPlus::SDL_QUIT => sub {
1911 Event::unloop -1; 1994 exit;
1912 }, 1995 },
1913 CFPlus::SDL_VIDEORESIZE => sub { 1996 CFPlus::SDL_VIDEORESIZE => sub {
1914 }, 1997 },
1915 CFPlus::SDL_VIDEOEXPOSE => sub { 1998 CFPlus::SDL_VIDEOEXPOSE => sub {
1916 CFPlus::UI::full_refresh; 1999 CFPlus::UI::full_refresh;
1917 }, 2000 },
1918 CFPlus::SDL_ACTIVEEVENT => sub { 2001 CFPlus::SDL_ACTIVEEVENT => sub {
1919# 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;
1920 }, 2008 },
1921 CFPlus::SDL_KEYDOWN => sub { 2009 CFPlus::SDL_KEYDOWN => sub {
1922 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2010 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1923 # alt-enter 2011 # alt-enter
1924 $FULLSCREEN_ENABLE->toggle; 2012 $FULLSCREEN_ENABLE->toggle;
… …
1945 2033
1946$SIG{INT} = $SIG{TERM} = sub { exit }; 2034$SIG{INT} = $SIG{TERM} = sub { exit };
1947 2035
1948{ 2036{
1949 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2037 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2038 CFPlus::DB::Server::run;
2039
1950 CFPlus::UI::set_layout ($::CFG->{layout}); 2040 CFPlus::UI::set_layout ($::CFG->{layout});
1951 2041
1952 my %DEF_CFG = ( 2042 my %DEF_CFG = (
1953 sdl_mode => 0, 2043 sdl_mode => 0,
1954 width => 640, 2044 width => 640,
1955 height => 480, 2045 height => 480,
1956 fullscreen => 0, 2046 fullscreen => 0,
1957 fast => 0, 2047 fast => 0,
1958 map_scale => 1, 2048 map_scale => 1,
1959 fow_enable => 1, 2049 fow_enable => 1,
1960 fow_intensity => 0.45, 2050 fow_intensity => 0,
1961 fow_smooth => 0, 2051 map_smoothing => 1,
1962 gui_fontsize => 1, 2052 gui_fontsize => 1,
1963 log_fontsize => 0.7, 2053 log_fontsize => 0.7,
1964 gauge_fontsize => 1, 2054 gauge_fontsize => 1,
1965 gauge_size => 0.35, 2055 gauge_size => 0.35,
1966 stat_fontsize => 0.7, 2056 stat_fontsize => 0.7,
1967 mapsize => 100, 2057 mapsize => 100,
1968 say_command => 'say',
1969 audio_enable => 1, 2058 audio_enable => 1,
1970 bgm_enable => 1, 2059 bgm_enable => 1,
1971 bgm_volume => 0.25, 2060 bgm_volume => 0.25,
1972 face_prefetch => 0,
1973 output_sync => 1, 2061 output_sync => 1,
1974 output_count => 1, 2062 output_count => 1,
2063 output_rate => "",
1975 pickup => 0, 2064 pickup => 0,
1976 inv_sort => "mtime", 2065 inv_sort => "mtime",
1977 default => "profile", # default profile 2066 default => "profile", # default profile
2067 show_tips => 1,
2068 logview_max_par => 1000,
1978 ); 2069 );
1979 2070
1980 while (my ($k, $v) = each %DEF_CFG) { 2071 while (my ($k, $v) = each %DEF_CFG) {
1981 $CFG->{$k} = $v unless exists $CFG->{$k}; 2072 $CFG->{$k} = $v unless exists $CFG->{$k};
1982 } 2073 }
1983 2074
1984 $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 }
1985 2089
1986 sdl_init; 2090 sdl_init;
1987 2091
1988 @SDL_MODES = reverse 2092 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1989 grep $_->[0] >= 640 && $_->[1] >= 480, 2093 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1990 CFPlus::SDL_ListModes;
1991
1992 @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;
1993 2097
1994 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2098 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1995 2099
1996 { 2100 {
1997 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2101 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2026# } 2130# }
2027# my $t2 = Time::HiRes::time; 2131# my $t2 = Time::HiRes::time;
2028# warn $t2-$t1; 2132# warn $t2-$t1;
2029# } 2133# }
2030 2134
2135 $startup_done->();
2136
2031 video_init; 2137 video_init;
2032 audio_init; 2138 audio_init;
2033} 2139}
2140
2141show_tip_of_the_day if $CFG->{show_tips};
2034 2142
2035Event::loop; 2143Event::loop;
2036#CFPlus::SDL_Quit; 2144#CFPlus::SDL_Quit;
2037#CFPlus::_exit 0; 2145#CFPlus::_exit 0;
2038 2146
2147END {
2039END { CFPlus::SDL_Quit } 2148 CFPlus::SDL_Quit;
2149 CFPlus::DB::Server::stop;
2150}
2040 2151
2041=head1 NAME 2152=head1 NAME
2042 2153
2043cfplus - A Crossfire+ and Crossfire game client 2154cfplus - A Crossfire+ and Crossfire game client
2044 2155

Diff Legend

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