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.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 33
34 my $tmp = $ENV{PAR_TEMP};
35
11 while (my ($filename, $zip) = each %PAR::LibCache) { 36 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 37 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 38 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 39 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 40 unless -e "$tmp/$1";
16 } 41 }
17 } 42 }
18 43
19 # TODO: pango-rc file, anybody? 44 if ($^O eq "MSWin32") {
45 # relocatable
46 } else {
47 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
50 local $/;
51 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 53
21 unshift @INC, $ENV{PAR_TEMP}; 54 mkdir "$tmp/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!";
57 print $fh $rc;
58
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
63 }
64
65 unshift @INC, $tmp;
22 } 66 }
23} 67}
24 68
25# need to do it again because that pile of garbage called PAR nukes it before main 69# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 70unshift @INC, $ENV{PAR_TEMP}
… …
32use Crossfire; 76use Crossfire;
33use Crossfire::Protocol::Constants; 77use Crossfire::Protocol::Constants;
34 78
35use Compress::LZF; 79use Compress::LZF;
36 80
37use CFClient; 81use CFPlus;
38use CFClient::OpenGL (); 82use CFPlus::OpenGL ();
39use CFClient::Protocol; 83use CFPlus::Protocol;
84use CFPlus::DB;
40use CFClient::UI; 85use CFPlus::UI;
86use CFPlus::UI::Inventory;
87use CFPlus::UI::SpellList;
41use CFClient::Pod; 88use CFPlus::Pod;
42use CFClient::BindingEditor;
43use CFClient::MapWidget; 89use CFPlus::MapWidget;
90use CFPlus::Macro;
44 91
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 92$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 93$SIG{PIPE} = 'IGNORE';
47 94
48$Event::Eval = 0; 95$Event::Eval = 1;
49$Event::DIED = sub { 96$Event::DIED = sub {
50 # TODO: display dialog box or so 97 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFClient::error $_[1];
53}; 98};
54
55$SIG{__DIE__} = sub {
56 return if CFClient::in_destruct;
57 Carp::cluck $_[0];
58 CFClient::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 99
66my $MAX_FPS = 60; 100my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 101my $MIN_FPS = 5; # unused as of yet
68 102
69our $META_SERVER = "crossfire.real-time.com:13326"; 103our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 104
71our $LAST_REFRESH; 105our $LAST_REFRESH;
72our $NOW; 106our $NOW;
73 107
74our $CFG; 108our $CFG;
75our $CONN; 109our $CONN;
110our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 111our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 112
78our $WANT_REFRESH; 113our $WANT_REFRESH;
79our $CAN_REFRESH; 114our $CAN_REFRESH;
80 115
… …
111 146
112our $INVENTORY_PAGE; 147our $INVENTORY_PAGE;
113our $STATS_PAGE; 148our $STATS_PAGE;
114our $SKILL_PAGE; 149our $SKILL_PAGE;
115our $SPELL_PAGE; 150our $SPELL_PAGE;
151our $SPELL_LIST;
116 152
117our $HELP_WINDOW; 153our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 154our $MESSAGE_WINDOW;
119our $FLOORBOX; 155our $FLOORBOX;
120our $GAUGES; 156our $GAUGES;
… …
133 169
134our $INV; 170our $INV;
135our $INVR; 171our $INVR;
136our $INV_RIGHT_HB; 172our $INV_RIGHT_HB;
137 173
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 174our $PICKUP_CFG;
142 175
176our $IN_BUILD_MODE;
177our $BUILD_BUTTON;
178
143sub status { 179sub status {
144 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 181}
146 182
147sub debug { 183sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
185}
186
187sub message {
188 my ($para) = @_;
189
190 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
191
192 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
193
194 $LOGVIEW->add_paragraph ($para);
195 $LOGVIEW->scroll_to_bottom;
149} 196}
150 197
151sub destroy_query_dialog { 198sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
154} 201}
155 202
203# FIXME: a very ugly hack to wait for stat update look below! #d#
204our $QUERY_TIMER; #d#
205
156# server query dialog 206# server query dialog
157sub server_query { 207sub server_query {
158 my ($conn, $flags, $prompt) = @_; 208 my ($conn, $flags, $prompt) = @_;
159 209
210 # FIXME: a very ugly hack to wait for stat update #d#
211 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
212 unless ($QUERY_TIMER) {
213 $QUERY_TIMER =
214 Event->timer (
215 after => 1,
216 cb => sub {
217 server_query ($conn, $flags, $prompt, 1);
218 $QUERY_TIMER = undef
219 }
220 );
221 return;
222 }
223 }
224
160 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 225 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 226 x => "center",
162 y => "center", 227 y => "center",
163 title => "Server Query", 228 title => "Server Query",
164 child => my $vbox = new CFClient::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
165 ; 230 ;
166 231
167 my @dialog = my $label = new CFClient::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 234 ellipsise => 0,
170 text => $prompt; 235 text => $prompt;
171 236
172 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFClient::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
174 239
175 $hbox->add (new CFClient::UI::Button 240 $hbox->add (new CFPlus::UI::Button
176 text => "No", 241 text => "No",
177 on_activate => sub { 242 on_activate => sub {
178 $conn->send ("reply n"); 243 $conn->send ("reply n");
179 $dialog->destroy; 244 $dialog->destroy;
180 0 245 0
181 } 246 }
182 ); 247 );
183 $hbox->add (new CFClient::UI::Button 248 $hbox->add (new CFPlus::UI::Button
184 text => "Yes", 249 text => "Yes",
185 on_activate => sub { 250 on_activate => sub {
186 $conn->send ("reply y"); 251 $conn->send ("reply y");
187 destroy_query_dialog $conn; 252 destroy_query_dialog $conn;
188 0 253 0
… …
190 ); 255 );
191 256
192 $dialog->grab_focus; 257 $dialog->grab_focus;
193 258
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
199 262
200 unshift @dialog, new CFClient::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 265 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
204 267
205 unshift @dialog, my $table = new CFClient::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
206 269
207 $table->add (0, 0, new CFClient::UI::Button 270 $table->add (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 271 text => "Next Race",
209 on_activate => sub { 272 on_activate => sub {
210 $conn->send ("reply n"); 273 $conn->send ("reply n");
211 destroy_query_dialog $conn; 274 destroy_query_dialog $conn;
212 0 275 0
213 }, 276 },
214 ); 277 );
215 $table->add (2, 0, new CFClient::UI::Button 278 $table->add (2, 0, new CFPlus::UI::Button
216 text => "Accept", 279 text => "Accept",
217 on_activate => sub { 280 on_activate => sub {
218 $conn->send ("reply d"); 281 $conn->send ("reply d");
219 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
220 0 283 0
221 }, 284 },
222 ); 285 );
223 286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
309
224 unshift @dialog, new CFClient::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 312 ellipsise => 0,
227 markup => 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 314 ;
236 315
237 } elsif ($prompt =~ /roll new stats/) { 316 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 317 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 318 $conn->send ("reply $stat");
… …
242 } 321 }
243 322
244 $STATS_PAGE->show; 323 $STATS_PAGE->show;
245 $MESSAGE_WINDOW->hide; 324 $MESSAGE_WINDOW->hide;
246 325
247 unshift @dialog, new CFClient::UI::Label 326 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 327 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 328 ellipsise => 0,
250 markup => "\nOr use your keyboard and the text entry below:\n"; 329 markup => "\nOr use your keyboard and the text entry below:\n";
251 330
252 unshift @dialog, my $table = new CFClient::UI::Table; 331 unshift @dialog, my $table = new CFPlus::UI::Table;
253 332
254 # left: re-roll 333 # left: re-roll
255 $table->add (0, 0, new CFClient::UI::Button 334 $table->add (0, 0, new CFPlus::UI::Button
256 text => "Roll Again", 335 text => "Roll Again",
257 on_activate => sub { 336 on_activate => sub {
258 $conn->send ("reply y"); 337 $conn->send ("reply y");
259 destroy_query_dialog $conn; 338 destroy_query_dialog $conn;
260 0 339 0
261 }, 340 },
262 ); 341 );
263 342
264 # center: swap stats 343 # center: swap stats
265 my ($sw1, $sw2) = map +(new CFClient::UI::Selector 344 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266 expand => 1, 345 expand => 1,
267 value => $_, 346 value => $_,
268 options => [ 347 options => [
269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 348 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 349 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 353 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 354 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276 ], 355 ],
277 ), 1 .. 2; 356 ), 1 .. 2;
278 357
279 $table->add (2, 0, new CFClient::UI::Button 358 $table->add (2, 0, new CFPlus::UI::Button
280 text => "Swap Stats", 359 text => "Swap Stats",
281 on_activate => sub { 360 on_activate => sub {
282 $conn->{stat_change_with} = $sw2->{value}; 361 $conn->{stat_change_with} = $sw2->{value};
283 $conn->send ("reply $sw1->{value}"); 362 $conn->send ("reply $sw1->{value}");
284 destroy_query_dialog $conn; 363 destroy_query_dialog $conn;
285 0 364 0
286 }, 365 },
287 ); 366 );
288 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 367 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289 368
290 # right: accept 369 # right: accept
291 $table->add (4, 0, new CFClient::UI::Button 370 $table->add (4, 0, new CFPlus::UI::Button
292 text => "Accept", 371 text => "Accept",
293 on_activate => sub { 372 on_activate => sub {
294 $conn->send ("reply n"); 373 $conn->send ("reply n");
295 $STATS_PAGE->hide; 374 $STATS_PAGE->hide;
296 destroy_query_dialog $conn; 375 destroy_query_dialog $conn;
297 0 376 0
298 }, 377 },
299 ); 378 );
300 379
301 unshift @dialog, my $hbox = new CFClient::UI::HBox; 380 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302 for ( 381 for (
303 [Str => CS_STAT_STR], 382 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX], 383 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON], 384 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT], 385 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS], 386 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW], 387 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA], 388 [Cha => CS_STAT_CHA],
310 ) { 389 ) {
311 my ($name, $id) = @$_; 390 my ($name, $id) = @$_;
312 $hbox->add (new CFClient::UI::Label 391 $hbox->add (new CFPlus::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 392 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 393 align => 0,
315 expand => 1, 394 expand => 1,
316 can_events => 1, 395 can_events => 1,
317 can_hover => 1, 396 can_hover => 1,
318 tooltip => $CFClient::STAT_TOOLTIP{$name}, 397 tooltip => "#stat_$name",
319 ); 398 );
320 } 399 }
321 400
322 unshift @dialog, new CFClient::UI::Label 401 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 402 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 403 ellipsise => 0,
325 markup => 404 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 405 ;
332 } 406 }
333 407
334 push @dialog, my $entry = new CFClient::UI::Entry 408 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 409 on_changed => sub {
336 $conn->send ("reply $_[1]"); 410 $conn->send ("reply $_[1]");
337 destroy_query_dialog $conn; 411 destroy_query_dialog $conn;
338 0 412 0
339 }, 413 },
… …
342 $entry->grab_focus; 416 $entry->grab_focus;
343 417
344 } else { 418 } else {
345 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 419 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
346 420
347 push @dialog, my $entry = new CFClient::UI::Entry 421 push @dialog, my $entry = new CFPlus::UI::Entry
348 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 422 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
349 on_activate => sub { 423 on_activate => sub {
350 $conn->send ("reply $_[1]"); 424 $conn->send ("reply $_[1]");
351 destroy_query_dialog $conn; 425 destroy_query_dialog $conn;
352 0 426 0
… …
366 $LOGIN_BUTTON->set_text ("Logout"); 440 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 441 $SETUP_DIALOG->hide;
368 442
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 443 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 444
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 445 my ($host, $port) = split /:/, $PROFILE->{host};
372 446
373 $MAP = new CFClient::Map $mapsize, $mapsize; 447 $MAP = new CFPlus::Map;
374 448
375 $CONN = eval { 449 $CONN = eval {
376 new CFClient::Protocol 450 new CFPlus::Protocol
377 host => $host, 451 host => $host,
378 port => $port || 13327, 452 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 453 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 454 pass => $PROFILE->{password},
381 mapw => $mapsize, 455 mapw => $mapsize,
382 maph => $mapsize, 456 maph => $mapsize,
457
458 client => "cfplus $CFPlus::VERSION $] $^O",
383 459
384 map_widget => $MAPWIDGET, 460 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 461 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
387 map => $MAP, 463 map => $MAP,
388 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
389 query => \&server_query, 465 query => \&server_query,
390 466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
470
391 sound_play => sub { 471 sound_play => sub {
392 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
393 473
394 $SDL_MIXER 474 $SDL_MIXER
395 or return; 475 or return;
… …
400 $chunk->play; 480 $chunk->play;
401 }, 481 },
402 }; 482 };
403 483
404 if ($CONN) { 484 if ($CONN) {
405 CFClient::lowdelay fileno $CONN->{fh}; 485 CFPlus::lowdelay fileno $CONN->{fh};
406 486
407 status "login successful"; 487 status "login successful";
408 } else { 488 } else {
409 status "unable to connect"; 489 status "unable to connect";
410 stop_game(); 490 stop_game();
… …
414sub stop_game { 494sub stop_game {
415 $LOGIN_BUTTON->set_text ("Login"); 495 $LOGIN_BUTTON->set_text ("Login");
416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show; 497 $SETUP_DIALOG->show;
418 $PL_WINDOW->hide; 498 $PL_WINDOW->hide;
419 $SPELL_PAGE->clear_spells; 499 $SPELL_LIST->clear_spells;
420 500
421 return unless $CONN; 501 return unless $CONN;
422 502
423 status "connection closed"; 503 status "connection closed";
424 504
… …
428 508
429 undef $MAP; 509 undef $MAP;
430} 510}
431 511
432sub graphics_setup { 512sub graphics_setup {
433 my $vbox = new CFClient::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
434 514
435 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 516
517 my $row = 0;
518
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (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
437 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 524 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
438 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
439 526
440 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 527 $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]);
441 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
442 529
443 $mode_slider->connect (changed => sub { 530 $mode_slider->connect (changed => sub {
444 my ($self, $value) = @_; 531 my ($self, $value) = @_;
445 532
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
448 }); 535 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 536 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450 537
451 my $row = 1;
452
453 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 540 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 541 tooltip => "Bring the client into fullscreen mode.",
457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 542 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
458 ); 543 );
459 544
460 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 545 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
461 $table->add (1, $row++, new CFClient::UI::CheckBox 546 $table->add (1, $row++, new CFPlus::UI::CheckBox
462 state => $CFG->{fast}, 547 state => $CFG->{fast},
463 tooltip => "Lower the visual quality considerably to speed up rendering.", 548 tooltip => "Lower the visual quality considerably to speed up rendering.",
464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465 ); 550 );
466 551
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 );
558
559 $table->add (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.",
562 on_activate => sub {
563 video_shutdown ();
564 video_init ();
565 0
566 }
567 );
568
467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468 $table->add (1, $row++, new CFClient::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
472 ); 574 );
473 575
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
583 );
584
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 585 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
475 $table->add (1, $row++, new CFClient::UI::CheckBox 586 $table->add (1, $row++, new CFPlus::UI::CheckBox
476 state => $CFG->{fow_enable}, 587 state => $CFG->{fow_enable},
477 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 588 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
478 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 589 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
479 ); 590 );
480 591
481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 592 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
482 $table->add (1, $row++, new CFClient::UI::Slider 593 $table->add (1, $row++, new CFPlus::UI::Slider
483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 594 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
484 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 595 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
485 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 596 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
486 ); 597 );
487 598
488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
489 $table->add (1, $row++, new CFClient::UI::CheckBox 600 $table->add (1, $row++, new CFPlus::UI::CheckBox
490 state => $CFG->{fow_smooth}, 601 state => $CFG->{fow_smooth},
491 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 602 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
492 on_changed => sub { 603 on_changed => sub {
493 my ($self, $value) = @_; 604 my ($self, $value) = @_;
494 $CFG->{fow_smooth} = $value; 605 $CFG->{fow_smooth} = $value;
495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
496 0 607 0
497 } 608 }
498 ); 609 );
499 610
500 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
501 $table->add (1, $row++, new CFClient::UI::Slider
502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
503 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505 );
506
507 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508 $table->add (1, $row++, new CFClient::UI::Slider 612 $table->add (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
510 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 614 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
512 ); 616 );
513 617
514 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 618 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
515 $table->add (1, $row++, new CFClient::UI::Slider 619 $table->add (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 620 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
517 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 621 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
518 on_changed => sub { 622 on_changed => sub {
519 $CFG->{gauge_fontsize} = $_[1]; 623 $CFG->{gauge_fontsize} = $_[1];
520 &set_gauge_window_fontsize; 624 &set_gauge_window_fontsize;
521 0 625 0
522 } 626 }
523 ); 627 );
524 628
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
526 $table->add (1, $row++, new CFClient::UI::Slider 630 $table->add (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{gauge_size}, 0.2, 0.8], 631 range => [$CFG->{gauge_size}, 0.2, 0.8],
528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529 on_changed => sub { 633 on_changed => sub {
530 $CFG->{gauge_size} = $_[1]; 634 $CFG->{gauge_size} = $_[1];
531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 635 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532 0 636 0
533 } 637 }
534 ); 638 );
535 639
536 $table->add (1, $row++, new CFClient::UI::Button
537 expand => 1, align => 0, text => "Apply",
538 tooltip => "Apply the video settings",
539 on_activate => sub {
540 video_shutdown ();
541 video_init ();
542 0
543 }
544 );
545
546 $vbox 640 $vbox
547} 641}
548 642
549sub audio_setup { 643sub audio_setup {
550 my $vbox = new CFClient::UI::VBox; 644 my $vbox = new CFPlus::UI::VBox;
551 645
552 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 646 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
553 647
554 my $row = 0; 648 my $row = 0;
555 649
556 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 650 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
557 $table->add (1, $row++, new CFClient::UI::CheckBox 651 $table->add (1, $row++, new CFPlus::UI::CheckBox
558 state => $CFG->{audio_enable}, 652 state => $CFG->{audio_enable},
559 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.", 653 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.",
560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 654 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
561 ); 655 );
562# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 656# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
563# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 657# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
564# $CFG->{effects_volume} = $_[1]; 658# $CFG->{effects_volume} = $_[1];
565# }); 659# });
566 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 660 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
567 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 661 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
568 $hbox->add (new CFClient::UI::CheckBox 662 $hbox->add (new CFPlus::UI::CheckBox
569 expand => 1, state => $CFG->{bgm_enable}, 663 expand => 1, state => $CFG->{bgm_enable},
570 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 664 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
571 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 665 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
572 ); 666 );
573 $hbox->add (new CFClient::UI::Slider 667 $hbox->add (new CFPlus::UI::Slider
574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 668 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
575 tooltip => "The volume of the background music. Changes are instant.", 669 tooltip => "The volume of the background music. Changes are instant.",
576 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 670 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
577 ); 671 );
578 672
579 $table->add (1, $row++, new CFClient::UI::Button 673 $table->add (1, $row++, new CFPlus::UI::Button
580 expand => 1, align => 0, text => "Apply", 674 expand => 1, align => 0, text => "Apply",
581 tooltip => "Apply the audio settings", 675 tooltip => "Apply the audio settings",
582 on_activate => sub { 676 on_activate => sub {
583 audio_shutdown (); 677 audio_shutdown ();
584 audio_init (); 678 audio_init ();
… …
596} 690}
597 691
598sub make_gauge_window { 692sub make_gauge_window {
599 my $gh = int $HEIGHT * $CFG->{gauge_size}; 693 my $gh = int $HEIGHT * $CFG->{gauge_size};
600 694
601 my $win = new CFClient::UI::Frame ( 695 my $win = new CFPlus::UI::Frame (
602 force_x => 0, 696 force_x => 0,
603 force_y => "max", 697 force_y => "max",
604 force_w => $WIDTH, 698 force_w => $WIDTH,
605 force_h => $gh, 699 force_h => $gh,
606 ); 700 );
607 701
608 $win->add (my $hbox = new CFClient::UI::HBox 702 $win->add (my $hbox = new CFPlus::UI::HBox
609 children => [ 703 children => [
610 (new CFClient::UI::HBox expand => 1), 704 (new CFPlus::UI::HBox expand => 1),
611 (new CFClient::UI::VBox children => [ 705 (new CFPlus::UI::VBox children => [
612 (new CFClient::UI::Empty expand => 1), 706 (new CFPlus::UI::Empty expand => 1),
613 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 707 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
614 ]), 708 ]),
615 (my $vbox = new CFClient::UI::VBox), 709 (my $vbox = new CFPlus::UI::VBox),
616 ], 710 ],
617 ); 711 );
618 712
619 $vbox->add (new CFClient::UI::HBox 713 $vbox->add (new CFPlus::UI::HBox
620 expand => 1, 714 expand => 1,
621 children => [ 715 children => [
622 (new CFClient::UI::Empty expand => 1), 716 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFClient::UI::HBox), 717 (my $hb = new CFPlus::UI::HBox),
624 ], 718 ],
625 ); 719 );
626 720
627 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 721 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 722 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 723 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 724 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 725
636 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 726 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 727 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 728
641 $GAUGES = { 729 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 730 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 731 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 732 };
… …
647 735
648 $win 736 $win
649} 737}
650 738
651sub debug_setup { 739sub debug_setup {
652 my $table = new CFClient::UI::Table; 740 my $table = new CFPlus::UI::Table;
653 741
654 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 742 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
655 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 743 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
656 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 744 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
657 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 745 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
658 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 746 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
659 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 747 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
660 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 748 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
661 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 749 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
750 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
662 751
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 752 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 753
665 for my $x (0..2) { 754 for my $x (0..2) {
666 for my $y (0 .. 2) { 755 for my $y (0 .. 2) {
667 $table->add ($x + 3, $y, 756 $table->add ($x + 3, $y,
668 new CFClient::UI::Entry 757 new CFPlus::UI::Entry
669 text => $default_smooth[$x * 3 + $y], 758 text => $default_smooth[$x * 3 + $y],
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 759 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 760 );
672 } 761 }
673 } 762 }
674 763
764 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
675 765
676 $table 766 $table
677} 767}
678 768
679sub stats_window { 769sub stats_window {
680 my $r = new CFClient::UI::ScrolledWindow ( 770 my $r = new CFPlus::UI::ScrolledWindow (
681 expand => 1, 771 expand => 1,
682 scroll_y => 1 772 scroll_y => 1
683 ); 773 );
684 $r->add (my $vb = new CFClient::UI::VBox); 774 $r->add (my $vb = new CFPlus::UI::VBox);
685 775
776 $vb->add (new CFPlus::UI::FancyFrame
777 label => "Player",
778 child => (my $pi = new CFPlus::UI::VBox),
779 );
780
686 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 781 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 782 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 783 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 784 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 785 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 786 tooltip => "The map you are currently on (if supported by the server).");
692 787
693 $vb->add (my $hb0 = new CFClient::UI::HBox); 788 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 789 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 790 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 791 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 792 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 793 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 794 tooltip => "The weight limit: you cannot carry more than this.");
700 795
796 $vb->add (new CFPlus::UI::FancyFrame
797 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 798 child => (my $hb = new CFPlus::UI::HBox expand => 1),
799 );
702 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 800 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 801
704 my $color2 = [1, 1, 0]; 802 my $color2 = [1, 1, 0];
705 803
706 for ( 804 for (
707 [0, 0, st_str => "Str", 30], 805 [0, 0, st_str => "Str", 30],
… …
719 [2, 4, st_spd => "Spd", 10.54], 817 [2, 4, st_spd => "Spd", 10.54],
720 [2, 5, st_wspd => "WSp", 10.54], 818 [2, 5, st_wspd => "WSp", 10.54],
721 ) { 819 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 820 my ($col, $row, $id, $label, $template) = @$_;
723 821
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 822 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 823 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 824 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 825 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 826 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 827 align => -1, text => $label, tooltip => "#stat_$label");
730 } 828 }
731 829
830 $vb->add (new CFPlus::UI::FancyFrame
831 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 832 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
833 );
733 834
734 my $row = 0; 835 my $row = 0;
735 my $col = 0; 836 my $col = 0;
736 837
737 my %resist_names = ( 838 my %resist_names = (
… …
776 drain acid pois para deat phys 877 drain acid pois para deat phys
777 blind fear tund elec cold ghit/) 878 blind fear tund elec cold ghit/)
778 { 879 {
779 $tbl2->add ($col, $row, 880 $tbl2->add ($col, $row,
780 $STATWIDS->{"res_$_"} = 881 $STATWIDS->{"res_$_"} =
781 new CFClient::UI::Label 882 new CFPlus::UI::Label
782 font => $FONT_FIXED, 883 font => $FONT_FIXED,
783 template => "-100%", 884 template => "-100%",
784 align => +1, 885 align => +1,
785 valign => 0, 886 valign => 0,
786 can_events => 1, 887 can_events => 1,
787 can_hover => 1, 888 can_hover => 1,
788 tooltip => $resist_names{$_}->[1], 889 tooltip => $resist_names{$_}->[1],
789 ); 890 );
790 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 891 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
791 font => $FONT_FIXED, 892 font => $FONT_FIXED,
792 can_hover => 1, 893 can_hover => 1,
793 can_events => 1, 894 can_events => 1,
794 path => "ui/resist/resist_$_.png", 895 path => "ui/resist/resist_$_.png",
795 tooltip => $resist_names{$_}->[1], 896 tooltip => $resist_names{$_}->[1],
796 ); 897 );
797 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 898 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
798 text => $resist_names{$_}->[0], 899 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED, 900 font => $FONT_FIXED,
800 can_hover => 1, 901 can_hover => 1,
801 can_events => 1, 902 can_events => 1,
802 tooltip => $resist_names{$_}->[1], 903 tooltip => $resist_names{$_}->[1],
… …
813 914
814 $r 915 $r
815} 916}
816 917
817sub skill_window { 918sub skill_window {
818 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 919 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
819 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 920 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820 $sw 921 $sw
821} 922}
822 923
823sub formsep($) { 924sub formsep($) {
824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 925 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
835 return if $METASERVER_ATIME > time; 936 return if $METASERVER_ATIME > time;
836 $METASERVER_ATIME = time + 60; 937 $METASERVER_ATIME = time + 60;
837 938
838 my $table = $METASERVER->{table}; 939 my $table = $METASERVER->{table};
839 $table->clear; 940 $table->clear;
840 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 941 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 942
842 my $buf; 943 my $ok = 0;
843 944
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 945 CFPlus::background {
946 my $ua = CFPlus::lwp_useragent;
845 947
846 unless ($fh) { 948 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 949 } sub {
848 return; 950 my ($msg) = @_;
849 } 951 if ($msg) {
850
851 Event->io (fd => $fh, poll => 'r', cb => sub {
852 my $res = sysread $fh, $buf, 8192, length $buf;
853
854 if (!defined $res) {
855 $_[0]->w->cancel;
856 $label->set_text ("error while retrieving server list: $!");
857 } elsif ($res == 0) {
858 $_[0]->w->cancel;
859 status "server list retrieved";
860
861 utf8::decode $buf if utf8::valid $buf;
862
863 $table->clear; 952 $table->clear;
864 953
865 my @tip = ( 954 my @tip = (
866 "The current number of users logged in on the server.", 955 "The current number of users logged in on the server.",
867 "The hostname of the server.", 956 "The hostname of the server.",
868 "The time this server has been running without being restarted.", 957 "The time this server has been running without being restarted.",
869 "The server software version - a '+' indicates a Crossfire+ server.", 958 "The server software version - a '+' indicates a Crossfire+ server.",
870 "Short information about this server provided by its admins.", 959 "Short information about this server provided by its admins.",
871 ); 960 );
872 my @col = qw(#Users Host Uptime Version Description); 961 my @col = qw(#Users Host Uptime Version Description);
873 $table->add ($_, 0, new CFClient::UI::Label 962 $table->add ($_, 0, new CFPlus::UI::Label
874 can_hover => 1, can_events => 1, 963 can_hover => 1, can_events => 1,
875 align => 0, fg => [1, 1, 0], 964 align => 0, fg => [1, 1, 0],
876 text => $col[$_], tooltip => $tip[$_]) 965 text => $col[$_], tooltip => $tip[$_])
877 for 0 .. $#col; 966 for 0 .. $#col;
878 967
879 my @align = qw(1 0 1 1 -1); 968 my @align = qw(1 0 1 1 -1);
880 969
881 my $y = 0; 970 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 971 for my $m (@{ $msg->{servers} }) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 972 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
973 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884 974
885 for ($desc) { 975 for ($desc) {
886 s/<br>/\n/gi; 976 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 977 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 978 s/<.*?>//sgi;
889 s/&/&amp;/g; 979 s/&amp;/&/g;
890 s/</&lt;/g; 980 s/&lt;/</g;
891 s/>/&gt;/g; 981 s/&gt;/>/g;
892 } 982 }
893 983
894 $uptime = sprintf "%dd %02d:%02d:%02d", 984 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 985 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 986 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 987 (int $uptime / 60) % 60,
898 $m->[8] % 60; 988 $uptime % 60;
899 989
900 $m = [$users, $host, $uptime, $version, $desc]; 990 $m = [$users, $host, $uptime, $version, $desc];
901 991
902 $y++; 992 $y++;
903 993
904 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 994 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
905 (new CFClient::UI::Button 995 (new CFPlus::UI::Button
906 text => "Use", 996 text => "Use",
907 tooltip => "Put this server into the <b>Host:Port</b> field", 997 tooltip => "Put this server into the <b>Host:Port</b> field",
908 on_activate => sub { 998 on_activate => sub {
909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 999 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910 $METASERVER->hide; 1000 $METASERVER->hide;
911 0 1001 0
912 }, 1002 },
913 ), 1003 ),
914 (new CFClient::UI::Empty expand => 1), 1004 (new CFPlus::UI::Empty expand => 1),
915 ]); 1005 ]);
916 1006
917 $table->add ($_, $y, new CFClient::UI::Label 1007 $table->add ($_, $y, new CFPlus::UI::Label
1008 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 1009 ellipsise => 0,
919 align => $align[$_], 1010 align => $align[$_],
920 text => $m->[$_], 1011 text => $m->[$_],
921 tooltip => $tip[$_], 1012 tooltip => $tip[$_],
1013 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 1014 can_hover => 1,
923 can_events => 1, 1015 can_events => 1,
924 fontsize => 0.8) 1016 fontsize => 0.8)
925 for 0 .. $#$m; 1017 for 0 .. $#$m;
926 } 1018 }
1019 } else {
1020 $ok or $label->set_text ("error while contacting metaserver");
927 } 1021 }
928 }); 1022 };
1023
929} 1024}
930 1025
931sub metaserver_dialog { 1026sub metaserver_dialog {
932 my $vbox = new CFClient::UI::VBox; 1027 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFClient::UI::Table; 1028 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 1029 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 1030
936 my $dialog = new CFClient::UI::FancyFrame 1031 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 1032 title => "Server List",
938 name => 'metaserver_dialog', 1033 name => 'metaserver_dialog',
939 x => 'center', 1034 x => 'center',
940 y => 'center', 1035 y => 'center',
941 z => 3, 1036 z => 3,
1037 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 1038 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 1039 child => $vbox,
944 has_close_button => 1, 1040 has_close_button => 1,
945 table => $table, 1041 table => $table,
946 on_visibility_change => sub { 1042 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 1043 update_metaserver ($_[0]) if $_[1];
… …
951 1047
952 $dialog 1048 $dialog
953} 1049}
954 1050
955sub server_setup { 1051sub server_setup {
956 my $vbox = new CFClient::UI::VBox; 1052 my $vbox = new CFPlus::UI::VBox;
957 1053
1054 $vbox->add (new CFPlus::UI::FancyFrame
1055 label => "Connection Settings",
958 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1056 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1057 );
959 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1058 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 1059
961 { 1060 {
962 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1061 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 1062
964 $vbox->add ( 1063 $vbox->add (
965 $HOST_ENTRY = new CFClient::UI::Entry 1064 $HOST_ENTRY = new CFPlus::UI::Entry
966 expand => 1, 1065 expand => 1,
967 text => $CFG->{profile}{default}{host}, 1066 text => $CFG->{profile}{default}{host},
968 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1067 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
969 on_changed => sub { 1068 on_changed => sub {
970 my ($self, $value) = @_; 1069 my ($self, $value) = @_;
971 $CFG->{profile}{default}{host} = $value; 1070 $CFG->{profile}{default}{host} = $value;
972 0 1071 0
973 } 1072 }
974 ); 1073 );
975 1074
976 $vbox->add (new CFClient::UI::Button 1075 $vbox->add (new CFPlus::UI::Button
977 expand => 1, 1076 expand => 1,
978 text => "Server List", 1077 text => "Server List",
979 other => $METASERVER, 1078 other => $METASERVER,
980 tooltip => "Show a list of available crossfire servers", 1079 tooltip => "Show a list of available crossfire servers",
981 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1080 on_activate => sub { $METASERVER->toggle_visibility; 0 },
982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1081 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
983 ); 1082 );
984 } 1083 }
985 1084
986 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1085 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
987 $table->add (1, 4, new CFClient::UI::Entry 1086 $table->add (1, 4, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{user}, 1087 text => $CFG->{profile}{default}{user},
989 tooltip => "The name of your character on the server", 1088 tooltip => "The name of your character on the server",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
991 ); 1090 );
992 1091
993 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1092 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
994 $table->add (1, 5, new CFClient::UI::Entry 1093 $table->add (1, 5, new CFPlus::UI::Entry
995 text => $CFG->{profile}{default}{password}, 1094 text => $CFG->{profile}{default}{password},
996 hidden => 1, 1095 hidden => 1,
997 tooltip => "The password for your character", 1096 tooltip => "The password for your character",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
999 ); 1098 );
1000 1099
1001 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1100 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1002 $table->add (1, 7, new CFClient::UI::Slider 1101 $table->add (1, 7, new CFPlus::UI::Slider
1003 force_w => 100, 1102 force_w => 100,
1004 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1103 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005 tooltip => "This is the size of the portion of the map update the server sends you. " 1104 tooltip => "This is the size of the portion of the map update the server sends you. "
1006 . "If you set this to a high value you will be able to see further, " 1105 . "If you set this to a high value you will be able to see further, "
1007 . "but you also increase bandwidth requirements and latency. " 1106 . "but you also increase bandwidth requirements and latency. "
1008 . "This option is only used once at log-in.", 1107 . "This option is only used once at log-in.",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1108 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1010 ); 1109 );
1011 1110
1012 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1111 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1013 $table->add (1, 8, new CFClient::UI::CheckBox 1112 $table->add (1, 8, new CFPlus::UI::CheckBox
1014 state => $CFG->{face_prefetch}, 1113 state => $CFG->{face_prefetch},
1015 tooltip => "<b>Background Image Prefetch</b>\n\n" 1114 tooltip => "<b>Background Image Prefetch</b>\n\n"
1016 . "If enabled, the client automatically pre-fetches images from the server. " 1115 . "If enabled, the client automatically pre-fetches images from the server. "
1017 . "This might increase or create lag, but increases the chances " 1116 . "This might increase or create lag, but increases the chances "
1018 . "of faces being ready for display when you encounter them. " 1117 . "of faces being ready for display when you encounter them. "
… …
1020 . "so only set it if you really need to prefetch images. " 1119 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1120 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1122 );
1024 1123
1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1125 $table->add (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1131 );
1132
1025 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1026 $table->add (1, 9, new CFClient::UI::Entry 1134 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1135 text => $CFG->{output_count},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1136 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1138 );
1031 1139
1032 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFClient::UI::Entry 1141 $table->add (1, 11, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1142 text => $CFG->{output_sync},
1035 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1143 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1145 );
1038 1146
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1148 expand => 1,
1041 align => 0, 1149 align => 0,
1042 text => "Login", 1150 text => "Login",
1043 on_activate => sub { 1151 on_activate => sub {
1044 $CONN ? stop_game 1152 $CONN ? stop_game
1045 : start_game; 1153 : start_game;
1046 0 1154 0
1047 }, 1155 },
1048 ); 1156 );
1049 1157
1158 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info",
1160 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1161 );
1162
1163 $vbox
1164}
1165
1166sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168
1169 my $row = 0;
1170
1050 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1171 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1173 text => $CFG->{say_command},
1053 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. " 1174 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. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1175 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1177 on_changed => sub {
1057 my ($self, $value) = @_; 1178 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1179 $CFG->{say_command} = $value;
1059 0 1180 0
1060 } 1181 }
1061 ); 1182 );
1062 1183
1063 $vbox->add (new CFClient::UI::Label 1184 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 text => "Server Info", 1185 $table->add (1, $row++, new CFPlus::UI::CheckBox
1065 fontsize => 1.2, 1186 state => $CFG->{show_tips},
1066 padding_y => 8, 1187 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 fg => [1, 1, 0, 1], 1188 on_changed => sub {
1189 my ($self, $value) = @_;
1190 $CFG->{show_tips} = $value;
1191 0
1192 }
1068 ); 1193 );
1069 1194
1070 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1197 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub {
1202 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1204 0
1205 },
1206 );
1071 1207
1072 $vbox 1208 $table
1073} 1209}
1074 1210
1075sub message_window { 1211sub message_window {
1076 my $window = new CFClient::UI::FancyFrame 1212 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1213 name => "message_window",
1078 title => "Messages", 1214 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1215 border_bg => [1, 1, 1, 1],
1080 x => "max", 1216 x => "max",
1081 y => 0, 1217 y => 0,
1082 force_w => $::WIDTH * 0.4, 1218 force_w => $::WIDTH * 0.4,
1083 force_h => $::HEIGHT * 0.5, 1219 force_h => $::HEIGHT * 0.5,
1084 child => (my $vbox = new CFClient::UI::VBox), 1220 child => (my $vbox = new CFPlus::UI::VBox),
1085 has_close_button => 1; 1221 has_close_button => 1;
1086 1222
1087 $vbox->add ($LOGVIEW); 1223 $vbox->add ($LOGVIEW);
1088 1224
1089 $vbox->add (my $input = new CFClient::UI::Entry 1225 $vbox->add (my $input = new CFPlus::UI::Entry
1090 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1226 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1091 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1227 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1092 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1228 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1093 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1229 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1094 on_focus_in => sub { 1230 on_focus_in => sub {
… …
1133 }; 1269 };
1134 1270
1135 $window 1271 $window
1136} 1272}
1137 1273
1138sub open_quit_dialog {
1139 unless ($QUIT_DIALOG) {
1140 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1149 ;
1150
1151 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1152
1153 $vb->add (new CFClient::UI::Label
1154 text => "You should find a savebed and apply it first!",
1155 max_w => $WIDTH * 0.25,
1156 ellipsize => 0,
1157 );
1158 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1159 $hb->add (new CFClient::UI::Button
1160 text => "Ok",
1161 expand => 1,
1162 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163 );
1164 $hb->add (new CFClient::UI::Button
1165 text => "Quit anyway",
1166 expand => 1,
1167 on_activate => sub { exit },
1168 );
1169 }
1170
1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1173}
1174
1175sub autopickup_setup { 1274sub autopickup_setup {
1176 my $table = new CFClient::UI::Table; 1275 my $table = new CFPlus::UI::Table;
1177 1276
1178 for ( 1277 for (
1179 ["General", 0, 0, 1278 ["General", 0, 0,
1180 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1279 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1181 ["Inhibit autopickup" => PICKUP_INHIBIT], 1280 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1195 ["Boots" => PICKUP_BOOTS], 1294 ["Boots" => PICKUP_BOOTS],
1196 ["Gloves" => PICKUP_GLOVES], 1295 ["Gloves" => PICKUP_GLOVES],
1197 ["Cloaks" => PICKUP_CLOAK], 1296 ["Cloaks" => PICKUP_CLOAK],
1198 ], 1297 ],
1199 1298
1200 ["Readables", 2, 2, 1299 ["Readables", 2, 0,
1201 ["Spellbooks" => PICKUP_SPELLBOOK], 1300 ["Spellbooks" => PICKUP_SPELLBOOK],
1202 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1301 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1203 ["Normal Books/Scrolls" => PICKUP_READABLES], 1302 ["Normal Books/Scrolls" => PICKUP_READABLES],
1204 ], 1303 ],
1205 ["Misc", 2, 7, 1304 ["Misc", 2, 5,
1206 ["Food" => PICKUP_FOOD], 1305 ["Food" => PICKUP_FOOD],
1207 ["Drinks" => PICKUP_DRINK], 1306 ["Drinks" => PICKUP_DRINK],
1208 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1307 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1209 ["Keys" => PICKUP_KEY], 1308 ["Keys" => PICKUP_KEY],
1210 ["Magical Items" => PICKUP_MAGICAL], 1309 ["Magical Items" => PICKUP_MAGICAL],
1211 ["Potions" => PICKUP_POTION], 1310 ["Potions" => PICKUP_POTION],
1212 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1311 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1213 ["Ignore cursed" => PICKUP_NOT_CURSED], 1312 ["Ignore cursed" => PICKUP_NOT_CURSED],
1214 ["Jewelery" => PICKUP_JEWELS], 1313 ["Jewelery" => PICKUP_JEWELS],
1314 ["Flesh" => PICKUP_FLESH],
1215 ], 1315 ],
1216 ["Weight/Value ratio", 2, 17] 1316 ["Weight/Value ratio", 2, 17]
1217 ) 1317 )
1218 { 1318 {
1219 my ($title, $x, $y, @bits) = @$_; 1319 my ($title, $x, $y, @bits) = @$_;
1220 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1320 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1221 1321
1222 for (@bits) { 1322 for (@bits) {
1223 ++$y; 1323 ++$y;
1224 1324
1225 my $mask = $_->[1]; 1325 my $mask = $_->[1];
1226 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1326 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1227 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1327 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228 state => $::CFG->{pickup} & $mask, 1328 state => $::CFG->{pickup} & $mask,
1229 on_changed => sub { 1329 on_changed => sub {
1230 my ($box, $value) = @_; 1330 my ($box, $value) = @_;
1231 1331
1232 if ($value) { 1332 if ($value) {
… …
1243 1343
1244 ${$_->[2]} = $checkbox if $_->[2]; 1344 ${$_->[2]} = $checkbox if $_->[2];
1245 } 1345 }
1246 } 1346 }
1247 1347
1248 $table->add (2, 18, new CFClient::UI::ValSlider 1348 $table->add (2, 18, new CFPlus::UI::ValSlider
1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1349 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99", 1350 template => ">= 99",
1251 to_value => sub { ">= " . 5 * $_[0] }, 1351 to_value => sub { ">= " . 5 * $_[0] },
1252 on_changed => sub { 1352 on_changed => sub {
1253 my ($slider, $value) = @_; 1353 my ($slider, $value) = @_;
… …
1256 $::CFG->{pickup} |= int $value 1356 $::CFG->{pickup} |= int $value
1257 if $value; 1357 if $value;
1258 1; 1358 1;
1259 }); 1359 });
1260 1360
1261 $table->add (3, 18, new CFClient::UI::Button 1361 $table->add (3, 18, new CFPlus::UI::Button
1262 text => "set", 1362 text => "set",
1263 on_activate => sub { 1363 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1364 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1365 if defined $::CONN;
1266 0 1366 0
… …
1269 $table 1369 $table
1270} 1370}
1271 1371
1272my %SORT_ORDER = ( 1372my %SORT_ORDER = (
1273 type => undef, 1373 type => undef,
1274 mtime => sub { sort { 1374 mtime => sub {
1375 my $NOW = time;
1376 sort {
1377 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1378 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1379
1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1380 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1276 or $b->{mtime} <=> $a->{mtime} 1381 or $btime <=> $atime
1277 or $a->{type} <=> $b->{type} 1382 or $a->{type} <=> $b->{type}
1383 } @_
1278 } @_ }, 1384 },
1279 weight => sub { sort { 1385 weight => sub { sort {
1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1386 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1281 or $a->{type} <=> $b->{type} 1387 or $a->{type} <=> $b->{type}
1282 } @_ }, 1388 } @_ },
1283); 1389);
1284 1390
1285sub inventory_widget { 1391sub inventory_widget {
1286 my $hb = new CFClient::UI::HBox homogeneous => 1; 1392 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1287 1393
1288 $hb->add (my $vb1 = new CFClient::UI::VBox); 1394 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1289 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1395 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1290 1396
1291 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1397 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1292 1398
1293 use sort 'stable'; 1399 use sort 'stable';
1294 1400
1295 $hb1->add (new CFClient::UI::Selector 1401 $hb1->add (new CFPlus::UI::Selector
1296 value => $::CFG->{inv_sort}, 1402 value => $::CFG->{inv_sort},
1297 options => [ 1403 options => [
1298 [type => "Type/Name"], 1404 [type => "Type/Name"],
1299 [mtime => "Recent/Normal/Locked"], 1405 [mtime => "Recent/Normal/Locked"],
1300 [weight => "Weight/Type"], 1406 [weight => "Weight/Type"],
… …
1302 on_changed => sub { 1408 on_changed => sub {
1303 $::CFG->{inv_sort} = $_[1]; 1409 $::CFG->{inv_sort} = $_[1];
1304 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1410 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1305 }, 1411 },
1306 ); 1412 );
1307 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1413 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1308 #TODO# update to weigh/maxweight 1414 #TODO# update to weigh/maxweight
1309 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1415 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1310 1416
1311 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1417 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312 $sw1->add ($INV = new CFClient::UI::Inventory); 1418 $sw1->add ($INV = new CFPlus::UI::Inventory);
1419 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1313 1420
1314 $hb->add (my $vb2 = new CFClient::UI::VBox); 1421 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1315 1422
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1423 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317 1424
1318 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1425 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319 $sw2->add ($INVR = new CFClient::UI::Inventory); 1426 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1320 1427
1321 # XXX: Call after $INVR = ... because set_opencont sets the items 1428 # XXX: Call after $INVR = ... because set_opencont sets the items
1322 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1429 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1323 1430
1324 $hb 1431 $hb
1325} 1432}
1326 1433
1327sub toggle_player_page { 1434sub toggle_player_page {
… …
1334 $PL_WINDOW->show; 1441 $PL_WINDOW->show;
1335 } 1442 }
1336} 1443}
1337 1444
1338sub player_window { 1445sub player_window {
1339 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1446 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340 x => "center", 1447 x => "center",
1341 y => "center", 1448 y => "center",
1342 force_w => $WIDTH * 9/10, 1449 force_w => $WIDTH * 9/10,
1343 force_h => $HEIGHT * 9/10, 1450 force_h => $HEIGHT * 9/10,
1344 title => "Player", 1451 title => "Player",
… …
1346 has_close_button => 1 1453 has_close_button => 1
1347 ; 1454 ;
1348 1455
1349 my $ntb = 1456 my $ntb =
1350 $PL_NOTEBOOK = 1457 $PL_NOTEBOOK =
1351 new CFClient::UI::Notebook expand => 1, debug => 1; 1458 new CFPlus::UI::Notebook expand => 1, debug => 1;
1352 1459
1353 $ntb->add ( 1460 $ntb->add (
1354 "Statistics (F2)" => $STATS_PAGE = stats_window, 1461 "Statistics (F2)" => $STATS_PAGE = stats_window,
1355 "Shows statistics, where all your Stats and Resistances are shown." 1462 "Shows statistics, where all your Stats and Resistances are shown."
1356 ); 1463 );
1357 $ntb->add ( 1464 $ntb->add (
1358 "Skills (F3)" => $SKILL_PAGE = skill_window, 1465 "Skills (F3)" => $SKILL_PAGE = skill_window,
1359 "Shows all your Skills." 1466 "Shows all your Skills."
1360 ); 1467 );
1361 1468
1362 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1469 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1470 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1364 $ntb->add ( 1471 $ntb->add (
1365 "Spellbook (F4)" => $spellsw, 1472 "Spellbook (F4)" => $spellsw,
1366 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1473 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1367 ); 1474 );
1368 $ntb->add ( 1475 $ntb->add (
… …
1375 1482
1376 $plwin->add ($ntb); 1483 $plwin->add ($ntb);
1377 $plwin 1484 $plwin
1378} 1485}
1379 1486
1380sub update_bindings {
1381 $BIND_UPD_CB->() if $BIND_UPD_CB;
1382}
1383
1384sub keyboard_setup { 1487sub keyboard_setup {
1385 my $binding_list = new CFClient::UI::VBox; 1488 CFPlus::Macro::keyboard_setup
1386
1387 my $refresh;
1388 $refresh = $BIND_UPD_CB = sub {
1389 $binding_list->clear ();
1390
1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395
1396 my $lbl = join "; ", @$cmds;
1397 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1398 $binding_list->add (my $hb = new CFClient::UI::HBox);
1399 $hb->add (new CFClient::UI::Button
1400 text => "delete",
1401 tooltip => "Deletes the binding",
1402 on_activate => sub {
1403 $binding_list->remove ($hb);
1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 0
1406 });
1407
1408 $hb->add (new CFClient::UI::Button
1409 text => "edit",
1410 tooltip => "Edits the binding",
1411 on_activate => sub {
1412 $::BIND_EDITOR->set_binding (
1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1414 sub {
1415 my ($nmod, $nsym, $ncmds) = @_;
1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1418 $refresh->();
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 },
1422 sub {
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 });
1426 $::BIND_EDITOR->show;
1427 $SETUP_DIALOG->hide;
1428 0
1429 });
1430
1431 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1432 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1433 }
1434 }
1435 };
1436
1437 my $vb = new CFClient::UI::VBox;
1438 $vb->add (my $hb = new CFClient::UI::HBox);
1439 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFClient::UI::CheckBox
1441 expand => 1,
1442 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444 on_changed => sub {
1445 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value;
1447 0
1448 });
1449
1450 $vb->add ($binding_list);
1451 $vb->add (my $hb = new CFClient::UI::HBox);
1452
1453 $hb->add (new CFClient::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 CFClient::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} 1489}
1491 1490
1492sub help_window { 1491sub help_window {
1493 my $win = new CFClient::UI::FancyFrame 1492 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1493 x => 'center',
1495 y => 'center', 1494 y => 'center',
1496 z => 2, 1495 z => 4,
1497 name => 'doc_browser', 1496 name => 'doc_browser',
1498 force_w => int $WIDTH * 7/8, 1497 force_w => int $WIDTH * 7/8,
1499 force_h => int $HEIGHT * 7/8, 1498 force_h => int $HEIGHT * 7/8,
1500 title => "Help Browser", 1499 title => "Help Browser",
1501 has_close_button => 1; 1500 has_close_button => 1;
1502 1501
1503 $win->add (my $vbox = new CFClient::UI::VBox); 1502 $win->add (my $vbox = new CFPlus::UI::VBox);
1504 1503
1505 $vbox->add (my $buttons = new CFClient::UI::HBox); 1504 $vbox->add (new CFPlus::UI::FancyFrame
1505 label => "Navigation",
1506 child => (my $buttons = new CFPlus::UI::HBox),
1507 );
1506 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1508 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507 expand => 1, fontsize => 0.8, padding_x => 4); 1509 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508 1510
1509 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1511 my @history;
1510 $buttons->add (my $combo = new CFClient::UI::Selector 1512 my @future;
1511 value => undef, 1513 my $curnode;
1512 options => [ 1514
1513 [intro => "Introduction"], 1515 my $load_node; $load_node = sub {
1514 [manual => "Main Manual"], 1516 my ($node, $para) = @_;
1515 [skill_help => "Skill Reference"], 1517
1516 [command_help => "Command Reference"], 1518 $buttons->clear;
1517 [dmcommand_help => "DM Commands"], 1519
1518 [COPYING => "License Terms"], 1520 $buttons->add (new CFPlus::UI::Button
1519 ], 1521 text => "⇤",
1522 tooltip => "back to the starting page",
1520 on_changed => sub { 1523 on_activate => sub {
1521 my ($self, $pod) = @_; 1524 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1522 1525 unshift @future, @history;
1523 $viewer->clear; 1526 @history = ();
1524 $viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod }); 1527 $load_node->(@{shift @future});
1525 $viewer->set_offset (0);
1526
1527 0 1528 },
1529 );
1530
1531 if (@history) {
1532 $buttons->add (new CFPlus::UI::Button
1533 text => "⋘",
1534 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1535 on_activate => sub {
1536 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1537 $load_node->(@{pop @history});
1538 },
1539 );
1528 }, 1540 }
1529 on_visibility_change => sub { 1541
1530 my ($self, $visible) = @_; 1542 if (@future) {
1531 return unless $visible; 1543 $buttons->add (new CFPlus::UI::Button
1532 return if $self->{value}; 1544 text => "⋙",
1533 $self->set_value ("intro"); 1545 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1546 on_activate => sub {
1547 push @history, [$curnode, $viewer->current_paragraph];
1548 $load_node->(@{shift @future});
1549 },
1534 0 1550 );
1535 }, 1551 }
1552
1553 $buttons->add (new CFPlus::UI::Label text => " ");
1554
1555 my @path = CFPlus::Pod::full_path_of $node;
1556 pop @path; # drop current node
1557
1558 for my $node (@path) {
1559 $buttons->add (new CFPlus::UI::Button
1560 text => $node->{kw}[0],
1561 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1562 on_activate => sub {
1563 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1564 $load_node->($node);
1565 },
1566 );
1567 $buttons->add (new CFPlus::UI::Label text => "/");
1568 }
1569
1570 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1571
1572 $curnode = $node;
1573
1574 $viewer->clear;
1575 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1576 $viewer->scroll_to ($para);
1536 ); 1577 };
1578
1579 $load_node->(CFPlus::Pod::find pod => "mainpage");
1580
1581 $CFPlus::Pod::goto_document = sub {
1582 my (@path) = @_;
1583
1584 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1585
1586 $load_node->((CFPlus::Pod::find @path)[0]);
1587 $win->show;
1588 };
1537 1589
1538 $win 1590 $win
1539} 1591}
1540 1592
1593sub open_string_query {
1594 my ($title, $cb, $txt, $tooltip) = @_;
1595 my $dialog = new CFPlus::UI::Toplevel
1596 x => "center",
1597 y => "center",
1598 z => 50,
1599 force_w => $WIDTH * 4/5,
1600 title => $title;
1601
1602 $dialog->add (
1603 my $e = new CFPlus::UI::Entry
1604 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1605 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1606 tooltip => $tooltip
1607 );
1608
1609 $e->grab_focus;
1610 $e->set_text ($txt) if $txt;
1611 $dialog->show;
1612}
1613
1614sub open_quit_dialog {
1615 unless ($QUIT_DIALOG) {
1616 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1617 x => "center",
1618 y => "center",
1619 z => 50,
1620 title => "Really Quit?",
1621 on_key_down => sub {
1622 my ($dialog, $ev) = @_;
1623 $ev->{sym} == 27 and $dialog->hide;
1624 }
1625 ;
1626
1627 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1628
1629 $vb->add (new CFPlus::UI::Label
1630 text => "You should find a savebed and apply it first!",
1631 max_w => $WIDTH * 0.25,
1632 ellipsize => 0,
1633 );
1634 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1635 $hb->add (new CFPlus::UI::Button
1636 text => "Ok",
1637 expand => 1,
1638 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1639 );
1640 $hb->add (new CFPlus::UI::Button
1641 text => "Quit anyway",
1642 expand => 1,
1643 on_activate => sub { exit },
1644 );
1645 }
1646
1647 $QUIT_DIALOG->show;
1648 $QUIT_DIALOG->grab_focus;
1649}
1650
1651sub show_tip_of_the_day {
1652 # find all tips
1653 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1654
1655 CFPlus::DB::get state => "tip_of_the_day", sub {
1656 my ($todindex) = @_;
1657 $todindex = 0 if $todindex >= @tod;
1658 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1659
1660 # create dialog
1661 my $dialog;
1662
1663 my $close = sub {
1664 $dialog->destroy;
1665 };
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 col_expand => [0, 1]);
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 };
1703}
1704
1541sub sdl_init { 1705sub sdl_init {
1542 CFClient::SDL_Init 1706 CFPlus::SDL_Init
1543 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
1544} 1708}
1545 1709
1546sub video_init { 1710sub video_init {
1547 sdl_init; 1711 sdl_init;
… …
1552 1716
1553 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1717 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1554 $FULLSCREEN = $CFG->{fullscreen}; 1718 $FULLSCREEN = $CFG->{fullscreen};
1555 $FAST = $CFG->{fast}; 1719 $FAST = $CFG->{fast};
1556 1720
1557 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1721 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1558 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1722 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1559 1723
1560 $SDL_ACTIVE = 1; 1724 $SDL_ACTIVE = 1;
1561 $LAST_REFRESH = time - 0.01; 1725 $LAST_REFRESH = time - 0.01;
1562 1726
1563 CFClient::OpenGL::init; 1727 CFPlus::OpenGL::init;
1564 1728
1565 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1729 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1566 1730
1567 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1731 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1568 1732
1569 ############################################################################# 1733 #############################################################################
1570 1734
1571 if ($DEBUG_STATUS) { 1735 if ($DEBUG_STATUS) {
1572 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1736 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1573 } else { 1737 } else {
1574 # create the widgets 1738 # create the widgets
1575 1739
1576 $DEBUG_STATUS = new CFClient::UI::Label 1740 $DEBUG_STATUS = new CFPlus::UI::Label
1577 padding => 0, 1741 padding => 0,
1578 z => 100, 1742 z => 100,
1579 force_x => "max", 1743 force_x => "max",
1580 force_y => 0; 1744 force_y => 0;
1581 $DEBUG_STATUS->show; 1745 $DEBUG_STATUS->show;
1582 1746
1583 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1584
1585 $STATUSBOX = new CFClient::UI::Statusbox; 1747 $STATUSBOX = new CFPlus::UI::Statusbox;
1586 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1748 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1587 1749
1588 (new CFClient::UI::Frame 1750 (new CFPlus::UI::Frame
1589 bg => [0, 0, 0, 0.4], 1751 bg => [0, 0, 0, 0.4],
1590 force_x => 0, 1752 force_x => 0,
1591 force_y => "max", 1753 force_y => "max",
1592 child => $STATUSBOX, 1754 child => $STATUSBOX,
1593 )->show; 1755 )->show;
1594 1756
1595 CFClient::UI::FancyFrame->new ( 1757 CFPlus::UI::Toplevel->new (
1596 title => "Map", 1758 title => "Map",
1597 name => "mapmap", 1759 name => "mapmap",
1598 x => 0, 1760 x => 0,
1599 y => $FONTSIZE + 8, 1761 y => $FONTSIZE + 8,
1600 border_bg => [1, 1, 1, 192/255], 1762 border_bg => [1, 1, 1, 192/255],
1601 bg => [1, 1, 1, 0], 1763 bg => [1, 1, 1, 0],
1602 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1764 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1603 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1765 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1604 ), 1766 ),
1605 )->show; 1767 )->show;
1606 1768
1607 $MAPWIDGET = new CFClient::MapWidget; 1769 $MAPWIDGET = new CFPlus::MapWidget;
1608 $MAPWIDGET->connect (activate_console => sub { 1770 $MAPWIDGET->connect (activate_console => sub {
1609 my ($mapwidget, $preset) = @_; 1771 my ($mapwidget, $preset) = @_;
1610 1772
1611 if ($CONSOLE) { 1773 if ($CONSOLE) {
1612 $CONSOLE->{input}->{auto_activated} = 1; 1774 $CONSOLE->{input}->{auto_activated} = 1;
… …
1618 } 1780 }
1619 }); 1781 });
1620 $MAPWIDGET->show; 1782 $MAPWIDGET->show;
1621 $MAPWIDGET->grab_focus; 1783 $MAPWIDGET->grab_focus;
1622 1784
1623 $LOGVIEW = new CFClient::UI::TextScroller 1785 $LOGVIEW = new CFPlus::UI::TextScroller
1624 expand => 1, 1786 expand => 1,
1625 font => $FONT_FIXED, 1787 font => $FONT_FIXED,
1626 fontsize => $::CFG->{log_fontsize}, 1788 fontsize => $::CFG->{log_fontsize},
1627 indent => -4, 1789 indent => -4,
1628 can_hover => 1, 1790 can_hover => 1,
1629 can_events => 1, 1791 can_events => 1,
1792 max_par => $CFG->{logview_max_par},
1630 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1631 ; 1794 ;
1632 1795
1633 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1634 title => "Setup", 1797 title => "Setup",
1635 name => "setup_dialog", 1798 name => "setup_dialog",
1636 x => 'center', 1799 x => 'center',
1637 y => 'center', 1800 y => 'center',
1638 z => 2, 1801 z => 2,
… …
1641 has_close_button => 1, 1804 has_close_button => 1,
1642 ; 1805 ;
1643 1806
1644 $METASERVER = metaserver_dialog; 1807 $METASERVER = metaserver_dialog;
1645 1808
1646 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1809 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1647 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1810 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1648 1811
1649 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1812 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1650 "Configure the server to play on, your username, password and other server-related options."); 1813 "Configure the server to play on, your username, password and other server-related options.");
1814 $SETUP_NOTEBOOK->add (Client => client_setup,
1815 "Configure various client-specific settings.");
1651 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1652 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1653 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1654 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1819 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1655 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1820 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1662 . "After pressing the combo the binding will be saved automatically and the " 1827 . "After pressing the combo the binding will be saved automatically and the "
1663 . "binding editor closes"); 1828 . "binding editor closes");
1664 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1829 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1665 "Some debuggin' options. Do not ask."); 1830 "Some debuggin' options. Do not ask.");
1666 1831
1667 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1832 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1668 1833
1669 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1834 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1670 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1835 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1671 1836
1672 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1837 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1673 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1838 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1674 1839
1675 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 1840 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
1676 1841
1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1842 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1678 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1843 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1679 1844
1680 $BUTTONBAR->add (new CFClient::UI::Button 1845 $BUTTONBAR->add (new CFPlus::UI::Button
1681 text => "Save Config", 1846 text => "Save Config",
1682 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1847 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1683 on_activate => sub { 1848 on_activate => sub {
1684 $::CFG->{layout} = CFClient::UI::get_layout; 1849 $::CFG->{layout} = CFPlus::UI::get_layout;
1685 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1850 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1686 status "Configuration Saved"; 1851 status "Configuration Saved";
1687 0 1852 0
1688 }, 1853 },
1689 ); 1854 );
1690 1855
1691 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1856 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1692 tooltip => "View Documentation"); 1857 tooltip => "View Documentation");
1693 1858
1859
1694 $BUTTONBAR->add (new CFClient::UI::Button 1860 $BUTTONBAR->add (new CFPlus::UI::Button
1695 text => "Quit", 1861 text => "Quit",
1696 tooltip => "Terminates the program", 1862 tooltip => "Terminates the program",
1697 on_activate => sub { 1863 on_activate => sub {
1698 if ($CONN) { 1864 if ($CONN) {
1699 open_quit_dialog; 1865 open_quit_dialog;
… …
1709 } 1875 }
1710 1876
1711 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1877 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1712} 1878}
1713 1879
1880sub setup_build_button {
1881 my ($enabled) = @_;
1882 if ($enabled) {
1883 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1884 $BUILD_BUTTON ||= new CFPlus::UI::Button
1885 text => "Build",
1886 tooltip => "Opens the ingame builder",
1887 on_activate => sub {
1888 if ($CONN) {
1889 $CONN->send_ext_req (builder_player_items => sub {
1890 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1891 });
1892 }
1893 0
1894 };
1895 $BUTTONBAR->add ($BUILD_BUTTON);
1896 } else {
1897 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1898 }
1899}
1900
1901sub open_ingame_editor {
1902 my ($msg) = @_;
1903
1904 my $win = new CFPlus::UI::Toplevel
1905 x => 0,
1906 y => 'center',
1907 z => 4,
1908 name => 'builder_window',
1909 force_w => int $WIDTH * 1/4,
1910 force_h => int $HEIGHT * 3/4,
1911 title => "In game builder",
1912 has_close_button => 1;
1913
1914 my $r = new CFPlus::UI::ScrolledWindow (
1915 expand => 1,
1916 scroll_y => 1
1917 );
1918 $r->add (my $vb = new CFPlus::UI::VBox);
1919 $win->add ($r);
1920
1921
1922 $vb->add (
1923 new CFPlus::UI::Button
1924 text => "Disable build mode",
1925 on_activate => sub { $::IN_BUILD_MODE = undef }
1926 );
1927 $vb->add (
1928 new CFPlus::UI::Button
1929 text => "ERASE",
1930 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1931 );
1932
1933 for my $itemarchname (
1934 sort {
1935 $msg->{items}->{$a}->{build_arch_name}
1936 cmp $msg->{items}->{$b}->{build_arch_name}
1937 } keys %{$msg->{items}}
1938 ) {
1939 my $info = $msg->{items}->{$itemarchname};
1940 $vb->add (
1941 new CFPlus::UI::Button text => $info->{build_arch_name},
1942 on_activate => sub {
1943 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1944
1945 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1946 build_mode_query_arch_info ();
1947 }
1948 }
1949 );
1950 }
1951
1952 $win->show;
1953}
1954
1955sub build_mode_query_arch_info {
1956 my ($iteminfo) = $::IN_BUILD_MODE;
1957 my $itemarchname = $iteminfo->{item};
1958 my $info = $iteminfo->{info};
1959
1960 my $dialog = new CFPlus::UI::Toplevel
1961 x => "center",
1962 y => "center",
1963 z => 50,
1964 force_w => int $WIDTH * 1/2,
1965 title => "Enter information for placement of '$itemarchname'",
1966 has_close_button => 1;
1967
1968 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1969
1970 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1971 my $row = 0;
1972 if ($info->{has_name}) {
1973 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1974 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1975 }
1976 if ($info->{has_text}) {
1977 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1978 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1979 }
1980 if ($info->{has_connection}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1982 $table->add (1, $row++,
1983 new CFPlus::UI::Entry
1984 expand => 1,
1985 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1986 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1987 );
1988 }
1989
1990 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1991 $hb->add (new CFPlus::UI::Button
1992 text => "Close",
1993 expand => 1,
1994 on_activate => sub { $dialog->hide; 0 },
1995 );
1996 $dialog->show;
1997}
1998
1714sub video_shutdown { 1999sub video_shutdown {
1715 CFClient::OpenGL::shutdown; 2000 CFPlus::OpenGL::shutdown;
1716 2001
1717 undef $SDL_ACTIVE; 2002 undef $SDL_ACTIVE;
1718} 2003}
1719 2004
1720my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 2005my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1728 2013
1729sub audio_music_finished { 2014sub audio_music_finished {
1730 return unless $CFG->{bgm_enable}; 2015 return unless $CFG->{bgm_enable};
1731 2016
1732 # TODO: hack, do play loop and mood music 2017 # TODO: hack, do play loop and mood music
1733 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 2018 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1734 $bgmusic->play (0); 2019 $bgmusic->play (0);
1735 2020
1736 push @bgmusic, shift @bgmusic; 2021 push @bgmusic, shift @bgmusic;
1737} 2022}
1738 2023
1739sub audio_init { 2024sub audio_init {
1740 if ($CFG->{audio_enable}) { 2025 if ($CFG->{audio_enable}) {
1741 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1742 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2027 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1743 2028
1744 unless ($SDL_MIXER) { 2029 unless ($SDL_MIXER) {
1745 status "Unable to open sound device: there will be no sound"; 2030 status "Unable to open sound device: there will be no sound";
1746 return; 2031 return;
1747 } 2032 }
1748 2033
1749 CFClient::Mix_AllocateChannels 8; 2034 CFPlus::Mix_AllocateChannels 8;
1750 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2035 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1751 2036
1752 audio_music_finished; 2037 audio_music_finished;
1753 2038
2039 local $_;
1754 while (<$fh>) { 2040 while (<$fh>) {
1755 next if /^\s*#/; 2041 next if /^\s*#/;
1756 next if /^\s*$/; 2042 next if /^\s*$/;
1757 2043
1758 my ($file, $volume, $event) = split /\s+/, $_, 3; 2044 my ($file, $volume, $event) = split /\s+/, $_, 3;
1759 2045
1760 push @SOUNDS, "$volume,$file"; 2046 push @SOUNDS, "$volume,$file";
1761 2047
1762 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2048 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1763 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 2049 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1764 $chunk->volume ($volume * 128 / 100); 2050 $chunk->volume ($volume * 128 / 100);
1765 $chunk 2051 $chunk
1766 }; 2052 };
1767 } 2053 }
1768 } else { 2054 } else {
… …
1770 } 2056 }
1771 } 2057 }
1772} 2058}
1773 2059
1774sub audio_shutdown { 2060sub audio_shutdown {
1775 CFClient::Mix_CloseAudio if $SDL_MIXER; 2061 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1776 undef $SDL_MIXER; 2062 undef $SDL_MIXER;
1777 @SOUNDS = (); 2063 @SOUNDS = ();
1778 %AUDIO_CHUNKS = (); 2064 %AUDIO_CHUNKS = ();
1779} 2065}
1780 2066
… …
1787 2073
1788sub force_refresh { 2074sub force_refresh {
1789 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2075 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1790 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2076 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1791 2077
1792 $CFClient::UI::ROOT->draw; 2078 $CFPlus::UI::ROOT->draw;
1793 2079
1794 $WANT_REFRESH = 0; 2080 $WANT_REFRESH = 0;
1795 $CAN_REFRESH = 0; 2081 $CAN_REFRESH = 0;
1796 $LAST_REFRESH = $NOW; 2082 $LAST_REFRESH = $NOW;
1797 2083
1798 CFClient::SDL_GL_SwapBuffers; 2084 CFPlus::SDL_GL_SwapBuffers;
1799} 2085}
1800 2086
1801my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2087my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1802 $NOW = time; 2088 $NOW = time;
1803 2089
1804 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2090 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1805 for CFClient::SDL_PollEvent; 2091 for CFPlus::SDL_PollEvent;
1806 2092
1807 if (%animate_object) { 2093 if (%animate_object) {
1808 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2094 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1809 $WANT_REFRESH++; 2095 $WANT_REFRESH++;
1810 } 2096 }
… …
1834 $CONN->face_prefetch 2120 $CONN->face_prefetch
1835 if $CONN; 2121 if $CONN;
1836}); 2122});
1837 2123
1838%SDL_CB = ( 2124%SDL_CB = (
1839 CFClient::SDL_QUIT => sub { 2125 CFPlus::SDL_QUIT => sub {
1840 Event::unloop -1; 2126 exit;
1841 }, 2127 },
1842 CFClient::SDL_VIDEORESIZE => sub { 2128 CFPlus::SDL_VIDEORESIZE => sub {
1843 }, 2129 },
1844 CFClient::SDL_VIDEOEXPOSE => sub { 2130 CFPlus::SDL_VIDEOEXPOSE => sub {
1845 CFClient::UI::full_refresh; 2131 CFPlus::UI::full_refresh;
1846 }, 2132 },
1847 CFClient::SDL_ACTIVEEVENT => sub { 2133 CFPlus::SDL_ACTIVEEVENT => sub {
1848# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2134# not useful, as APPACTIVE include sonly iconified state, not unmapped
2135# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2136# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2137# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2138# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1849 }, 2139 },
1850 CFClient::SDL_KEYDOWN => sub { 2140 CFPlus::SDL_KEYDOWN => sub {
1851 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2141 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1852 # alt-enter 2142 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle; 2143 $FULLSCREEN_ENABLE->toggle;
1854 video_shutdown; 2144 video_shutdown;
1855 video_init; 2145 video_init;
1856 } else { 2146 } else {
1857 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2147 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1858 } 2148 }
1859 }, 2149 },
1860 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2150 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1861 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2151 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1862 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2152 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1863 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2153 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1864 CFClient::SDL_USEREVENT => sub { 2154 CFPlus::SDL_USEREVENT => sub {
1865 if ($_[0]{code} == 1) { 2155 if ($_[0]{code} == 1) {
1866 audio_channel_finished $_[0]{data1}; 2156 audio_channel_finished $_[0]{data1};
1867 } elsif ($_[0]{code} == 0) { 2157 } elsif ($_[0]{code} == 0) {
1868 audio_music_finished; 2158 audio_music_finished;
1869 } 2159 }
… …
1873############################################################################# 2163#############################################################################
1874 2164
1875$SIG{INT} = $SIG{TERM} = sub { exit }; 2165$SIG{INT} = $SIG{TERM} = sub { exit };
1876 2166
1877{ 2167{
1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2168 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2169 CFPlus::DB::Server::run;
2170
1879 CFClient::UI::set_layout ($::CFG->{layout}); 2171 CFPlus::UI::set_layout ($::CFG->{layout});
1880 2172
1881 my %DEF_CFG = ( 2173 my %DEF_CFG = (
1882 sdl_mode => 0, 2174 sdl_mode => 0,
1883 width => 640, 2175 width => 640,
1884 height => 480, 2176 height => 480,
1885 fullscreen => 0, 2177 fullscreen => 0,
1886 fast => 0, 2178 fast => 0,
1887 map_scale => 1, 2179 map_scale => 1,
1888 fow_enable => 1, 2180 fow_enable => 1,
1889 fow_intensity => 0.45, 2181 fow_intensity => 0.45,
1890 fow_smooth => 0, 2182 fow_smooth => 0,
2183 map_smoothing => 1,
1891 gui_fontsize => 1, 2184 gui_fontsize => 1,
1892 log_fontsize => 0.7, 2185 log_fontsize => 0.7,
1893 gauge_fontsize => 1, 2186 gauge_fontsize => 1,
1894 gauge_size => 0.35, 2187 gauge_size => 0.35,
1895 stat_fontsize => 0.7, 2188 stat_fontsize => 0.7,
1896 mapsize => 100, 2189 mapsize => 100,
1897 say_command => 'say', 2190 say_command => 'chat',
1898 audio_enable => 1, 2191 audio_enable => 1,
1899 bgm_enable => 1, 2192 bgm_enable => 1,
1900 bgm_volume => 0.25, 2193 bgm_volume => 0.25,
1901 face_prefetch => 0, 2194 face_prefetch => 0,
1902 output_sync => 1, 2195 output_sync => 1,
1903 output_count => 1, 2196 output_count => 1,
2197 output_rate => "",
1904 pickup => 0, 2198 pickup => 0,
1905 inv_sort => "mtime", 2199 inv_sort => "mtime",
1906 default => "profile", # default profile 2200 default => "profile", # default profile
2201 show_tips => 1,
2202 logview_max_par => 1000,
1907 ); 2203 );
1908 2204
1909 while (my ($k, $v) = each %DEF_CFG) { 2205 while (my ($k, $v) = each %DEF_CFG) {
1910 $CFG->{$k} = $v unless exists $CFG->{$k}; 2206 $CFG->{$k} = $v unless exists $CFG->{$k};
1911 } 2207 }
1912 2208
1913 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2209 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2210 $PROFILE = $CFG->{profile}{default};
2211
2212 # convert old bindings (only default profile matters)
2213 if (my $bindings = delete $PROFILE->{bindings}) {
2214 while (my ($mod, $syms) = each %$bindings) {
2215 while (my ($sym, $cmds) = each %$syms) {
2216 push @{ $PROFILE->{macro} }, {
2217 accelkey => [$mod*1, $sym*1],
2218 action => $cmds,
2219 };
2220 }
2221 }
2222 }
1914 2223
1915 sdl_init; 2224 sdl_init;
1916 2225
1917 @SDL_MODES = reverse 2226 @SDL_MODES = reverse
1918 grep $_->[0] >= 640 && $_->[1] >= 480, 2227 grep $_->[0] >= 640 && $_->[1] >= 480,
1919 CFClient::SDL_ListModes; 2228 CFPlus::SDL_ListModes;
1920 2229
1921 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2230 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1922 2231
1923 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2232 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1924 2233
1925 { 2234 {
1926 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2235 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1927 DejaVuSans.ttf 2236 DejaVuSans.ttf
1928 DejaVuSansMono.ttf 2237 DejaVuSansMono.ttf
1929 DejaVuSans-Bold.ttf 2238 DejaVuSans-Bold.ttf
1930 DejaVuSansMono-Bold.ttf 2239 DejaVuSansMono-Bold.ttf
1931 DejaVuSans-Oblique.ttf 2240 DejaVuSans-Oblique.ttf
1932 DejaVuSansMono-Oblique.ttf 2241 DejaVuSansMono-Oblique.ttf
1933 DejaVuSans-BoldOblique.ttf 2242 DejaVuSans-BoldOblique.ttf
1934 DejaVuSansMono-BoldOblique.ttf 2243 DejaVuSansMono-BoldOblique.ttf
1935 ); 2244 );
1936 2245
1937 CFClient::add_font $_ for @fonts; 2246 CFPlus::add_font $_ for @fonts;
1938 2247
1939 CFClient::pango_init; 2248 CFPlus::pango_init;
1940 2249
1941 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2250 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1942 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2251 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1943 2252
1944 $FONT_PROP->make_default; 2253 $FONT_PROP->make_default;
1945 } 2254 }
1946 2255
1947# compare mono (ft) vs. rgba (cairo) 2256# compare mono (ft) vs. rgba (cairo)
1948# ft - 1.8s, cairo 3s, even in alpha-only mode 2257# ft - 1.8s, cairo 3s, even in alpha-only mode
1949# for my $rgba (0..1) { 2258# for my $rgba (0..1) {
1950# my $t1 = Time::HiRes::time; 2259# my $t1 = Time::HiRes::time;
1951# for (1..1000) { 2260# for (1..1000) {
1952# my $layout = CFClient::Layout->new ($rgba); 2261# my $layout = CFPlus::Layout->new ($rgba);
1953# $layout->set_text ("hallo" x 100); 2262# $layout->set_text ("hallo" x 100);
1954# $layout->render; 2263# $layout->render;
1955# } 2264# }
1956# my $t2 = Time::HiRes::time; 2265# my $t2 = Time::HiRes::time;
1957# warn $t2-$t1; 2266# warn $t2-$t1;
1958# } 2267# }
1959 2268
2269 $startup_done->();
2270
1960 video_init; 2271 video_init;
1961 audio_init; 2272 audio_init;
1962} 2273}
1963 2274
2275show_tip_of_the_day if $CFG->{show_tips};
2276
1964Event::loop; 2277Event::loop;
1965#CFClient::SDL_Quit; 2278#CFPlus::SDL_Quit;
1966#CFClient::_exit 0; 2279#CFPlus::_exit 0;
1967 2280
1968END { CFClient::SDL_Quit } 2281END {
2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop;
2284}
1969 2285
1970=head1 NAME 2286=head1 NAME
1971 2287
1972cfplus - A Crossfire+ and Crossfire game client 2288cfplus - A Crossfire+ and Crossfire game client
1973 2289

Diff Legend

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