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.112 by root, Sun Aug 13 20:01:14 2006 UTC

32use Crossfire; 32use Crossfire;
33use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
34 34
35use Compress::LZF; 35use Compress::LZF;
36 36
37use CFClient; 37use CFPlus;
38use CFClient::OpenGL (); 38use CFPlus::OpenGL ();
39use CFClient::Protocol; 39use CFPlus::Protocol;
40use CFClient::UI; 40use CFPlus::UI;
41use CFClient::Pod; 41use CFPlus::Pod;
42use CFClient::BindingEditor; 42use CFPlus::BindingEditor;
43use CFClient::MapWidget; 43use CFPlus::MapWidget;
44 44
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
47 47
48$Event::Eval = 0; 48$Event::Eval = 0;
49$Event::DIED = sub { 49$Event::DIED = sub {
50 # TODO: display dialog box or so 50 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFClient::error $_[1]; 52 CFPlus::error $_[1];
53}; 53};
54 54
55$SIG{__DIE__} = sub { 55$SIG{__DIE__} = sub {
56 return if CFClient::in_destruct; 56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0]; 57 Carp::cluck $_[0];
58 CFClient::error $_[0]; 58 CFPlus::error $_[0];
59 return;#d# 59 return;#d#
60 #return unless defined $^S && !$^S; 60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]); 61 $Event::DIED->(undef, $_[0]);
62}; 62};
63 63
139our $BIND_UPD_CB; 139our $BIND_UPD_CB;
140 140
141our $PICKUP_CFG; 141our $PICKUP_CFG;
142 142
143sub status { 143sub status {
144 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 145}
146 146
147sub debug { 147sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
149} 149}
155 155
156# server query dialog 156# server query dialog
157sub server_query { 157sub server_query {
158 my ($conn, $flags, $prompt) = @_; 158 my ($conn, $flags, $prompt) = @_;
159 159
160 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
161 x => "center", 161 x => "center",
162 y => "center", 162 y => "center",
163 title => "Server Query", 163 title => "Server Query",
164 child => my $vbox = new CFClient::UI::VBox, 164 child => my $vbox = new CFPlus::UI::VBox,
165 ; 165 ;
166 166
167 my @dialog = my $label = new CFClient::UI::Label 167 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 168 max_w => $::WIDTH * 0.4,
169 ellipsise => 0, 169 ellipsise => 0,
170 text => $prompt; 170 text => $prompt;
171 171
172 if ($flags & CS_QUERY_YESNO) { 172 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFClient::UI::HBox; 173 push @dialog, my $hbox = new CFPlus::UI::HBox;
174 174
175 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFPlus::UI::Button
176 text => "No", 176 text => "No",
177 on_activate => sub { 177 on_activate => sub {
178 $conn->send ("reply n"); 178 $conn->send ("reply n");
179 $dialog->destroy; 179 $dialog->destroy;
180 0 180 0
181 } 181 }
182 ); 182 );
183 $hbox->add (new CFClient::UI::Button 183 $hbox->add (new CFPlus::UI::Button
184 text => "Yes", 184 text => "Yes",
185 on_activate => sub { 185 on_activate => sub {
186 $conn->send ("reply y"); 186 $conn->send ("reply y");
187 destroy_query_dialog $conn; 187 destroy_query_dialog $conn;
188 0 188 0
190 ); 190 );
191 191
192 $dialog->grab_focus; 192 $dialog->grab_focus;
193 193
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 194 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 195 $dialog->{tooltip} = "#charcreation_focus";
196 196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
199 199
200 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0, 202 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
204 204
205 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFPlus::UI::Table;
206 206
207 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 208 text => "Next Race",
209 on_activate => sub { 209 on_activate => sub {
210 $conn->send ("reply n"); 210 $conn->send ("reply n");
211 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
212 0 212 0
213 }, 213 },
214 ); 214 );
215 $table->add (2, 0, new CFClient::UI::Button 215 $table->add (2, 0, new CFPlus::UI::Button
216 text => "Accept", 216 text => "Accept",
217 on_activate => sub { 217 on_activate => sub {
218 $conn->send ("reply d"); 218 $conn->send ("reply d");
219 destroy_query_dialog $conn; 219 destroy_query_dialog $conn;
220 0 220 0
221 }, 221 },
222 ); 222 );
223 223
224 unshift @dialog, new CFClient::UI::Label 224 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 226 ellipsise => 0,
227 markup => 227 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 ; 228 ;
236 229
237 } elsif ($prompt =~ /roll new stats/) { 230 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 231 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 232 $conn->send ("reply $stat");
242 } 235 }
243 236
244 $STATS_PAGE->show; 237 $STATS_PAGE->show;
245 $MESSAGE_WINDOW->hide; 238 $MESSAGE_WINDOW->hide;
246 239
247 unshift @dialog, new CFClient::UI::Label 240 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 241 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 242 ellipsise => 0,
250 markup => "\nOr use your keyboard and the text entry below:\n"; 243 markup => "\nOr use your keyboard and the text entry below:\n";
251 244
252 unshift @dialog, my $table = new CFClient::UI::Table; 245 unshift @dialog, my $table = new CFPlus::UI::Table;
253 246
254 # left: re-roll 247 # left: re-roll
255 $table->add (0, 0, new CFClient::UI::Button 248 $table->add (0, 0, new CFPlus::UI::Button
256 text => "Roll Again", 249 text => "Roll Again",
257 on_activate => sub { 250 on_activate => sub {
258 $conn->send ("reply y"); 251 $conn->send ("reply y");
259 destroy_query_dialog $conn; 252 destroy_query_dialog $conn;
260 0 253 0
261 }, 254 },
262 ); 255 );
263 256
264 # center: swap stats 257 # center: swap stats
265 my ($sw1, $sw2) = map +(new CFClient::UI::Selector 258 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266 expand => 1, 259 expand => 1,
267 value => $_, 260 value => $_,
268 options => [ 261 options => [
269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 262 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 263 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276 ], 269 ],
277 ), 1 .. 2; 270 ), 1 .. 2;
278 271
279 $table->add (2, 0, new CFClient::UI::Button 272 $table->add (2, 0, new CFPlus::UI::Button
280 text => "Swap Stats", 273 text => "Swap Stats",
281 on_activate => sub { 274 on_activate => sub {
282 $conn->{stat_change_with} = $sw2->{value}; 275 $conn->{stat_change_with} = $sw2->{value};
283 $conn->send ("reply $sw1->{value}"); 276 $conn->send ("reply $sw1->{value}");
284 destroy_query_dialog $conn; 277 destroy_query_dialog $conn;
285 0 278 0
286 }, 279 },
287 ); 280 );
288 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289 282
290 # right: accept 283 # right: accept
291 $table->add (4, 0, new CFClient::UI::Button 284 $table->add (4, 0, new CFPlus::UI::Button
292 text => "Accept", 285 text => "Accept",
293 on_activate => sub { 286 on_activate => sub {
294 $conn->send ("reply n"); 287 $conn->send ("reply n");
295 $STATS_PAGE->hide; 288 $STATS_PAGE->hide;
296 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
297 0 290 0
298 }, 291 },
299 ); 292 );
300 293
301 unshift @dialog, my $hbox = new CFClient::UI::HBox; 294 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302 for ( 295 for (
303 [Str => CS_STAT_STR], 296 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX], 297 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON], 298 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT], 299 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS], 300 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW], 301 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA], 302 [Cha => CS_STAT_CHA],
310 ) { 303 ) {
311 my ($name, $id) = @$_; 304 my ($name, $id) = @$_;
312 $hbox->add (new CFClient::UI::Label 305 $hbox->add (new CFPlus::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 306 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 307 align => 0,
315 expand => 1, 308 expand => 1,
316 can_events => 1, 309 can_events => 1,
317 can_hover => 1, 310 can_hover => 1,
318 tooltip => $CFClient::STAT_TOOLTIP{$name}, 311 tooltip => "#stat_$name",
319 ); 312 );
320 } 313 }
321 314
322 unshift @dialog, new CFClient::UI::Label 315 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 316 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 317 ellipsise => 0,
325 markup => 318 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 ; 319 ;
332 } 320 }
333 321
334 push @dialog, my $entry = new CFClient::UI::Entry 322 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 323 on_changed => sub {
336 $conn->send ("reply $_[1]"); 324 $conn->send ("reply $_[1]");
337 destroy_query_dialog $conn; 325 destroy_query_dialog $conn;
338 0 326 0
339 }, 327 },
342 $entry->grab_focus; 330 $entry->grab_focus;
343 331
344 } else { 332 } else {
345 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 333 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
346 334
347 push @dialog, my $entry = new CFClient::UI::Entry 335 push @dialog, my $entry = new CFPlus::UI::Entry
348 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 336 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
349 on_activate => sub { 337 on_activate => sub {
350 $conn->send ("reply $_[1]"); 338 $conn->send ("reply $_[1]");
351 destroy_query_dialog $conn; 339 destroy_query_dialog $conn;
352 0 340 0
368 356
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 358
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
372 360
373 $MAP = new CFClient::Map $mapsize, $mapsize; 361 $MAP = new CFPlus::Map $mapsize, $mapsize;
374 362
375 $CONN = eval { 363 $CONN = eval {
376 new CFClient::Protocol 364 new CFPlus::Protocol
377 host => $host, 365 host => $host,
378 port => $port || 13327, 366 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 367 user => $CFG->{profile}{default}{user},
380 pass => $CFG->{profile}{default}{password}, 368 pass => $CFG->{profile}{default}{password},
381 mapw => $mapsize, 369 mapw => $mapsize,
400 $chunk->play; 388 $chunk->play;
401 }, 389 },
402 }; 390 };
403 391
404 if ($CONN) { 392 if ($CONN) {
405 CFClient::lowdelay fileno $CONN->{fh}; 393 CFPlus::lowdelay fileno $CONN->{fh};
406 394
407 status "login successful"; 395 status "login successful";
408 } else { 396 } else {
409 status "unable to connect"; 397 status "unable to connect";
410 stop_game(); 398 stop_game();
428 416
429 undef $MAP; 417 undef $MAP;
430} 418}
431 419
432sub graphics_setup { 420sub graphics_setup {
433 my $vbox = new CFClient::UI::VBox; 421 my $vbox = new CFPlus::UI::VBox;
434 422
435 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436 424
437 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 425 $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); 426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
439 427
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]); 428 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
441 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
442 430
443 $mode_slider->connect (changed => sub { 431 $mode_slider->connect (changed => sub {
444 my ($self, $value) = @_; 432 my ($self, $value) = @_;
445 433
446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
448 }); 436 });
449 $mode_slider->emit (changed => $mode_slider->{range}[0]); 437 $mode_slider->emit (changed => $mode_slider->{range}[0]);
450 438
451 my $row = 1; 439 my $row = 1;
452 440
453 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 441 $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 442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455 state => $CFG->{fullscreen}, 443 state => $CFG->{fullscreen},
456 tooltip => "Bring the client into fullscreen mode.", 444 tooltip => "Bring the client into fullscreen mode.",
457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
458 ); 446 );
459 447
460 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
461 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFPlus::UI::CheckBox
462 state => $CFG->{fast}, 450 state => $CFG->{fast},
463 tooltip => "Lower the visual quality considerably to speed up rendering.", 451 tooltip => "Lower the visual quality considerably to speed up rendering.",
464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465 ); 453 );
466 454
467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468 $table->add (1, $row++, new CFClient::UI::Slider 456 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
472 ); 460 );
473 461
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 462 $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 463 $table->add (1, $row++, new CFPlus::UI::CheckBox
476 state => $CFG->{fow_enable}, 464 state => $CFG->{fow_enable},
477 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 465 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 } 466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
479 ); 467 );
480 468
481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
482 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFPlus::UI::Slider
483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 471 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.", 472 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 } 473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
486 ); 474 );
487 475
488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
489 $table->add (1, $row++, new CFClient::UI::CheckBox 477 $table->add (1, $row++, new CFPlus::UI::CheckBox
490 state => $CFG->{fow_smooth}, 478 state => $CFG->{fow_smooth},
491 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
492 on_changed => sub { 480 on_changed => sub {
493 my ($self, $value) = @_; 481 my ($self, $value) = @_;
494 $CFG->{fow_smooth} = $value; 482 $CFG->{fow_smooth} = $value;
495 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
496 0 484 0
497 } 485 }
498 ); 486 );
499 487
500 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
501 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 490 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.", 491 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 }, 492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505 ); 493 );
506 494
507 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFPlus::UI::Slider
509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 497 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.", 498 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 }, 499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
512 ); 500 );
513 501
514 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
515 $table->add (1, $row++, new CFClient::UI::Slider 503 $table->add (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 504 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.", 505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
518 on_changed => sub { 506 on_changed => sub {
519 $CFG->{gauge_fontsize} = $_[1]; 507 $CFG->{gauge_fontsize} = $_[1];
520 &set_gauge_window_fontsize; 508 &set_gauge_window_fontsize;
521 0 509 0
522 } 510 }
523 ); 511 );
524 512
525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
526 $table->add (1, $row++, new CFClient::UI::Slider 514 $table->add (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{gauge_size}, 0.2, 0.8], 515 range => [$CFG->{gauge_size}, 0.2, 0.8],
528 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529 on_changed => sub { 517 on_changed => sub {
530 $CFG->{gauge_size} = $_[1]; 518 $CFG->{gauge_size} = $_[1];
531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532 0 520 0
533 } 521 }
534 ); 522 );
535 523
536 $table->add (1, $row++, new CFClient::UI::Button 524 $table->add (1, $row++, new CFPlus::UI::Button
537 expand => 1, align => 0, text => "Apply", 525 expand => 1, align => 0, text => "Apply",
538 tooltip => "Apply the video settings", 526 tooltip => "Apply the video settings",
539 on_activate => sub { 527 on_activate => sub {
540 video_shutdown (); 528 video_shutdown ();
541 video_init (); 529 video_init ();
545 533
546 $vbox 534 $vbox
547} 535}
548 536
549sub audio_setup { 537sub audio_setup {
550 my $vbox = new CFClient::UI::VBox; 538 my $vbox = new CFPlus::UI::VBox;
551 539
552 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
553 541
554 my $row = 0; 542 my $row = 0;
555 543
556 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
557 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, new CFPlus::UI::CheckBox
558 state => $CFG->{audio_enable}, 546 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.", 547 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
561 ); 549 );
562# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 550# $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 { 551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
564# $CFG->{effects_volume} = $_[1]; 552# $CFG->{effects_volume} = $_[1];
565# }); 553# });
566 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 554 $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); 555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
568 $hbox->add (new CFClient::UI::CheckBox 556 $hbox->add (new CFPlus::UI::CheckBox
569 expand => 1, state => $CFG->{bgm_enable}, 557 expand => 1, state => $CFG->{bgm_enable},
570 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 558 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 } 559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
572 ); 560 );
573 $hbox->add (new CFClient::UI::Slider 561 $hbox->add (new CFPlus::UI::Slider
574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
575 tooltip => "The volume of the background music. Changes are instant.", 563 tooltip => "The volume of the background music. Changes are instant.",
576 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
577 ); 565 );
578 566
579 $table->add (1, $row++, new CFClient::UI::Button 567 $table->add (1, $row++, new CFPlus::UI::Button
580 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
581 tooltip => "Apply the audio settings", 569 tooltip => "Apply the audio settings",
582 on_activate => sub { 570 on_activate => sub {
583 audio_shutdown (); 571 audio_shutdown ();
584 audio_init (); 572 audio_init ();
596} 584}
597 585
598sub make_gauge_window { 586sub make_gauge_window {
599 my $gh = int $HEIGHT * $CFG->{gauge_size}; 587 my $gh = int $HEIGHT * $CFG->{gauge_size};
600 588
601 my $win = new CFClient::UI::Frame ( 589 my $win = new CFPlus::UI::Frame (
602 force_x => 0, 590 force_x => 0,
603 force_y => "max", 591 force_y => "max",
604 force_w => $WIDTH, 592 force_w => $WIDTH,
605 force_h => $gh, 593 force_h => $gh,
606 ); 594 );
607 595
608 $win->add (my $hbox = new CFClient::UI::HBox 596 $win->add (my $hbox = new CFPlus::UI::HBox
609 children => [ 597 children => [
610 (new CFClient::UI::HBox expand => 1), 598 (new CFPlus::UI::HBox expand => 1),
611 (new CFClient::UI::VBox children => [ 599 (new CFPlus::UI::VBox children => [
612 (new CFClient::UI::Empty expand => 1), 600 (new CFPlus::UI::Empty expand => 1),
613 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 601 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
614 ]), 602 ]),
615 (my $vbox = new CFClient::UI::VBox), 603 (my $vbox = new CFPlus::UI::VBox),
616 ], 604 ],
617 ); 605 );
618 606
619 $vbox->add (new CFClient::UI::HBox 607 $vbox->add (new CFPlus::UI::HBox
620 expand => 1, 608 expand => 1,
621 children => [ 609 children => [
622 (new CFClient::UI::Empty expand => 1), 610 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFClient::UI::HBox), 611 (my $hb = new CFPlus::UI::HBox),
624 ], 612 ],
625 ); 613 );
626 614
627 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 615 $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', 616 $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', 617 $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', 618 $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 619
636 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 620 $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, 621 $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 622
641 $GAUGES = { 623 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 624 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 625 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 626 };
647 629
648 $win 630 $win
649} 631}
650 632
651sub debug_setup { 633sub debug_setup {
652 my $table = new CFClient::UI::Table; 634 my $table = new CFPlus::UI::Table;
653 635
654 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 636 $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 }); 637 $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"); 638 $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 }); 639 $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"); 640 $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 }); 641 $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"); 642 $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 }); 643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
662 644
663 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
664 646
665 for my $x (0..2) { 647 for my $x (0..2) {
666 for my $y (0 .. 2) { 648 for my $y (0 .. 2) {
667 $table->add ($x + 3, $y, 649 $table->add ($x + 3, $y,
668 new CFClient::UI::Entry 650 new CFPlus::UI::Entry
669 text => $default_smooth[$x * 3 + $y], 651 text => $default_smooth[$x * 3 + $y],
670 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
671 ); 653 );
672 } 654 }
673 } 655 }
675 657
676 $table 658 $table
677} 659}
678 660
679sub stats_window { 661sub stats_window {
680 my $r = new CFClient::UI::ScrolledWindow ( 662 my $r = new CFPlus::UI::ScrolledWindow (
681 expand => 1, 663 expand => 1,
682 scroll_y => 1 664 scroll_y => 1
683 ); 665 );
684 $r->add (my $vb = new CFClient::UI::VBox); 666 $r->add (my $vb = new CFPlus::UI::VBox);
685 667
686 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 669 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."); 670 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, 671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 673 tooltip => "The map you are currently on (if supported by the server).");
692 674
693 $vb->add (my $hb0 = new CFClient::UI::HBox); 675 $vb->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 678 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, 679 $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, 680 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
700 682
701 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
702 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 685
704 my $color2 = [1, 1, 0]; 686 my $color2 = [1, 1, 0];
705 687
706 for ( 688 for (
707 [0, 0, st_str => "Str", 30], 689 [0, 0, st_str => "Str", 30],
719 [2, 4, st_spd => "Spd", 10.54], 701 [2, 4, st_spd => "Spd", 10.54],
720 [2, 5, st_wspd => "WSp", 10.54], 702 [2, 5, st_wspd => "WSp", 10.54],
721 ) { 703 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 704 my ($col, $row, $id, $label, $template) = @$_;
723 705
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 708 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 709 $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, 710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 711 align => -1, text => $label, tooltip => "#stat_$label");
730 } 712 }
731 713
732 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
733 715
734 my $row = 0; 716 my $row = 0;
735 my $col = 0; 717 my $col = 0;
736 718
737 my %resist_names = ( 719 my %resist_names = (
776 drain acid pois para deat phys 758 drain acid pois para deat phys
777 blind fear tund elec cold ghit/) 759 blind fear tund elec cold ghit/)
778 { 760 {
779 $tbl2->add ($col, $row, 761 $tbl2->add ($col, $row,
780 $STATWIDS->{"res_$_"} = 762 $STATWIDS->{"res_$_"} =
781 new CFClient::UI::Label 763 new CFPlus::UI::Label
782 font => $FONT_FIXED, 764 font => $FONT_FIXED,
783 template => "-100%", 765 template => "-100%",
784 align => +1, 766 align => +1,
785 valign => 0, 767 valign => 0,
786 can_events => 1, 768 can_events => 1,
787 can_hover => 1, 769 can_hover => 1,
788 tooltip => $resist_names{$_}->[1], 770 tooltip => $resist_names{$_}->[1],
789 ); 771 );
790 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
791 font => $FONT_FIXED, 773 font => $FONT_FIXED,
792 can_hover => 1, 774 can_hover => 1,
793 can_events => 1, 775 can_events => 1,
794 path => "ui/resist/resist_$_.png", 776 path => "ui/resist/resist_$_.png",
795 tooltip => $resist_names{$_}->[1], 777 tooltip => $resist_names{$_}->[1],
796 ); 778 );
797 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
798 text => $resist_names{$_}->[0], 780 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED, 781 font => $FONT_FIXED,
800 can_hover => 1, 782 can_hover => 1,
801 can_events => 1, 783 can_events => 1,
802 tooltip => $resist_names{$_}->[1], 784 tooltip => $resist_names{$_}->[1],
813 795
814 $r 796 $r
815} 797}
816 798
817sub skill_window { 799sub skill_window {
818 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 800 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]); 801 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820 $sw 802 $sw
821} 803}
822 804
823sub formsep($) { 805sub formsep($) {
824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 806 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
835 return if $METASERVER_ATIME > time; 817 return if $METASERVER_ATIME > time;
836 $METASERVER_ATIME = time + 60; 818 $METASERVER_ATIME = time + 60;
837 819
838 my $table = $METASERVER->{table}; 820 my $table = $METASERVER->{table};
839 $table->clear; 821 $table->clear;
840 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 823
842 my $buf; 824 my $buf;
843 825
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
845 827
868 "The time this server has been running without being restarted.", 850 "The time this server has been running without being restarted.",
869 "The server software version - a '+' indicates a Crossfire+ server.", 851 "The server software version - a '+' indicates a Crossfire+ server.",
870 "Short information about this server provided by its admins.", 852 "Short information about this server provided by its admins.",
871 ); 853 );
872 my @col = qw(#Users Host Uptime Version Description); 854 my @col = qw(#Users Host Uptime Version Description);
873 $table->add ($_, 0, new CFClient::UI::Label 855 $table->add ($_, 0, new CFPlus::UI::Label
874 can_hover => 1, can_events => 1, 856 can_hover => 1, can_events => 1,
875 align => 0, fg => [1, 1, 0], 857 align => 0, fg => [1, 1, 0],
876 text => $col[$_], tooltip => $tip[$_]) 858 text => $col[$_], tooltip => $tip[$_])
877 for 0 .. $#col; 859 for 0 .. $#col;
878 860
899 881
900 $m = [$users, $host, $uptime, $version, $desc]; 882 $m = [$users, $host, $uptime, $version, $desc];
901 883
902 $y++; 884 $y++;
903 885
904 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
905 (new CFClient::UI::Button 887 (new CFPlus::UI::Button
906 text => "Use", 888 text => "Use",
907 tooltip => "Put this server into the <b>Host:Port</b> field", 889 tooltip => "Put this server into the <b>Host:Port</b> field",
908 on_activate => sub { 890 on_activate => sub {
909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910 $METASERVER->hide; 892 $METASERVER->hide;
911 0 893 0
912 }, 894 },
913 ), 895 ),
914 (new CFClient::UI::Empty expand => 1), 896 (new CFPlus::UI::Empty expand => 1),
915 ]); 897 ]);
916 898
917 $table->add ($_, $y, new CFClient::UI::Label 899 $table->add ($_, $y, new CFPlus::UI::Label
918 ellipsise => 0, 900 ellipsise => 0,
919 align => $align[$_], 901 align => $align[$_],
920 text => $m->[$_], 902 text => $m->[$_],
921 tooltip => $tip[$_], 903 tooltip => $tip[$_],
922 can_hover => 1, 904 can_hover => 1,
927 } 909 }
928 }); 910 });
929} 911}
930 912
931sub metaserver_dialog { 913sub metaserver_dialog {
932 my $vbox = new CFClient::UI::VBox; 914 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFClient::UI::Table; 915 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 917
936 my $dialog = new CFClient::UI::FancyFrame 918 my $dialog = new CFPlus::UI::FancyFrame
937 title => "Server List", 919 title => "Server List",
938 name => 'metaserver_dialog', 920 name => 'metaserver_dialog',
939 x => 'center', 921 x => 'center',
940 y => 'center', 922 y => 'center',
941 z => 3, 923 z => 3,
951 933
952 $dialog 934 $dialog
953} 935}
954 936
955sub server_setup { 937sub server_setup {
956 my $vbox = new CFClient::UI::VBox; 938 my $vbox = new CFPlus::UI::VBox;
957 939
958 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
959 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 942
961 { 943 {
962 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 945
964 $vbox->add ( 946 $vbox->add (
965 $HOST_ENTRY = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFPlus::UI::Entry
966 expand => 1, 948 expand => 1,
967 text => $CFG->{profile}{default}{host}, 949 text => $CFG->{profile}{default}{host},
968 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
969 on_changed => sub { 951 on_changed => sub {
970 my ($self, $value) = @_; 952 my ($self, $value) = @_;
971 $CFG->{profile}{default}{host} = $value; 953 $CFG->{profile}{default}{host} = $value;
972 0 954 0
973 } 955 }
974 ); 956 );
975 957
976 $vbox->add (new CFClient::UI::Button 958 $vbox->add (new CFPlus::UI::Button
977 expand => 1, 959 expand => 1,
978 text => "Server List", 960 text => "Server List",
979 other => $METASERVER, 961 other => $METASERVER,
980 tooltip => "Show a list of available crossfire servers", 962 tooltip => "Show a list of available crossfire servers",
981 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 963 on_activate => sub { $METASERVER->toggle_visibility; 0 },
982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
983 ); 965 );
984 } 966 }
985 967
986 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
987 $table->add (1, 4, new CFClient::UI::Entry 969 $table->add (1, 4, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{user}, 970 text => $CFG->{profile}{default}{user},
989 tooltip => "The name of your character on the server", 971 tooltip => "The name of your character on the server",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
991 ); 973 );
992 974
993 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
994 $table->add (1, 5, new CFClient::UI::Entry 976 $table->add (1, 5, new CFPlus::UI::Entry
995 text => $CFG->{profile}{default}{password}, 977 text => $CFG->{profile}{default}{password},
996 hidden => 1, 978 hidden => 1,
997 tooltip => "The password for your character", 979 tooltip => "The password for your character",
998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
999 ); 981 );
1000 982
1001 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1002 $table->add (1, 7, new CFClient::UI::Slider 984 $table->add (1, 7, new CFPlus::UI::Slider
1003 force_w => 100, 985 force_w => 100,
1004 range => [$CFG->{mapsize}, 10, 100, 0, 1], 986 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005 tooltip => "This is the size of the portion of the map update the server sends you. " 987 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, " 988 . "If you set this to a high value you will be able to see further, "
1007 . "but you also increase bandwidth requirements and latency. " 989 . "but you also increase bandwidth requirements and latency. "
1008 . "This option is only used once at log-in.", 990 . "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 }, 991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1010 ); 992 );
1011 993
1012 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1013 $table->add (1, 8, new CFClient::UI::CheckBox 995 $table->add (1, 8, new CFPlus::UI::CheckBox
1014 state => $CFG->{face_prefetch}, 996 state => $CFG->{face_prefetch},
1015 tooltip => "<b>Background Image Prefetch</b>\n\n" 997 tooltip => "<b>Background Image Prefetch</b>\n\n"
1016 . "If enabled, the client automatically pre-fetches images from the server. " 998 . "If enabled, the client automatically pre-fetches images from the server. "
1017 . "This might increase or create lag, but increases the chances " 999 . "This might increase or create lag, but increases the chances "
1018 . "of faces being ready for display when you encounter them. " 1000 . "of faces being ready for display when you encounter them. "
1020 . "so only set it if you really need to prefetch images. " 1002 . "so only set it if you really need to prefetch images. "
1021 . "This option can be set and unset any time.", 1003 . "This option can be set and unset any time.",
1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023 ); 1005 );
1024 1006
1025 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1026 $table->add (1, 9, new CFClient::UI::Entry 1008 $table->add (1, 9, new CFPlus::UI::Entry
1027 text => $CFG->{output_count}, 1009 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.", 1010 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 }, 1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030 ); 1012 );
1031 1013
1032 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033 $table->add (1, 10, new CFClient::UI::Entry 1015 $table->add (1, 10, new CFPlus::UI::Entry
1034 text => $CFG->{output_sync}, 1016 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.", 1017 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 }, 1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037 ); 1019 );
1038 1020
1039 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1040 expand => 1, 1022 expand => 1,
1041 align => 0, 1023 align => 0,
1042 text => "Login", 1024 text => "Login",
1043 on_activate => sub { 1025 on_activate => sub {
1044 $CONN ? stop_game 1026 $CONN ? stop_game
1045 : start_game; 1027 : start_game;
1046 0 1028 0
1047 }, 1029 },
1048 ); 1030 );
1049 1031
1050 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1034 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. " 1035 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. " 1036 . "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.", 1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1038 on_changed => sub {
1058 $CFG->{say_command} = $value; 1040 $CFG->{say_command} = $value;
1059 0 1041 0
1060 } 1042 }
1061 ); 1043 );
1062 1044
1063 $vbox->add (new CFClient::UI::Label 1045 $vbox->add (new CFPlus::UI::Label
1064 text => "Server Info", 1046 text => "Server Info",
1065 fontsize => 1.2, 1047 fontsize => 1.2,
1066 padding_y => 8, 1048 padding_y => 8,
1067 fg => [1, 1, 0, 1], 1049 fg => [1, 1, 0, 1],
1068 ); 1050 );
1069 1051
1070 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1071 1053
1072 $vbox 1054 $vbox
1073} 1055}
1074 1056
1075sub message_window { 1057sub message_window {
1076 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFPlus::UI::FancyFrame
1077 name => "message_window", 1059 name => "message_window",
1078 title => "Messages", 1060 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
1080 x => "max", 1062 x => "max",
1081 y => 0, 1063 y => 0,
1082 force_w => $::WIDTH * 0.4, 1064 force_w => $::WIDTH * 0.4,
1083 force_h => $::HEIGHT * 0.5, 1065 force_h => $::HEIGHT * 0.5,
1084 child => (my $vbox = new CFClient::UI::VBox), 1066 child => (my $vbox = new CFPlus::UI::VBox),
1085 has_close_button => 1; 1067 has_close_button => 1;
1086 1068
1087 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
1088 1070
1089 $vbox->add (my $input = new CFClient::UI::Entry 1071 $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> " 1072 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>...). " 1073 . "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). " 1074 . "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.", 1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1094 on_focus_in => sub { 1076 on_focus_in => sub {
1133 }; 1115 };
1134 1116
1135 $window 1117 $window
1136} 1118}
1137 1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1138sub open_quit_dialog { 1139sub open_quit_dialog {
1139 unless ($QUIT_DIALOG) { 1140 unless ($QUIT_DIALOG) {
1140 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1141 x => "center", 1142 x => "center",
1142 y => "center", 1143 y => "center",
1143 z => 50, 1144 z => 50,
1144 title => "Really Quit?", 1145 title => "Really Quit?",
1145 on_key_down => sub { 1146 on_key_down => sub {
1146 my ($dialog, $ev) = @_; 1147 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide; 1148 $ev->{sym} == 27 and $dialog->hide;
1148 } 1149 }
1149 ; 1150 ;
1150 1151
1151 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1152 1153
1153 $vb->add (new CFClient::UI::Label 1154 $vb->add (new CFPlus::UI::Label
1154 text => "You should find a savebed and apply it first!", 1155 text => "You should find a savebed and apply it first!",
1155 max_w => $WIDTH * 0.25, 1156 max_w => $WIDTH * 0.25,
1156 ellipsize => 0, 1157 ellipsize => 0,
1157 ); 1158 );
1158 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1159 $hb->add (new CFClient::UI::Button 1160 $hb->add (new CFPlus::UI::Button
1160 text => "Ok", 1161 text => "Ok",
1161 expand => 1, 1162 expand => 1,
1162 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163 ); 1164 );
1164 $hb->add (new CFClient::UI::Button 1165 $hb->add (new CFPlus::UI::Button
1165 text => "Quit anyway", 1166 text => "Quit anyway",
1166 expand => 1, 1167 expand => 1,
1167 on_activate => sub { exit }, 1168 on_activate => sub { exit },
1168 ); 1169 );
1169 } 1170 }
1171 $QUIT_DIALOG->show; 1172 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus; 1173 $QUIT_DIALOG->grab_focus;
1173} 1174}
1174 1175
1175sub autopickup_setup { 1176sub autopickup_setup {
1176 my $table = new CFClient::UI::Table; 1177 my $table = new CFPlus::UI::Table;
1177 1178
1178 for ( 1179 for (
1179 ["General", 0, 0, 1180 ["General", 0, 0,
1180 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1181 ["Inhibit autopickup" => PICKUP_INHIBIT], 1182 ["Inhibit autopickup" => PICKUP_INHIBIT],
1215 ], 1216 ],
1216 ["Weight/Value ratio", 2, 17] 1217 ["Weight/Value ratio", 2, 17]
1217 ) 1218 )
1218 { 1219 {
1219 my ($title, $x, $y, @bits) = @$_; 1220 my ($title, $x, $y, @bits) = @$_;
1220 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1221 1222
1222 for (@bits) { 1223 for (@bits) {
1223 ++$y; 1224 ++$y;
1224 1225
1225 my $mask = $_->[1]; 1226 my $mask = $_->[1];
1226 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1227 $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 1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228 state => $::CFG->{pickup} & $mask, 1229 state => $::CFG->{pickup} & $mask,
1229 on_changed => sub { 1230 on_changed => sub {
1230 my ($box, $value) = @_; 1231 my ($box, $value) = @_;
1231 1232
1232 if ($value) { 1233 if ($value) {
1243 1244
1244 ${$_->[2]} = $checkbox if $_->[2]; 1245 ${$_->[2]} = $checkbox if $_->[2];
1245 } 1246 }
1246 } 1247 }
1247 1248
1248 $table->add (2, 18, new CFClient::UI::ValSlider 1249 $table->add (2, 18, new CFPlus::UI::ValSlider
1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99", 1251 template => ">= 99",
1251 to_value => sub { ">= " . 5 * $_[0] }, 1252 to_value => sub { ">= " . 5 * $_[0] },
1252 on_changed => sub { 1253 on_changed => sub {
1253 my ($slider, $value) = @_; 1254 my ($slider, $value) = @_;
1256 $::CFG->{pickup} |= int $value 1257 $::CFG->{pickup} |= int $value
1257 if $value; 1258 if $value;
1258 1; 1259 1;
1259 }); 1260 });
1260 1261
1261 $table->add (3, 18, new CFClient::UI::Button 1262 $table->add (3, 18, new CFPlus::UI::Button
1262 text => "set", 1263 text => "set",
1263 on_activate => sub { 1264 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1265 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1266 if defined $::CONN;
1266 0 1267 0
1281 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1282 } @_ }, 1283 } @_ },
1283); 1284);
1284 1285
1285sub inventory_widget { 1286sub inventory_widget {
1286 my $hb = new CFClient::UI::HBox homogeneous => 1; 1287 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1287 1288
1288 $hb->add (my $vb1 = new CFClient::UI::VBox); 1289 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1289 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1290 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1290 1291
1291 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1292 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1292 1293
1293 use sort 'stable'; 1294 use sort 'stable';
1294 1295
1295 $hb1->add (new CFClient::UI::Selector 1296 $hb1->add (new CFPlus::UI::Selector
1296 value => $::CFG->{inv_sort}, 1297 value => $::CFG->{inv_sort},
1297 options => [ 1298 options => [
1298 [type => "Type/Name"], 1299 [type => "Type/Name"],
1299 [mtime => "Recent/Normal/Locked"], 1300 [mtime => "Recent/Normal/Locked"],
1300 [weight => "Weight/Type"], 1301 [weight => "Weight/Type"],
1302 on_changed => sub { 1303 on_changed => sub {
1303 $::CFG->{inv_sort} = $_[1]; 1304 $::CFG->{inv_sort} = $_[1];
1304 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1305 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1305 }, 1306 },
1306 ); 1307 );
1307 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1308 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1308 #TODO# update to weigh/maxweight 1309 #TODO# update to weigh/maxweight
1309 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1310 1311
1311 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312 $sw1->add ($INV = new CFClient::UI::Inventory); 1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 1314
1314 $hb->add (my $vb2 = new CFClient::UI::VBox); 1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1315 1316
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317 1318
1318 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1319 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319 $sw2->add ($INVR = new CFClient::UI::Inventory); 1320 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1320 1321
1321 # XXX: Call after $INVR = ... because set_opencont sets the items 1322 # XXX: Call after $INVR = ... because set_opencont sets the items
1322 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1323 1324
1324 $hb 1325 $hb
1325} 1326}
1326 1327
1327sub toggle_player_page { 1328sub toggle_player_page {
1334 $PL_WINDOW->show; 1335 $PL_WINDOW->show;
1335 } 1336 }
1336} 1337}
1337 1338
1338sub player_window { 1339sub player_window {
1339 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1340 x => "center", 1341 x => "center",
1341 y => "center", 1342 y => "center",
1342 force_w => $WIDTH * 9/10, 1343 force_w => $WIDTH * 9/10,
1343 force_h => $HEIGHT * 9/10, 1344 force_h => $HEIGHT * 9/10,
1344 title => "Player", 1345 title => "Player",
1346 has_close_button => 1 1347 has_close_button => 1
1347 ; 1348 ;
1348 1349
1349 my $ntb = 1350 my $ntb =
1350 $PL_NOTEBOOK = 1351 $PL_NOTEBOOK =
1351 new CFClient::UI::Notebook expand => 1, debug => 1; 1352 new CFPlus::UI::Notebook expand => 1, debug => 1;
1352 1353
1353 $ntb->add ( 1354 $ntb->add (
1354 "Statistics (F2)" => $STATS_PAGE = stats_window, 1355 "Statistics (F2)" => $STATS_PAGE = stats_window,
1355 "Shows statistics, where all your Stats and Resistances are shown." 1356 "Shows statistics, where all your Stats and Resistances are shown."
1356 ); 1357 );
1357 $ntb->add ( 1358 $ntb->add (
1358 "Skills (F3)" => $SKILL_PAGE = skill_window, 1359 "Skills (F3)" => $SKILL_PAGE = skill_window,
1359 "Shows all your Skills." 1360 "Shows all your Skills."
1360 ); 1361 );
1361 1362
1362 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1364 $ntb->add ( 1365 $ntb->add (
1365 "Spellbook (F4)" => $spellsw, 1366 "Spellbook (F4)" => $spellsw,
1366 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1367 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1367 ); 1368 );
1368 $ntb->add ( 1369 $ntb->add (
1380sub update_bindings { 1381sub update_bindings {
1381 $BIND_UPD_CB->() if $BIND_UPD_CB; 1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1382} 1383}
1383 1384
1384sub keyboard_setup { 1385sub keyboard_setup {
1385 my $binding_list = new CFClient::UI::VBox; 1386 my $binding_list = new CFPlus::UI::VBox;
1386 1387
1387 my $refresh; 1388 my $refresh;
1388 $refresh = $BIND_UPD_CB = sub { 1389 $refresh = $BIND_UPD_CB = sub {
1389 $binding_list->clear (); 1390 $binding_list->clear ();
1390 1391
1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395 1396
1396 my $lbl = join "; ", @$cmds; 1397 my $lbl = join "; ", @$cmds;
1397 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1398 $binding_list->add (my $hb = new CFClient::UI::HBox); 1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1399 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFPlus::UI::Button
1400 text => "delete", 1401 text => "delete",
1401 tooltip => "Deletes the binding", 1402 tooltip => "Deletes the binding",
1402 on_activate => sub { 1403 on_activate => sub {
1403 $binding_list->remove ($hb); 1404 $binding_list->remove ($hb);
1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 0 1406 0
1406 }); 1407 });
1407 1408
1408 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFPlus::UI::Button
1409 text => "edit", 1410 text => "edit",
1410 tooltip => "Edits the binding", 1411 tooltip => "Edits the binding",
1411 on_activate => sub { 1412 on_activate => sub {
1412 $::BIND_EDITOR->set_binding ( 1413 $::BIND_EDITOR->set_binding (
1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1426 $::BIND_EDITOR->show; 1427 $::BIND_EDITOR->show;
1427 $SETUP_DIALOG->hide; 1428 $SETUP_DIALOG->hide;
1428 0 1429 0
1429 }); 1430 });
1430 1431
1431 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1432 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1433 } 1434 }
1434 } 1435 }
1435 }; 1436 };
1436 1437
1437 my $vb = new CFClient::UI::VBox; 1438 my $vb = new CFPlus::UI::VBox;
1438 $vb->add (my $hb = new CFClient::UI::HBox); 1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1439 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFClient::UI::CheckBox 1441 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1, 1442 expand => 1,
1442 state => $CFG->{shift_fire_stop}, 1443 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444 on_changed => sub { 1445 on_changed => sub {
1445 my ($cbox, $value) = @_; 1446 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value; 1447 $CFG->{shift_fire_stop} = $value;
1447 0 1448 0
1448 }); 1449 });
1449 1450
1450 $vb->add ($binding_list); 1451 $vb->add ($binding_list);
1451 $vb->add (my $hb = new CFClient::UI::HBox); 1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1452 1453
1453 $hb->add (new CFClient::UI::Button 1454 $hb->add (new CFPlus::UI::Button
1454 text => "record new", 1455 text => "record new",
1455 expand => 1, 1456 expand => 1,
1456 tooltip => "This button opens the binding editor with an empty binding.", 1457 tooltip => "This button opens the binding editor with an empty binding.",
1457 on_activate => sub { 1458 on_activate => sub {
1458 $::BIND_EDITOR->set_binding (undef, undef, [], 1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1472 $::BIND_EDITOR->show; 1473 $::BIND_EDITOR->show;
1473 0 1474 0
1474 }, 1475 },
1475 ); 1476 );
1476 1477
1477 $hb->add (new CFClient::UI::Button 1478 $hb->add (new CFPlus::UI::Button
1478 text => "close", 1479 text => "close",
1479 tooltip => "Closes the binding window", 1480 tooltip => "Closes the binding window",
1480 expand => 1, 1481 expand => 1,
1481 on_activate => sub { 1482 on_activate => sub {
1482 $SETUP_DIALOG->hide; 1483 $SETUP_DIALOG->hide;
1488 1489
1489 $vb 1490 $vb
1490} 1491}
1491 1492
1492sub help_window { 1493sub help_window {
1493 my $win = new CFClient::UI::FancyFrame 1494 my $win = new CFPlus::UI::FancyFrame
1494 x => 'center', 1495 x => 'center',
1495 y => 'center', 1496 y => 'center',
1496 z => 2, 1497 z => 2,
1497 name => 'doc_browser', 1498 name => 'doc_browser',
1498 force_w => int $WIDTH * 7/8, 1499 force_w => int $WIDTH * 7/8,
1499 force_h => int $HEIGHT * 7/8, 1500 force_h => int $HEIGHT * 7/8,
1500 title => "Help Browser", 1501 title => "Help Browser",
1501 has_close_button => 1; 1502 has_close_button => 1;
1502 1503
1503 $win->add (my $vbox = new CFClient::UI::VBox); 1504 $win->add (my $vbox = new CFPlus::UI::VBox);
1504 1505
1505 $vbox->add (my $buttons = new CFClient::UI::HBox); 1506 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1506 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507 expand => 1, fontsize => 0.8, padding_x => 4); 1508 expand => 1, fontsize => 0.8, padding_x => 4);
1508 1509
1509 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1510 my @history;
1510 $buttons->add (my $combo = new CFClient::UI::Selector 1511 my @future;
1511 value => undef, 1512 my $curnode;
1512 options => [ 1513
1513 [intro => "Introduction"], 1514 my $load_node; $load_node = sub {
1514 [manual => "Main Manual"], 1515 my ($node) = @_;
1515 [skill_help => "Skill Reference"], 1516
1516 [command_help => "Command Reference"], 1517 $buttons->clear;
1517 [dmcommand_help => "DM Commands"], 1518
1518 [COPYING => "License Terms"], 1519 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button
1521 text => "<",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1],
1523 on_activate => sub {
1524 unshift @future, $curnode if $curnode;
1525 $load_node->(pop @history);
1526 });
1519 ], 1527 }
1520 on_changed => sub {
1521 my ($self, $pod) = @_;
1522 1528
1529 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button
1531 text => ">",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0],
1533 on_activate => sub {
1534 push @history, $curnode;
1535 $load_node->(shift @future);
1536 });
1537 }
1538
1539 $curnode = $node;
1540
1523 $viewer->clear; 1541 $viewer->clear;
1524 $viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod }); 1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1525 $viewer->set_offset (0); 1543 $viewer->set_offset (0);
1526
1527 0
1528 },
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 ); 1544 };
1545
1546 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547
1548 $CFPlus::Pod::on_link = sub {
1549 my (@path) = @_;
1550
1551 push @history, $curnode if $curnode;
1552 @future = ();
1553
1554 $load_node->(CFPlus::Pod::find @path);
1555 $win->show;
1556 };
1537 1557
1538 $win 1558 $win
1539} 1559}
1540 1560
1541sub sdl_init { 1561sub sdl_init {
1542 CFClient::SDL_Init 1562 CFPlus::SDL_Init
1543 and die "SDL::Init failed!\n"; 1563 and die "SDL::Init failed!\n";
1544} 1564}
1545 1565
1546sub video_init { 1566sub video_init {
1547 sdl_init; 1567 sdl_init;
1552 1572
1553 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1573 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1554 $FULLSCREEN = $CFG->{fullscreen}; 1574 $FULLSCREEN = $CFG->{fullscreen};
1555 $FAST = $CFG->{fast}; 1575 $FAST = $CFG->{fast};
1556 1576
1557 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1577 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1558 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1578 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1559 1579
1560 $SDL_ACTIVE = 1; 1580 $SDL_ACTIVE = 1;
1561 $LAST_REFRESH = time - 0.01; 1581 $LAST_REFRESH = time - 0.01;
1562 1582
1563 CFClient::OpenGL::init; 1583 CFPlus::OpenGL::init;
1564 1584
1565 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1585 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1566 1586
1567 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1587 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1568 1588
1569 ############################################################################# 1589 #############################################################################
1570 1590
1571 if ($DEBUG_STATUS) { 1591 if ($DEBUG_STATUS) {
1572 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1592 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1573 } else { 1593 } else {
1574 # create the widgets 1594 # create the widgets
1575 1595
1576 $DEBUG_STATUS = new CFClient::UI::Label 1596 $DEBUG_STATUS = new CFPlus::UI::Label
1577 padding => 0, 1597 padding => 0,
1578 z => 100, 1598 z => 100,
1579 force_x => "max", 1599 force_x => "max",
1580 force_y => 0; 1600 force_y => 0;
1581 $DEBUG_STATUS->show; 1601 $DEBUG_STATUS->show;
1582 1602
1583 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1603 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1584 1604
1585 $STATUSBOX = new CFClient::UI::Statusbox; 1605 $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]); 1606 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1587 1607
1588 (new CFClient::UI::Frame 1608 (new CFPlus::UI::Frame
1589 bg => [0, 0, 0, 0.4], 1609 bg => [0, 0, 0, 0.4],
1590 force_x => 0, 1610 force_x => 0,
1591 force_y => "max", 1611 force_y => "max",
1592 child => $STATUSBOX, 1612 child => $STATUSBOX,
1593 )->show; 1613 )->show;
1594 1614
1595 CFClient::UI::FancyFrame->new ( 1615 CFPlus::UI::FancyFrame->new (
1596 title => "Map", 1616 title => "Map",
1597 name => "mapmap", 1617 name => "mapmap",
1598 x => 0, 1618 x => 0,
1599 y => $FONTSIZE + 8, 1619 y => $FONTSIZE + 8,
1600 border_bg => [1, 1, 1, 192/255], 1620 border_bg => [1, 1, 1, 192/255],
1601 bg => [1, 1, 1, 0], 1621 bg => [1, 1, 1, 0],
1602 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1622 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.", 1623 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1604 ), 1624 ),
1605 )->show; 1625 )->show;
1606 1626
1607 $MAPWIDGET = new CFClient::MapWidget; 1627 $MAPWIDGET = new CFPlus::MapWidget;
1608 $MAPWIDGET->connect (activate_console => sub { 1628 $MAPWIDGET->connect (activate_console => sub {
1609 my ($mapwidget, $preset) = @_; 1629 my ($mapwidget, $preset) = @_;
1610 1630
1611 if ($CONSOLE) { 1631 if ($CONSOLE) {
1612 $CONSOLE->{input}->{auto_activated} = 1; 1632 $CONSOLE->{input}->{auto_activated} = 1;
1618 } 1638 }
1619 }); 1639 });
1620 $MAPWIDGET->show; 1640 $MAPWIDGET->show;
1621 $MAPWIDGET->grab_focus; 1641 $MAPWIDGET->grab_focus;
1622 1642
1623 $LOGVIEW = new CFClient::UI::TextScroller 1643 $LOGVIEW = new CFPlus::UI::TextScroller
1624 expand => 1, 1644 expand => 1,
1625 font => $FONT_FIXED, 1645 font => $FONT_FIXED,
1626 fontsize => $::CFG->{log_fontsize}, 1646 fontsize => $::CFG->{log_fontsize},
1627 indent => -4, 1647 indent => -4,
1628 can_hover => 1, 1648 can_hover => 1,
1629 can_events => 1, 1649 can_events => 1,
1630 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1631 ; 1651 ;
1632 1652
1633 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1634 title => "Setup", 1654 title => "Setup",
1635 name => "setup_dialog", 1655 name => "setup_dialog",
1636 x => 'center', 1656 x => 'center',
1637 y => 'center', 1657 y => 'center',
1638 z => 2, 1658 z => 2,
1641 has_close_button => 1, 1661 has_close_button => 1,
1642 ; 1662 ;
1643 1663
1644 $METASERVER = metaserver_dialog; 1664 $METASERVER = metaserver_dialog;
1645 1665
1646 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1666 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1647 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1667 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1648 1668
1649 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1669 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1650 "Configure the server to play on, your username, password and other server-related options."); 1670 "Configure the server to play on, your username, password and other server-related options.");
1651 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1671 $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."); 1672 "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 " 1682 . "After pressing the combo the binding will be saved automatically and the "
1663 . "binding editor closes"); 1683 . "binding editor closes");
1664 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1684 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1665 "Some debuggin' options. Do not ask."); 1685 "Some debuggin' options. Do not ask.");
1666 1686
1667 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1687 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1668 1688
1669 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1689 $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."); 1690 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1671 1691
1672 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1692 $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."); 1693 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1674 1694
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 1695 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 1696
1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1697 $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."); 1698 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1679 1699
1680 $BUTTONBAR->add (new CFClient::UI::Button 1700 $BUTTONBAR->add (new CFPlus::UI::Button
1681 text => "Save Config", 1701 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.", 1702 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 { 1703 on_activate => sub {
1684 $::CFG->{layout} = CFClient::UI::get_layout; 1704 $::CFG->{layout} = CFPlus::UI::get_layout;
1685 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1705 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1686 status "Configuration Saved"; 1706 status "Configuration Saved";
1687 0 1707 0
1688 }, 1708 },
1689 ); 1709 );
1690 1710
1691 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1711 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1692 tooltip => "View Documentation"); 1712 tooltip => "View Documentation");
1693 1713
1694 $BUTTONBAR->add (new CFClient::UI::Button 1714 $BUTTONBAR->add (new CFPlus::UI::Button
1695 text => "Quit", 1715 text => "Quit",
1696 tooltip => "Terminates the program", 1716 tooltip => "Terminates the program",
1697 on_activate => sub { 1717 on_activate => sub {
1698 if ($CONN) { 1718 if ($CONN) {
1699 open_quit_dialog; 1719 open_quit_dialog;
1710 1730
1711 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1731 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1712} 1732}
1713 1733
1714sub video_shutdown { 1734sub video_shutdown {
1715 CFClient::OpenGL::shutdown; 1735 CFPlus::OpenGL::shutdown;
1716 1736
1717 undef $SDL_ACTIVE; 1737 undef $SDL_ACTIVE;
1718} 1738}
1719 1739
1720my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1740my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1728 1748
1729sub audio_music_finished { 1749sub audio_music_finished {
1730 return unless $CFG->{bgm_enable}; 1750 return unless $CFG->{bgm_enable};
1731 1751
1732 # TODO: hack, do play loop and mood music 1752 # TODO: hack, do play loop and mood music
1733 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1753 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1734 $bgmusic->play (0); 1754 $bgmusic->play (0);
1735 1755
1736 push @bgmusic, shift @bgmusic; 1756 push @bgmusic, shift @bgmusic;
1737} 1757}
1738 1758
1739sub audio_init { 1759sub audio_init {
1740 if ($CFG->{audio_enable}) { 1760 if ($CFG->{audio_enable}) {
1741 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1761 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1742 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1762 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1743 1763
1744 unless ($SDL_MIXER) { 1764 unless ($SDL_MIXER) {
1745 status "Unable to open sound device: there will be no sound"; 1765 status "Unable to open sound device: there will be no sound";
1746 return; 1766 return;
1747 } 1767 }
1748 1768
1749 CFClient::Mix_AllocateChannels 8; 1769 CFPlus::Mix_AllocateChannels 8;
1750 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1751 1771
1752 audio_music_finished; 1772 audio_music_finished;
1753 1773
1754 while (<$fh>) { 1774 while (<$fh>) {
1755 next if /^\s*#/; 1775 next if /^\s*#/;
1758 my ($file, $volume, $event) = split /\s+/, $_, 3; 1778 my ($file, $volume, $event) = split /\s+/, $_, 3;
1759 1779
1760 push @SOUNDS, "$volume,$file"; 1780 push @SOUNDS, "$volume,$file";
1761 1781
1762 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1782 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1763 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1783 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1764 $chunk->volume ($volume * 128 / 100); 1784 $chunk->volume ($volume * 128 / 100);
1765 $chunk 1785 $chunk
1766 }; 1786 };
1767 } 1787 }
1768 } else { 1788 } else {
1770 } 1790 }
1771 } 1791 }
1772} 1792}
1773 1793
1774sub audio_shutdown { 1794sub audio_shutdown {
1775 CFClient::Mix_CloseAudio if $SDL_MIXER; 1795 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1776 undef $SDL_MIXER; 1796 undef $SDL_MIXER;
1777 @SOUNDS = (); 1797 @SOUNDS = ();
1778 %AUDIO_CHUNKS = (); 1798 %AUDIO_CHUNKS = ();
1779} 1799}
1780 1800
1787 1807
1788sub force_refresh { 1808sub force_refresh {
1789 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1809 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1790 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1810 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1791 1811
1792 $CFClient::UI::ROOT->draw; 1812 $CFPlus::UI::ROOT->draw;
1793 1813
1794 $WANT_REFRESH = 0; 1814 $WANT_REFRESH = 0;
1795 $CAN_REFRESH = 0; 1815 $CAN_REFRESH = 0;
1796 $LAST_REFRESH = $NOW; 1816 $LAST_REFRESH = $NOW;
1797 1817
1798 CFClient::SDL_GL_SwapBuffers; 1818 CFPlus::SDL_GL_SwapBuffers;
1799} 1819}
1800 1820
1801my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1802 $NOW = time; 1822 $NOW = time;
1803 1823
1804 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1805 for CFClient::SDL_PollEvent; 1825 for CFPlus::SDL_PollEvent;
1806 1826
1807 if (%animate_object) { 1827 if (%animate_object) {
1808 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1828 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1809 $WANT_REFRESH++; 1829 $WANT_REFRESH++;
1810 } 1830 }
1834 $CONN->face_prefetch 1854 $CONN->face_prefetch
1835 if $CONN; 1855 if $CONN;
1836}); 1856});
1837 1857
1838%SDL_CB = ( 1858%SDL_CB = (
1839 CFClient::SDL_QUIT => sub { 1859 CFPlus::SDL_QUIT => sub {
1840 Event::unloop -1; 1860 Event::unloop -1;
1841 }, 1861 },
1842 CFClient::SDL_VIDEORESIZE => sub { 1862 CFPlus::SDL_VIDEORESIZE => sub {
1843 }, 1863 },
1844 CFClient::SDL_VIDEOEXPOSE => sub { 1864 CFPlus::SDL_VIDEOEXPOSE => sub {
1845 CFClient::UI::full_refresh; 1865 CFPlus::UI::full_refresh;
1846 }, 1866 },
1847 CFClient::SDL_ACTIVEEVENT => sub { 1867 CFPlus::SDL_ACTIVEEVENT => sub {
1848# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1868# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1849 }, 1869 },
1850 CFClient::SDL_KEYDOWN => sub { 1870 CFPlus::SDL_KEYDOWN => sub {
1851 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1871 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1852 # alt-enter 1872 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle; 1873 $FULLSCREEN_ENABLE->toggle;
1854 video_shutdown; 1874 video_shutdown;
1855 video_init; 1875 video_init;
1856 } else { 1876 } else {
1857 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1877 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1858 } 1878 }
1859 }, 1879 },
1860 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1880 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1861 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1881 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1862 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1882 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1863 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1883 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1864 CFClient::SDL_USEREVENT => sub { 1884 CFPlus::SDL_USEREVENT => sub {
1865 if ($_[0]{code} == 1) { 1885 if ($_[0]{code} == 1) {
1866 audio_channel_finished $_[0]{data1}; 1886 audio_channel_finished $_[0]{data1};
1867 } elsif ($_[0]{code} == 0) { 1887 } elsif ($_[0]{code} == 0) {
1868 audio_music_finished; 1888 audio_music_finished;
1869 } 1889 }
1873############################################################################# 1893#############################################################################
1874 1894
1875$SIG{INT} = $SIG{TERM} = sub { exit }; 1895$SIG{INT} = $SIG{TERM} = sub { exit };
1876 1896
1877{ 1897{
1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1898 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1879 CFClient::UI::set_layout ($::CFG->{layout}); 1899 CFPlus::UI::set_layout ($::CFG->{layout});
1880 1900
1881 my %DEF_CFG = ( 1901 my %DEF_CFG = (
1882 sdl_mode => 0, 1902 sdl_mode => 0,
1883 width => 640, 1903 width => 640,
1884 height => 480, 1904 height => 480,
1914 1934
1915 sdl_init; 1935 sdl_init;
1916 1936
1917 @SDL_MODES = reverse 1937 @SDL_MODES = reverse
1918 grep $_->[0] >= 640 && $_->[1] >= 480, 1938 grep $_->[0] >= 640 && $_->[1] >= 480,
1919 CFClient::SDL_ListModes; 1939 CFPlus::SDL_ListModes;
1920 1940
1921 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1941 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1922 1942
1923 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1943 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1924 1944
1925 { 1945 {
1926 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1946 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1927 DejaVuSans.ttf 1947 DejaVuSans.ttf
1928 DejaVuSansMono.ttf 1948 DejaVuSansMono.ttf
1929 DejaVuSans-Bold.ttf 1949 DejaVuSans-Bold.ttf
1930 DejaVuSansMono-Bold.ttf 1950 DejaVuSansMono-Bold.ttf
1931 DejaVuSans-Oblique.ttf 1951 DejaVuSans-Oblique.ttf
1932 DejaVuSansMono-Oblique.ttf 1952 DejaVuSansMono-Oblique.ttf
1933 DejaVuSans-BoldOblique.ttf 1953 DejaVuSans-BoldOblique.ttf
1934 DejaVuSansMono-BoldOblique.ttf 1954 DejaVuSansMono-BoldOblique.ttf
1935 ); 1955 );
1936 1956
1937 CFClient::add_font $_ for @fonts; 1957 CFPlus::add_font $_ for @fonts;
1938 1958
1939 CFClient::pango_init; 1959 CFPlus::pango_init;
1940 1960
1941 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1961 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1942 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1962 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1943 1963
1944 $FONT_PROP->make_default; 1964 $FONT_PROP->make_default;
1945 } 1965 }
1946 1966
1947# compare mono (ft) vs. rgba (cairo) 1967# compare mono (ft) vs. rgba (cairo)
1948# ft - 1.8s, cairo 3s, even in alpha-only mode 1968# ft - 1.8s, cairo 3s, even in alpha-only mode
1949# for my $rgba (0..1) { 1969# for my $rgba (0..1) {
1950# my $t1 = Time::HiRes::time; 1970# my $t1 = Time::HiRes::time;
1951# for (1..1000) { 1971# for (1..1000) {
1952# my $layout = CFClient::Layout->new ($rgba); 1972# my $layout = CFPlus::Layout->new ($rgba);
1953# $layout->set_text ("hallo" x 100); 1973# $layout->set_text ("hallo" x 100);
1954# $layout->render; 1974# $layout->render;
1955# } 1975# }
1956# my $t2 = Time::HiRes::time; 1976# my $t2 = Time::HiRes::time;
1957# warn $t2-$t1; 1977# warn $t2-$t1;
1960 video_init; 1980 video_init;
1961 audio_init; 1981 audio_init;
1962} 1982}
1963 1983
1964Event::loop; 1984Event::loop;
1965#CFClient::SDL_Quit; 1985#CFPlus::SDL_Quit;
1966#CFClient::_exit 0; 1986#CFPlus::_exit 0;
1967 1987
1968END { CFClient::SDL_Quit } 1988END { CFPlus::SDL_Quit }
1969 1989
1970=head1 NAME 1990=head1 NAME
1971 1991
1972cfplus - A Crossfire+ and Crossfire game client 1992cfplus - A Crossfire+ and Crossfire game client
1973 1993

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines