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

Diff Legend

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