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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 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::DIED = sub { 49$Event::DIED = sub {
49 # TODO: display dialog box or so 50 # TODO: display dialog box or so
50 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
51 CFClient::error $_[1]; 52 return;#d#
53 CFPlus::fatal ($_[1]);
52}; 54};
53 55
54#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
55
56our $VERSION = '0.1'; 56our $VERSION = '0.9';
57 57
58my $MAX_FPS = 60; 58my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 59my $MIN_FPS = 5; # unused as of yet
60 60
61our $META_SERVER = "crossfire.real-time.com:13326"; 61our $META_SERVER = "crossfire.real-time.com:13326";
… …
131our $BIND_UPD_CB; 131our $BIND_UPD_CB;
132 132
133our $PICKUP_CFG; 133our $PICKUP_CFG;
134 134
135sub status { 135sub status {
136 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 136 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137} 137}
138 138
139sub debug { 139sub debug {
140 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
141} 141}
… …
147 147
148# server query dialog 148# server query dialog
149sub server_query { 149sub server_query {
150 my ($conn, $flags, $prompt) = @_; 150 my ($conn, $flags, $prompt) = @_;
151 151
152 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 152 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153 x => "center", 153 x => "center",
154 y => "center", 154 y => "center",
155 title => "Server Query", 155 title => "Server Query",
156 child => my $vbox = new CFClient::UI::VBox, 156 child => my $vbox = new CFPlus::UI::VBox,
157 ; 157 ;
158 158
159 my @dialog = my $label = new CFClient::UI::Label 159 my @dialog = my $label = new CFPlus::UI::Label
160 max_w => $::WIDTH * 0.4, 160 max_w => $::WIDTH * 0.4,
161 ellipsise => 0, 161 ellipsise => 0,
162 text => $prompt; 162 text => $prompt;
163 163
164 if ($flags & CS_QUERY_YESNO) { 164 if ($flags & CS_QUERY_YESNO) {
165 push @dialog, my $hbox = new CFClient::UI::HBox; 165 push @dialog, my $hbox = new CFPlus::UI::HBox;
166 166
167 $hbox->add (new CFClient::UI::Button 167 $hbox->add (new CFPlus::UI::Button
168 text => "No", 168 text => "No",
169 on_activate => sub { 169 on_activate => sub {
170 $conn->send ("reply n"); 170 $conn->send ("reply n");
171 $dialog->destroy; 171 $dialog->destroy;
172 0 172 0
173 } 173 }
174 ); 174 );
175 $hbox->add (new CFClient::UI::Button 175 $hbox->add (new CFPlus::UI::Button
176 text => "Yes", 176 text => "Yes",
177 on_activate => sub { 177 on_activate => sub {
178 $conn->send ("reply y"); 178 $conn->send ("reply y");
179 destroy_query_dialog $conn; 179 destroy_query_dialog $conn;
180 0 180 0
… …
182 ); 182 );
183 183
184 $dialog->grab_focus; 184 $dialog->grab_focus;
185 185
186 } elsif ($flags & CS_QUERY_SINGLECHAR) { 186 } elsif ($flags & CS_QUERY_SINGLECHAR) {
187 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 187 $dialog->{tooltip} = "#charcreation_focus";
188 188
189 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 189 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
191 191
192 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
194 ellipsise => 0, 194 ellipsise => 0,
195 markup => "\nOr use your keyboard and the text entry below:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
196 196
197 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFPlus::UI::Table;
198 198
199 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFPlus::UI::Button
200 text => "Next Race", 200 text => "Next Race",
201 on_activate => sub { 201 on_activate => sub {
202 $conn->send ("reply n"); 202 $conn->send ("reply n");
203 destroy_query_dialog $conn; 203 destroy_query_dialog $conn;
204 0 204 0
205 }, 205 },
206 ); 206 );
207 $table->add (2, 0, new CFClient::UI::Button 207 $table->add (2, 0, new CFPlus::UI::Button
208 text => "Accept", 208 text => "Accept",
209 on_activate => sub { 209 on_activate => sub {
210 $conn->send ("reply d"); 210 $conn->send ("reply d");
211 destroy_query_dialog $conn; 211 destroy_query_dialog $conn;
212 0 212 0
213 }, 213 },
214 ); 214 );
215 215
216 unshift @dialog, new CFClient::UI::Label 216 unshift @dialog, new CFPlus::UI::Label
217 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
218 ellipsise => 0, 218 ellipsise => 0,
219 markup => 219 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220 "<big><b>Character Creation: Race</b></big>\n\n"
221 . "Look at the <b>Messages</b> window to see a description of this race "
222 . "and the center of the screen to see how this race looks like "
223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "click into the display area to make it visible</small>).\n\n"
225 . "You can look at another race, or accept this race (you will cycle back to "
226 . "this race eventually, so you can take your time making this important choice."
227 ; 220 ;
228 221
229 } elsif ($prompt =~ /roll new stats/) { 222 } elsif ($prompt =~ /roll new stats/) {
230 if (my $stat = delete $conn->{stat_change_with}) { 223 if (my $stat = delete $conn->{stat_change_with}) {
231 $conn->send ("reply $stat"); 224 $conn->send ("reply $stat");
… …
234 } 227 }
235 228
236 $STATS_PAGE->show; 229 $STATS_PAGE->show;
237 $MESSAGE_WINDOW->hide; 230 $MESSAGE_WINDOW->hide;
238 231
239 unshift @dialog, new CFClient::UI::Label 232 unshift @dialog, new CFPlus::UI::Label
240 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.4,
241 ellipsise => 0, 234 ellipsise => 0,
242 markup => "\nOr use your keyboard and the text entry below:\n"; 235 markup => "\nOr use your keyboard and the text entry below:\n";
243 236
244 unshift @dialog, my $table = new CFClient::UI::Table; 237 unshift @dialog, my $table = new CFPlus::UI::Table;
245 238
246 # left: re-roll 239 # left: re-roll
247 $table->add (0, 0, new CFClient::UI::Button 240 $table->add (0, 0, new CFPlus::UI::Button
248 text => "Roll Again", 241 text => "Roll Again",
249 on_activate => sub { 242 on_activate => sub {
250 $conn->send ("reply y"); 243 $conn->send ("reply y");
251 destroy_query_dialog $conn; 244 destroy_query_dialog $conn;
252 0 245 0
253 }, 246 },
254 ); 247 );
255 248
256 # center: swap stats 249 # center: swap stats
257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 250 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258 expand => 1, 251 expand => 1,
259 value => $_, 252 value => $_,
260 options => [ 253 options => [
261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 254 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 255 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
266 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 259 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 260 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268 ], 261 ],
269 ), 1 .. 2; 262 ), 1 .. 2;
270 263
271 $table->add (2, 0, new CFClient::UI::Button 264 $table->add (2, 0, new CFPlus::UI::Button
272 text => "Swap Stats", 265 text => "Swap Stats",
273 on_activate => sub { 266 on_activate => sub {
274 $conn->{stat_change_with} = $sw2->{value}; 267 $conn->{stat_change_with} = $sw2->{value};
275 $conn->send ("reply $sw1->{value}"); 268 $conn->send ("reply $sw1->{value}");
276 destroy_query_dialog $conn; 269 destroy_query_dialog $conn;
277 0 270 0
278 }, 271 },
279 ); 272 );
280 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 273 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281 274
282 # right: accept 275 # right: accept
283 $table->add (4, 0, new CFClient::UI::Button 276 $table->add (4, 0, new CFPlus::UI::Button
284 text => "Accept", 277 text => "Accept",
285 on_activate => sub { 278 on_activate => sub {
286 $conn->send ("reply n"); 279 $conn->send ("reply n");
287 $STATS_PAGE->hide; 280 $STATS_PAGE->hide;
288 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
289 0 282 0
290 }, 283 },
291 ); 284 );
292 285
293 unshift @dialog, my $hbox = new CFClient::UI::HBox; 286 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294 for ( 287 for (
295 [Str => CS_STAT_STR], 288 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX], 289 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON], 290 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT], 291 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS], 292 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW], 293 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA], 294 [Cha => CS_STAT_CHA],
302 ) { 295 ) {
303 my ($name, $id) = @$_; 296 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label 297 $hbox->add (new CFPlus::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 298 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0, 299 align => 0,
307 expand => 1, 300 expand => 1,
308 can_events => 1, 301 can_events => 1,
309 can_hover => 1, 302 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name}, 303 tooltip => "#stat_$name",
311 ); 304 );
312 } 305 }
313 306
314 unshift @dialog, new CFClient::UI::Label 307 unshift @dialog, new CFPlus::UI::Label
315 max_w => $::WIDTH * 0.4, 308 max_w => $::WIDTH * 0.4,
316 ellipsise => 0, 309 ellipsise => 0,
317 markup => 310 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318 "<big><b>Character Creation: Stats</b></big>\n\n"
319 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "They will be modified later by both the race and the class you choose.\n\n"
322 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323 ; 311 ;
324 } 312 }
325 313
326 push @dialog, my $entry = new CFClient::UI::Entry 314 push @dialog, my $entry = new CFPlus::UI::Entry
327 on_changed => sub { 315 on_changed => sub {
328 $conn->send ("reply $_[1]"); 316 $conn->send ("reply $_[1]");
329 destroy_query_dialog $conn; 317 destroy_query_dialog $conn;
330 0 318 0
331 }, 319 },
… …
334 $entry->grab_focus; 322 $entry->grab_focus;
335 323
336 } else { 324 } else {
337 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 325 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338 326
339 push @dialog, my $entry = new CFClient::UI::Entry 327 push @dialog, my $entry = new CFPlus::UI::Entry
340 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 328 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341 on_activate => sub { 329 on_activate => sub {
342 $conn->send ("reply $_[1]"); 330 $conn->send ("reply $_[1]");
343 destroy_query_dialog $conn; 331 destroy_query_dialog $conn;
344 0 332 0
… …
360 348
361 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 349 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362 350
363 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 351 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
364 352
365 $MAP = new CFClient::Map $mapsize, $mapsize; 353 $MAP = new CFPlus::Map $mapsize, $mapsize;
366 354
367 $CONN = eval { 355 $CONN = eval {
368 new CFClient::Protocol 356 new CFPlus::Protocol
369 host => $host, 357 host => $host,
370 port => $port || 13327, 358 port => $port || 13327,
371 user => $CFG->{profile}{default}{user}, 359 user => $CFG->{profile}{default}{user},
372 pass => $CFG->{profile}{default}{password}, 360 pass => $CFG->{profile}{default}{password},
373 mapw => $mapsize, 361 mapw => $mapsize,
374 maph => $mapsize, 362 maph => $mapsize,
375 363
364 client => "cfplus $VERSION $] $^O",
365
376 map_widget => $MAPWIDGET, 366 map_widget => $MAPWIDGET,
377 logview => $LOGVIEW, 367 logview => $LOGVIEW,
378 statusbox => $STATUSBOX, 368 statusbox => $STATUSBOX,
379 map => $MAP, 369 map => $MAP,
380 mapmap => $MAPMAP, 370 mapmap => $MAPMAP,
… …
392 $chunk->play; 382 $chunk->play;
393 }, 383 },
394 }; 384 };
395 385
396 if ($CONN) { 386 if ($CONN) {
397 CFClient::lowdelay fileno $CONN->{fh}; 387 CFPlus::lowdelay fileno $CONN->{fh};
398 388
399 status "login successful"; 389 status "login successful";
400 } else { 390 } else {
401 status "unable to connect"; 391 status "unable to connect";
402 stop_game(); 392 stop_game();
… …
420 410
421 undef $MAP; 411 undef $MAP;
422} 412}
423 413
424sub graphics_setup { 414sub graphics_setup {
425 my $vbox = new CFClient::UI::VBox; 415 my $vbox = new CFPlus::UI::VBox;
426 416
427 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 417 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428 418
429 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 419 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 420 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431 421
432 $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]); 422 $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]);
433 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 423 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434 424
435 $mode_slider->connect (changed => sub { 425 $mode_slider->connect (changed => sub {
436 my ($self, $value) = @_; 426 my ($self, $value) = @_;
437 427
438 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 428 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
440 }); 430 });
441 $mode_slider->emit (changed => $mode_slider->{range}[0]); 431 $mode_slider->emit (changed => $mode_slider->{range}[0]);
442 432
443 my $row = 1; 433 my $row = 1;
444 434
445 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 435 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 436 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447 state => $CFG->{fullscreen}, 437 state => $CFG->{fullscreen},
448 tooltip => "Bring the client into fullscreen mode.", 438 tooltip => "Bring the client into fullscreen mode.",
449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 439 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450 ); 440 );
451 441
452 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 442 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453 $table->add (1, $row++, new CFClient::UI::CheckBox 443 $table->add (1, $row++, new CFPlus::UI::CheckBox
454 state => $CFG->{fast}, 444 state => $CFG->{fast},
455 tooltip => "Lower the visual quality considerably to speed up rendering.", 445 tooltip => "Lower the visual quality considerably to speed up rendering.",
456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 446 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457 ); 447 );
458 448
459 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 449 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460 $table->add (1, $row++, new CFClient::UI::Slider 450 $table->add (1, $row++, new CFPlus::UI::Slider
461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 451 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 452 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 453 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464 ); 454 );
465 455
466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 456 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467 $table->add (1, $row++, new CFClient::UI::CheckBox 457 $table->add (1, $row++, new CFPlus::UI::CheckBox
468 state => $CFG->{fow_enable}, 458 state => $CFG->{fow_enable},
469 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 459 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 460 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471 ); 461 );
472 462
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 463 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474 $table->add (1, $row++, new CFClient::UI::Slider 464 $table->add (1, $row++, new CFPlus::UI::Slider
475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 465 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 466 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 467 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478 ); 468 );
479 469
480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 470 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481 $table->add (1, $row++, new CFClient::UI::CheckBox 471 $table->add (1, $row++, new CFPlus::UI::CheckBox
482 state => $CFG->{fow_smooth}, 472 state => $CFG->{fow_smooth},
483 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 473 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484 on_changed => sub { 474 on_changed => sub {
485 my ($self, $value) = @_; 475 my ($self, $value) = @_;
486 $CFG->{fow_smooth} = $value; 476 $CFG->{fow_smooth} = $value;
487 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 477 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488 0 478 0
489 } 479 }
490 ); 480 );
491 481
492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFPlus::UI::Slider
494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 484 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 485 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 486 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497 ); 487 );
498 488
499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500 $table->add (1, $row++, new CFClient::UI::Slider 490 $table->add (1, $row++, new CFPlus::UI::Slider
501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 491 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 492 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 493 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504 ); 494 );
505 495
506 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507 $table->add (1, $row++, new CFClient::UI::Slider 497 $table->add (1, $row++, new CFPlus::UI::Slider
508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 498 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 499 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510 on_changed => sub { 500 on_changed => sub {
511 $CFG->{gauge_fontsize} = $_[1]; 501 $CFG->{gauge_fontsize} = $_[1];
512 &set_gauge_window_fontsize; 502 &set_gauge_window_fontsize;
513 0 503 0
514 } 504 }
515 ); 505 );
516 506
517 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518 $table->add (1, $row++, new CFClient::UI::Slider 508 $table->add (1, $row++, new CFPlus::UI::Slider
519 range => [$CFG->{gauge_size}, 0.2, 0.8], 509 range => [$CFG->{gauge_size}, 0.2, 0.8],
520 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 510 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521 on_changed => sub { 511 on_changed => sub {
522 $CFG->{gauge_size} = $_[1]; 512 $CFG->{gauge_size} = $_[1];
523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 513 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0 514 0
525 } 515 }
526 ); 516 );
527 517
528 $table->add (1, $row++, new CFClient::UI::Button 518 $table->add (1, $row++, new CFPlus::UI::Button
529 expand => 1, align => 0, text => "Apply", 519 expand => 1, align => 0, text => "Apply",
530 tooltip => "Apply the video settings", 520 tooltip => "Apply the video settings",
531 on_activate => sub { 521 on_activate => sub {
532 video_shutdown (); 522 video_shutdown ();
533 video_init (); 523 video_init ();
… …
537 527
538 $vbox 528 $vbox
539} 529}
540 530
541sub audio_setup { 531sub audio_setup {
542 my $vbox = new CFClient::UI::VBox; 532 my $vbox = new CFPlus::UI::VBox;
543 533
544 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 534 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545 535
546 my $row = 0; 536 my $row = 0;
547 537
548 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549 $table->add (1, $row++, new CFClient::UI::CheckBox 539 $table->add (1, $row++, new CFPlus::UI::CheckBox
550 state => $CFG->{audio_enable}, 540 state => $CFG->{audio_enable},
551 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.", 541 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.",
552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 542 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553 ); 543 );
554# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 544# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 545# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556# $CFG->{effects_volume} = $_[1]; 546# $CFG->{effects_volume} = $_[1];
557# }); 547# });
558 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 549 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560 $hbox->add (new CFClient::UI::CheckBox 550 $hbox->add (new CFPlus::UI::CheckBox
561 expand => 1, state => $CFG->{bgm_enable}, 551 expand => 1, state => $CFG->{bgm_enable},
562 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 552 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 553 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564 ); 554 );
565 $hbox->add (new CFClient::UI::Slider 555 $hbox->add (new CFPlus::UI::Slider
566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 556 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567 tooltip => "The volume of the background music. Changes are instant.", 557 tooltip => "The volume of the background music. Changes are instant.",
568 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 558 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569 ); 559 );
570 560
571 $table->add (1, $row++, new CFClient::UI::Button 561 $table->add (1, $row++, new CFPlus::UI::Button
572 expand => 1, align => 0, text => "Apply", 562 expand => 1, align => 0, text => "Apply",
573 tooltip => "Apply the audio settings", 563 tooltip => "Apply the audio settings",
574 on_activate => sub { 564 on_activate => sub {
575 audio_shutdown (); 565 audio_shutdown ();
576 audio_init (); 566 audio_init ();
… …
588} 578}
589 579
590sub make_gauge_window { 580sub make_gauge_window {
591 my $gh = int $HEIGHT * $CFG->{gauge_size}; 581 my $gh = int $HEIGHT * $CFG->{gauge_size};
592 582
593 my $win = new CFClient::UI::Frame ( 583 my $win = new CFPlus::UI::Frame (
594 force_x => 0, 584 force_x => 0,
595 force_y => "max", 585 force_y => "max",
596 force_w => $WIDTH, 586 force_w => $WIDTH,
597 force_h => $gh, 587 force_h => $gh,
598 ); 588 );
599 589
600 $win->add (my $hbox = new CFClient::UI::HBox 590 $win->add (my $hbox = new CFPlus::UI::HBox
601 children => [ 591 children => [
602 (new CFClient::UI::HBox expand => 1), 592 (new CFPlus::UI::HBox expand => 1),
603 (new CFClient::UI::VBox children => [ 593 (new CFPlus::UI::VBox children => [
604 (new CFClient::UI::Empty expand => 1), 594 (new CFPlus::UI::Empty expand => 1),
605 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 595 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606 ]), 596 ]),
607 (my $vbox = new CFClient::UI::VBox), 597 (my $vbox = new CFPlus::UI::VBox),
608 ], 598 ],
609 ); 599 );
610 600
611 $vbox->add (new CFClient::UI::HBox 601 $vbox->add (new CFPlus::UI::HBox
612 expand => 1, 602 expand => 1,
613 children => [ 603 children => [
614 (new CFClient::UI::Empty expand => 1), 604 (new CFPlus::UI::Empty expand => 1),
615 (my $hb = new CFClient::UI::HBox), 605 (my $hb = new CFPlus::UI::HBox),
616 ], 606 ],
617 ); 607 );
618 608
619 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 609 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620 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.");
621 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 610 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622 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.");
623 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 611 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624 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.");
625 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 612 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626 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.");
627 613
628 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 614 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
629 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.");
630 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 615 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
631 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632 616
633 $GAUGES = { 617 $GAUGES = {
634 exp => $exp, win => $win, range => $rng, 618 exp => $exp, win => $win, range => $rng,
635 food => $fg, mana => $mg, hp => $hg, grace => $gg 619 food => $fg, mana => $mg, hp => $hg, grace => $gg
636 }; 620 };
… …
639 623
640 $win 624 $win
641} 625}
642 626
643sub debug_setup { 627sub debug_setup {
644 my $table = new CFClient::UI::Table; 628 my $table = new CFPlus::UI::Table;
645 629
646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 630 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 631 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 632 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 633 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 634 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 635 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 636 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 637 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
654 638
655 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 639 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656 640
657 for my $x (0..2) { 641 for my $x (0..2) {
658 for my $y (0 .. 2) { 642 for my $y (0 .. 2) {
659 $table->add ($x + 3, $y, 643 $table->add ($x + 3, $y,
660 new CFClient::UI::Entry 644 new CFPlus::UI::Entry
661 text => $default_smooth[$x * 3 + $y], 645 text => $default_smooth[$x * 3 + $y],
662 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 646 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663 ); 647 );
664 } 648 }
665 } 649 }
… …
667 651
668 $table 652 $table
669} 653}
670 654
671sub stats_window { 655sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow ( 656 my $r = new CFPlus::UI::ScrolledWindow (
673 expand => 1, 657 expand => 1,
674 scroll_y => 1 658 scroll_y => 1
675 ); 659 );
676 $r->add (my $vb = new CFClient::UI::VBox); 660 $r->add (my $vb = new CFPlus::UI::VBox);
677 661
662 $vb->add (new CFPlus::UI::FancyFrame
663 label => "Player",
664 child => (my $pi = new CFPlus::UI::VBox),
665 );
666
678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 667 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
680 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 669 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 670 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682 can_hover => 1, can_events => 1, 671 can_hover => 1, can_events => 1,
683 tooltip => "The map you are currently on (if supported by the server)."); 672 tooltip => "The map you are currently on (if supported by the server).");
684 673
685 $vb->add (my $hb0 = new CFClient::UI::HBox); 674 $pi->add (my $hb0 = new CFPlus::UI::HBox);
686 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 675 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687 can_hover => 1, can_events => 1, 676 can_hover => 1, can_events => 1,
688 tooltip => "The weight of the player including all inventory items."); 677 tooltip => "The weight of the player including all inventory items.");
689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 678 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
691 tooltip => "The weight limit: you cannot carry more than this."); 680 tooltip => "The weight limit: you cannot carry more than this.");
692 681
693 682 $vb->add (new CFPlus::UI::FancyFrame
683 label => "Primary/Secondary Statistics",
694 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 684 child => (my $hb = new CFPlus::UI::HBox expand => 1),
685 );
695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 686 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696 687
697 my $color2 = [1, 1, 0]; 688 my $color2 = [1, 1, 0];
698 689
699 for ( 690 for (
700 [0, 0, st_str => "Str", 30], 691 [0, 0, st_str => "Str", 30],
… …
712 [2, 4, st_spd => "Spd", 10.54], 703 [2, 4, st_spd => "Spd", 10.54],
713 [2, 5, st_wspd => "WSp", 10.54], 704 [2, 5, st_wspd => "WSp", 10.54],
714 ) { 705 ) {
715 my ($col, $row, $id, $label, $template) = @$_; 706 my ($col, $row, $id, $label, $template) = @$_;
716 707
717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 708 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 709 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 710 align => +1, template => $template, tooltip => "#stat_$label");
720 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 711 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 712 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 713 align => -1, text => $label, tooltip => "#stat_$label");
723 } 714 }
724 715
716 $vb->add (new CFPlus::UI::FancyFrame
717 label => "Resistancies",
725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 718 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
719 );
726 720
727 my $row = 0; 721 my $row = 0;
728 my $col = 0; 722 my $col = 0;
729 723
730 my %resist_names = ( 724 my %resist_names = (
… …
769 drain acid pois para deat phys 763 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 764 blind fear tund elec cold ghit/)
771 { 765 {
772 $tbl2->add ($col, $row, 766 $tbl2->add ($col, $row,
773 $STATWIDS->{"res_$_"} = 767 $STATWIDS->{"res_$_"} =
774 new CFClient::UI::Label 768 new CFPlus::UI::Label
775 font => $FONT_FIXED, 769 font => $FONT_FIXED,
776 template => "-100%", 770 template => "-100%",
777 align => +1, 771 align => +1,
778 valign => 0, 772 valign => 0,
779 can_events => 1, 773 can_events => 1,
780 can_hover => 1, 774 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 775 tooltip => $resist_names{$_}->[1],
782 ); 776 );
783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 777 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 778 font => $FONT_FIXED,
785 can_hover => 1, 779 can_hover => 1,
786 can_events => 1, 780 can_events => 1,
787 path => "ui/resist/resist_$_.png", 781 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 782 tooltip => $resist_names{$_}->[1],
789 ); 783 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 784 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 785 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 786 font => $FONT_FIXED,
793 can_hover => 1, 787 can_hover => 1,
794 can_events => 1, 788 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 789 tooltip => $resist_names{$_}->[1],
… …
806 800
807 $r 801 $r
808} 802}
809 803
810sub skill_window { 804sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 805 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 806 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813 $sw 807 $sw
814} 808}
815 809
816sub formsep($) { 810sub formsep($) {
817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 811 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
828 return if $METASERVER_ATIME > time; 822 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 823 $METASERVER_ATIME = time + 60;
830 824
831 my $table = $METASERVER->{table}; 825 my $table = $METASERVER->{table};
832 $table->clear; 826 $table->clear;
833 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 827 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 828
835 my $buf; 829 my $buf;
836 830
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 831 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
838 832
… …
861 "The time this server has been running without being restarted.", 855 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 856 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 857 "Short information about this server provided by its admins.",
864 ); 858 );
865 my @col = qw(#Users Host Uptime Version Description); 859 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFClient::UI::Label 860 $table->add ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 861 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 862 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 863 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 864 for 0 .. $#col;
871 865
… …
892 886
893 $m = [$users, $host, $uptime, $version, $desc]; 887 $m = [$users, $host, $uptime, $version, $desc];
894 888
895 $y++; 889 $y++;
896 890
897 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 891 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFClient::UI::Button 892 (new CFPlus::UI::Button
899 text => "Use", 893 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 894 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 895 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 896 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903 $METASERVER->hide; 897 $METASERVER->hide;
904 0 898 0
905 }, 899 },
906 ), 900 ),
907 (new CFClient::UI::Empty expand => 1), 901 (new CFPlus::UI::Empty expand => 1),
908 ]); 902 ]);
909 903
910 $table->add ($_, $y, new CFClient::UI::Label 904 $table->add ($_, $y, new CFPlus::UI::Label
911 ellipsise => 0, 905 ellipsise => 0,
912 align => $align[$_], 906 align => $align[$_],
913 text => $m->[$_], 907 text => $m->[$_],
914 tooltip => $tip[$_], 908 tooltip => $tip[$_],
915 can_hover => 1, 909 can_hover => 1,
… …
920 } 914 }
921 }); 915 });
922} 916}
923 917
924sub metaserver_dialog { 918sub metaserver_dialog {
925 my $vbox = new CFClient::UI::VBox; 919 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFClient::UI::Table; 920 my $table = new CFPlus::UI::Table;
927 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 921 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928 922
929 my $dialog = new CFClient::UI::FancyFrame 923 my $dialog = new CFPlus::UI::Toplevel
930 title => "Server List", 924 title => "Server List",
931 name => 'metaserver_dialog', 925 name => 'metaserver_dialog',
932 x => 'center', 926 x => 'center',
933 y => 'center', 927 y => 'center',
934 z => 3, 928 z => 3,
… …
944 938
945 $dialog 939 $dialog
946} 940}
947 941
948sub server_setup { 942sub server_setup {
949 my $vbox = new CFClient::UI::VBox; 943 my $vbox = new CFPlus::UI::VBox;
950 944
945 $vbox->add (new CFPlus::UI::FancyFrame
946 label => "Connection Settings",
951 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 947 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
948 );
952 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 949 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953 950
954 { 951 {
955 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 952 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956 953
957 $vbox->add ( 954 $vbox->add (
958 $HOST_ENTRY = new CFClient::UI::Entry 955 $HOST_ENTRY = new CFPlus::UI::Entry
959 expand => 1, 956 expand => 1,
960 text => $CFG->{profile}{default}{host}, 957 text => $CFG->{profile}{default}{host},
961 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 958 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962 on_changed => sub { 959 on_changed => sub {
963 my ($self, $value) = @_; 960 my ($self, $value) = @_;
964 $CFG->{profile}{default}{host} = $value; 961 $CFG->{profile}{default}{host} = $value;
965 0 962 0
966 } 963 }
967 ); 964 );
968 965
969 $vbox->add (new CFClient::UI::Button 966 $vbox->add (new CFPlus::UI::Button
970 expand => 1, 967 expand => 1,
971 text => "Server List", 968 text => "Server List",
972 other => $METASERVER, 969 other => $METASERVER,
973 tooltip => "Show a list of available crossfire servers", 970 tooltip => "Show a list of available crossfire servers",
974 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 971 on_activate => sub { $METASERVER->toggle_visibility; 0 },
975 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 972 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976 ); 973 );
977 } 974 }
978 975
979 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 976 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980 $table->add (1, 4, new CFClient::UI::Entry 977 $table->add (1, 4, new CFPlus::UI::Entry
981 text => $CFG->{profile}{default}{user}, 978 text => $CFG->{profile}{default}{user},
982 tooltip => "The name of your character on the server", 979 tooltip => "The name of your character on the server",
983 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984 ); 981 );
985 982
986 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 983 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987 $table->add (1, 5, new CFClient::UI::Entry 984 $table->add (1, 5, new CFPlus::UI::Entry
988 text => $CFG->{profile}{default}{password}, 985 text => $CFG->{profile}{default}{password},
989 hidden => 1, 986 hidden => 1,
990 tooltip => "The password for your character", 987 tooltip => "The password for your character",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 988 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992 ); 989 );
993 990
994 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 991 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995 $table->add (1, 7, new CFClient::UI::Slider 992 $table->add (1, 7, new CFPlus::UI::Slider
996 force_w => 100, 993 force_w => 100,
997 range => [$CFG->{mapsize}, 10, 100, 0, 1], 994 range => [$CFG->{mapsize}, 10, 100, 0, 1],
998 tooltip => "This is the size of the portion of the map update the server sends you. " 995 tooltip => "This is the size of the portion of the map update the server sends you. "
999 . "If you set this to a high value you will be able to see further, " 996 . "If you set this to a high value you will be able to see further, "
1000 . "but you also increase bandwidth requirements and latency. " 997 . "but you also increase bandwidth requirements and latency. "
1001 . "This option is only used once at log-in.", 998 . "This option is only used once at log-in.",
1002 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 999 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003 ); 1000 );
1004 1001
1005 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1002 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1003 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1004 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1005 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1006 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1007 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1008 . "of faces being ready for display when you encounter them. "
… …
1013 . "so only set it if you really need to prefetch images. " 1010 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1011 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1012 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1013 );
1017 1014
1018 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1015 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019 $table->add (1, 9, new CFClient::UI::Entry 1016 $table->add (1, 9, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1017 text => $CFG->{output_count},
1021 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1018 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1019 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1020 );
1024 1021
1025 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1022 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026 $table->add (1, 10, new CFClient::UI::Entry 1023 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1024 text => $CFG->{output_sync},
1028 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1025 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_sync} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1027 );
1031 1028
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1029 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1030 expand => 1,
1034 align => 0, 1031 align => 0,
1035 text => "Login", 1032 text => "Login",
1036 on_activate => sub { 1033 on_activate => sub {
1037 $CONN ? stop_game 1034 $CONN ? stop_game
1038 : start_game; 1035 : start_game;
1039 0 1036 0
1040 }, 1037 },
1041 ); 1038 );
1042 1039
1043 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1040 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1041 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045 text => $CFG->{say_command}, 1042 text => $CFG->{say_command},
1046 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. " 1043 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. "
1047 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1044 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1045 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049 on_changed => sub { 1046 on_changed => sub {
1050 my ($self, $value) = @_; 1047 my ($self, $value) = @_;
1051 $CFG->{say_command} = $value; 1048 $CFG->{say_command} = $value;
1052 0 1049 0
1053 } 1050 }
1054 ); 1051 );
1055 1052
1053 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1054 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1055 state => $CFG->{show_tips},
1056 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1057 on_changed => sub {
1058 my ($self, $value) = @_;
1059 $CFG->{shop_tips} = $value;
1060 0
1061 }
1062 );
1063
1056 $vbox->add (new CFClient::UI::Label 1064 $vbox->add (new CFPlus::UI::FancyFrame
1057 text => "Server Info", 1065 label => "Server Info",
1058 fontsize => 1.2,
1059 padding_y => 8,
1060 fg => [1, 1, 0, 1],
1061 );
1062
1063 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1066 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1067 );
1064 1068
1065 $vbox 1069 $vbox
1066} 1070}
1067 1071
1068sub message_window { 1072sub message_window {
1069 my $window = new CFClient::UI::FancyFrame 1073 my $window = new CFPlus::UI::Toplevel
1070 name => "message_window", 1074 name => "message_window",
1071 title => "Messages", 1075 title => "Messages",
1072 border_bg => [1, 1, 1, 1], 1076 border_bg => [1, 1, 1, 1],
1073 x => "max", 1077 x => "max",
1074 y => 0, 1078 y => 0,
1075 force_w => $::WIDTH * 0.4, 1079 force_w => $::WIDTH * 0.4,
1076 force_h => $::HEIGHT * 0.5, 1080 force_h => $::HEIGHT * 0.5,
1077 child => (my $vbox = new CFClient::UI::VBox), 1081 child => (my $vbox = new CFPlus::UI::VBox),
1078 has_close_button => 1; 1082 has_close_button => 1;
1079 1083
1080 $vbox->add ($LOGVIEW); 1084 $vbox->add ($LOGVIEW);
1081 1085
1082 $vbox->add (my $input = new CFClient::UI::Entry 1086 $vbox->add (my $input = new CFPlus::UI::Entry
1083 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1087 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1088 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1089 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1090 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087 on_focus_in => sub { 1091 on_focus_in => sub {
… …
1126 }; 1130 };
1127 1131
1128 $window 1132 $window
1129} 1133}
1130 1134
1131sub open_quit_dialog {
1132 unless ($QUIT_DIALOG) {
1133 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1134 x => "center",
1135 y => "center",
1136 z => 50,
1137 title => "Really Quit?",
1138 ;
1139
1140 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142 $vb->add (new CFClient::UI::Label
1143 text => "You should find a savebed and apply it first!",
1144 max_w => $WIDTH * 0.25,
1145 ellipsize => 0,
1146 );
1147 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148 $hb->add (new CFClient::UI::Button
1149 text => "Ok",
1150 expand => 1,
1151 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152 );
1153 $hb->add (new CFClient::UI::Button
1154 text => "Quit anyway",
1155 expand => 1,
1156 on_activate => sub { exit },
1157 );
1158 }
1159
1160 $QUIT_DIALOG->show;
1161}
1162
1163sub autopickup_setup { 1135sub autopickup_setup {
1164 my $table = new CFClient::UI::Table; 1136 my $table = new CFPlus::UI::Table;
1165 1137
1166 for ( 1138 for (
1167 ["General", 0, 0, 1139 ["General", 0, 0,
1168 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1140 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169 ["Inhibit autopickup" => PICKUP_INHIBIT], 1141 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1203 ], 1175 ],
1204 ["Weight/Value ratio", 2, 17] 1176 ["Weight/Value ratio", 2, 17]
1205 ) 1177 )
1206 { 1178 {
1207 my ($title, $x, $y, @bits) = @$_; 1179 my ($title, $x, $y, @bits) = @$_;
1208 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1180 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1209 1181
1210 for (@bits) { 1182 for (@bits) {
1211 ++$y; 1183 ++$y;
1212 1184
1213 my $mask = $_->[1]; 1185 my $mask = $_->[1];
1214 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1186 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1215 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1187 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216 state => $::CFG->{pickup} & $mask, 1188 state => $::CFG->{pickup} & $mask,
1217 on_changed => sub { 1189 on_changed => sub {
1218 my ($box, $value) = @_; 1190 my ($box, $value) = @_;
1219 1191
1220 if ($value) { 1192 if ($value) {
… …
1231 1203
1232 ${$_->[2]} = $checkbox if $_->[2]; 1204 ${$_->[2]} = $checkbox if $_->[2];
1233 } 1205 }
1234 } 1206 }
1235 1207
1236 $table->add (2, 18, new CFClient::UI::ValSlider 1208 $table->add (2, 18, new CFPlus::UI::ValSlider
1237 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1209 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238 template => ">= 99", 1210 template => ">= 99",
1239 to_value => sub { ">= " . 5 * $_[0] }, 1211 to_value => sub { ">= " . 5 * $_[0] },
1240 on_changed => sub { 1212 on_changed => sub {
1241 my ($slider, $value) = @_; 1213 my ($slider, $value) = @_;
… …
1244 $::CFG->{pickup} |= int $value 1216 $::CFG->{pickup} |= int $value
1245 if $value; 1217 if $value;
1246 1; 1218 1;
1247 }); 1219 });
1248 1220
1249 $table->add (3, 18, new CFClient::UI::Button 1221 $table->add (3, 18, new CFPlus::UI::Button
1250 text => "set", 1222 text => "set",
1251 on_activate => sub { 1223 on_activate => sub {
1252 $::CONN->send_command ("pickup $::CFG->{pickup}") 1224 $::CONN->send_command ("pickup $::CFG->{pickup}")
1253 if defined $::CONN; 1225 if defined $::CONN;
1254 0 1226 0
1255 }); 1227 });
1256 1228
1257 $table 1229 $table
1258} 1230}
1259 1231
1232my %SORT_ORDER = (
1233 type => undef,
1234 mtime => sub { sort {
1235 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1236 or $b->{mtime} <=> $a->{mtime}
1237 or $a->{type} <=> $b->{type}
1238 } @_ },
1239 weight => sub { sort {
1240 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1241 or $a->{type} <=> $b->{type}
1242 } @_ },
1243);
1244
1260sub inventory_widget { 1245sub inventory_widget {
1261 my $hb = new CFClient::UI::HBox homogeneous => 1; 1246 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262 1247
1263 $hb->add (my $vb1 = new CFClient::UI::VBox); 1248 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1249 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265 1250
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1251 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267 1252
1268 use sort 'stable'; 1253 use sort 'stable';
1269 1254
1270 $hb1->add (new CFClient::UI::Combobox 1255 $hb1->add (new CFPlus::UI::Selector
1271 value => undef, 1256 value => $::CFG->{inv_sort},
1272 options => [ 1257 options => [
1273 [undef, "Type/Name"], 1258 [type => "Type/Name"],
1274 [ 1259 [mtime => "Recent/Normal/Locked"],
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type", 1260 [weight => "Weight/Type"],
1280 ],
1281 [sub { } => "#TODO#"],
1282 ], 1261 ],
1283 on_changed => sub { 1262 on_changed => sub {
1263 $::CFG->{inv_sort} = $_[1];
1284 $INV->set_sort_order ($_[1]); 1264 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1285 }, 1265 },
1286 ); 1266 );
1287 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1267 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1288 #TODO# update to weigh/maxweight 1268 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1269 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290 1270
1291 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1271 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $sw1->add ($INV = new CFClient::UI::Inventory); 1272 $sw1->add ($INV = new CFPlus::UI::Inventory);
1293 1273
1294 $hb->add (my $vb2 = new CFClient::UI::VBox); 1274 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1295 1275
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1276 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297 1277
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1278 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1299 $sw2->add ($INVR = new CFClient::UI::Inventory); 1279 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1300 1280
1301 # XXX: Call after $INVR = ... because set_opencont sets the items 1281 # XXX: Call after $INVR = ... because set_opencont sets the items
1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1282 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303 1283
1304 $hb 1284 $hb
1305} 1285}
1306 1286
1307sub toggle_player_page { 1287sub toggle_player_page {
… …
1314 $PL_WINDOW->show; 1294 $PL_WINDOW->show;
1315 } 1295 }
1316} 1296}
1317 1297
1318sub player_window { 1298sub player_window {
1319 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1299 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320 x => "center", 1300 x => "center",
1321 y => "center", 1301 y => "center",
1322 force_w => $WIDTH * 9/10, 1302 force_w => $WIDTH * 9/10,
1323 force_h => $HEIGHT * 9/10, 1303 force_h => $HEIGHT * 9/10,
1324 title => "Player", 1304 title => "Player",
… …
1326 has_close_button => 1 1306 has_close_button => 1
1327 ; 1307 ;
1328 1308
1329 my $ntb = 1309 my $ntb =
1330 $PL_NOTEBOOK = 1310 $PL_NOTEBOOK =
1331 new CFClient::UI::Notebook expand => 1, debug => 1; 1311 new CFPlus::UI::Notebook expand => 1, debug => 1;
1332 1312
1333 $ntb->add ( 1313 $ntb->add (
1334 "Statistics (F2)" => $STATS_PAGE = stats_window, 1314 "Statistics (F2)" => $STATS_PAGE = stats_window,
1335 "Shows statistics, where all your Stats and Resistances are shown." 1315 "Shows statistics, where all your Stats and Resistances are shown."
1336 ); 1316 );
1337 $ntb->add ( 1317 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window, 1318 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills." 1319 "Shows all your Skills."
1340 ); 1320 );
1341 1321
1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1322 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1323 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1344 $ntb->add ( 1324 $ntb->add (
1345 "Spellbook (F4)" => $spellsw, 1325 "Spellbook (F4)" => $spellsw,
1346 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1326 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1347 ); 1327 );
1348 $ntb->add ( 1328 $ntb->add (
… …
1360sub update_bindings { 1340sub update_bindings {
1361 $BIND_UPD_CB->() if $BIND_UPD_CB; 1341 $BIND_UPD_CB->() if $BIND_UPD_CB;
1362} 1342}
1363 1343
1364sub keyboard_setup { 1344sub keyboard_setup {
1365 my $binding_list = new CFClient::UI::VBox; 1345 my $binding_list = new CFPlus::UI::VBox;
1366 1346
1367 my $refresh; 1347 my $refresh;
1368 $refresh = $BIND_UPD_CB = sub { 1348 $refresh = $BIND_UPD_CB = sub {
1369 $binding_list->clear (); 1349 $binding_list->clear ();
1370 1350
… …
1372 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1352 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1353 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1354 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375 1355
1376 my $lbl = join "; ", @$cmds; 1356 my $lbl = join "; ", @$cmds;
1377 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1357 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1378 $binding_list->add (my $hb = new CFClient::UI::HBox); 1358 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1379 $hb->add (new CFClient::UI::Button 1359 $hb->add (new CFPlus::UI::Button
1380 text => "delete", 1360 text => "delete",
1381 tooltip => "Deletes the binding", 1361 tooltip => "Deletes the binding",
1382 on_activate => sub { 1362 on_activate => sub {
1383 $binding_list->remove ($hb); 1363 $binding_list->remove ($hb);
1384 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1364 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385 0 1365 0
1386 }); 1366 });
1387 1367
1388 $hb->add (new CFClient::UI::Button 1368 $hb->add (new CFPlus::UI::Button
1389 text => "edit", 1369 text => "edit",
1390 tooltip => "Edits the binding", 1370 tooltip => "Edits the binding",
1391 on_activate => sub { 1371 on_activate => sub {
1392 $::BIND_EDITOR->set_binding ( 1372 $::BIND_EDITOR->set_binding (
1393 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1373 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1406 $::BIND_EDITOR->show; 1386 $::BIND_EDITOR->show;
1407 $SETUP_DIALOG->hide; 1387 $SETUP_DIALOG->hide;
1408 0 1388 0
1409 }); 1389 });
1410 1390
1411 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1391 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1412 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1392 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1413 } 1393 }
1414 } 1394 }
1415 }; 1395 };
1416 1396
1417 my $vb = new CFClient::UI::VBox; 1397 my $vb = new CFPlus::UI::VBox;
1418 $vb->add (my $hb = new CFClient::UI::HBox); 1398 $vb->add (new CFPlus::UI::FancyFrame
1399 label => "Options",
1400 child => (my $hb = new CFPlus::UI::HBox),
1401 );
1419 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1402 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1420 $hb->add (new CFClient::UI::CheckBox 1403 $hb->add (new CFPlus::UI::CheckBox
1421 expand => 1, 1404 expand => 1,
1422 state => $CFG->{shift_fire_stop}, 1405 state => $CFG->{shift_fire_stop},
1423 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1406 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424 on_changed => sub { 1407 on_changed => sub {
1425 my ($cbox, $value) = @_; 1408 my ($cbox, $value) = @_;
1426 $CFG->{shift_fire_stop} = $value; 1409 $CFG->{shift_fire_stop} = $value;
1427 0 1410 0
1428 }); 1411 });
1429 1412
1430 $vb->add ($binding_list); 1413 $vb->add (new CFPlus::UI::FancyFrame
1414 label => "Bindings",
1415 child => $binding_list);
1431 $vb->add (my $hb = new CFClient::UI::HBox); 1416 $vb->add (my $hb = new CFPlus::UI::HBox);
1432 1417
1433 $hb->add (new CFClient::UI::Button 1418 $hb->add (new CFPlus::UI::Button
1434 text => "record new", 1419 text => "record new",
1435 expand => 1, 1420 expand => 1,
1436 tooltip => "This button opens the binding editor with an empty binding.", 1421 tooltip => "This button opens the binding editor with an empty binding.",
1437 on_activate => sub { 1422 on_activate => sub {
1438 $::BIND_EDITOR->set_binding (undef, undef, [], 1423 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1452 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1453 0 1438 0
1454 }, 1439 },
1455 ); 1440 );
1456 1441
1457 $hb->add (new CFClient::UI::Button 1442 $hb->add (new CFPlus::UI::Button
1458 text => "close", 1443 text => "close",
1459 tooltip => "Closes the binding window", 1444 tooltip => "Closes the binding window",
1460 expand => 1, 1445 expand => 1,
1461 on_activate => sub { 1446 on_activate => sub {
1462 $SETUP_DIALOG->hide; 1447 $SETUP_DIALOG->hide;
… …
1467 $refresh->(); 1452 $refresh->();
1468 1453
1469 $vb 1454 $vb
1470} 1455}
1471 1456
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547}
1548
1549sub help_window { 1457sub help_window {
1550 my $win = new CFClient::UI::FancyFrame 1458 my $win = new CFPlus::UI::Toplevel
1551 x => 'center', 1459 x => 'center',
1552 y => 'center', 1460 y => 'center',
1553 z => 2, 1461 z => 4,
1554 name => 'doc_browser', 1462 name => 'doc_browser',
1555 force_w => int $WIDTH * 7/8, 1463 force_w => int $WIDTH * 7/8,
1556 force_h => int $HEIGHT * 7/8, 1464 force_h => int $HEIGHT * 7/8,
1557 title => "Help Browser", 1465 title => "Help Browser",
1558 has_close_button => 1; 1466 has_close_button => 1;
1559 1467
1560 $win->add (my $vbox = new CFClient::UI::VBox); 1468 $win->add (my $vbox = new CFPlus::UI::VBox);
1561 1469
1562 $vbox->add (my $buttons = new CFClient::UI::HBox); 1470 $vbox->add (new CFPlus::UI::FancyFrame
1471 label => "Navigation",
1472 child => (my $buttons = new CFPlus::UI::HBox),
1473 );
1563 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1474 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564 expand => 1, fontsize => 0.8, padding_x => 4); 1475 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565 1476
1566 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1477 my @history;
1567 $buttons->add (my $combo = new CFClient::UI::Combobox 1478 my @future;
1568 value => undef, 1479 my $curnode;
1569 options => [ 1480
1570 [intro => "Introduction"], 1481 my $load_node; $load_node = sub {
1571 [manual => "Main Manual"], 1482 my ($node, $para) = @_;
1572 [skill_help => "Skill Reference"], 1483
1573 [command_help => "Command Reference"], 1484 $buttons->clear;
1574 [dmcommand_help => "DM Commands"], 1485
1575 [COPYING => "License Terms"], 1486 $buttons->add (new CFPlus::UI::Button
1576 [test => "test (do not select)"], #d#TODO 1487 text => "⇤",
1577 ], 1488 tooltip => "back to the starting page",
1578 on_changed => sub { 1489 on_activate => sub {
1579 my ($self, $pod) = @_; 1490 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1491 unshift @future, @history;
1492 @history = ();
1493 $load_node->(@{shift @future});
1494 },
1495 );
1580 1496
1581 if ($pod eq "test") {#d#TODO 1497 if (@history) {
1582 eval { 1498 $buttons->add (new CFPlus::UI::Button
1583 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; 1499 text => "⋘",
1500 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1501 on_activate => sub {
1502 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1503 $load_node->(@{pop @history});
1584 }; 1504 },
1585 warn "$@" if $@; 1505 );
1586 return; 1506 }
1507
1508 if (@future) {
1509 $buttons->add (new CFPlus::UI::Button
1510 text => "⋙",
1511 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1512 on_activate => sub {
1513 push @history, [$curnode, $viewer->current_paragraph];
1514 $load_node->(@{shift @future});
1515 },
1516 );
1517 }
1518
1519 $buttons->add (new CFPlus::UI::Label text => " ");
1520
1521 my @path = CFPlus::Pod::full_path_of $node;
1522 pop @path; # drop current node
1523
1524 for my $node (@path) {
1525 $buttons->add (new CFPlus::UI::Button
1526 text => $node->{kw}[0],
1527 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1528 on_activate => sub {
1529 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1530 $load_node->($node);
1531 },
1532 );
1533 $buttons->add (new CFPlus::UI::Label text => "/");
1534 }
1535
1536 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1537
1538 $curnode = $node;
1539
1540 $viewer->clear;
1541 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1542 $viewer->scroll_to ($para);
1543 };
1544
1545 $load_node->(CFPlus::Pod::find pod => "mainpage");
1546
1547 $CFPlus::Pod::goto_document = sub {
1548 my (@path) = @_;
1549
1550 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1551
1552 $load_node->((CFPlus::Pod::find @path)[0]);
1553 $win->show;
1554 };
1555
1556 $win
1557}
1558
1559sub open_string_query {
1560 my ($title, $cb, $txt, $tooltip) = @_;
1561 my $dialog = new CFPlus::UI::Toplevel
1562 x => "center",
1563 y => "center",
1564 z => 50,
1565 force_w => $WIDTH * 4/5,
1566 title => $title;
1567
1568 $dialog->add (
1569 my $e = new CFPlus::UI::Entry
1570 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1571 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1572 tooltip => $tooltip
1573 );
1574
1575 $e->grab_focus;
1576 $e->set_text ($txt) if $txt;
1577 $dialog->show;
1578}
1579
1580sub open_quit_dialog {
1581 unless ($QUIT_DIALOG) {
1582 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1583 x => "center",
1584 y => "center",
1585 z => 50,
1586 title => "Really Quit?",
1587 on_key_down => sub {
1588 my ($dialog, $ev) = @_;
1589 $ev->{sym} == 27 and $dialog->hide;
1587 } 1590 }
1588
1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592 #use Data::Dumper; warn Dumper $pom;#d#
1593
1594 $viewer->clear;
1595
1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1599# ]);#d#
1600 1591 ;
1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602 for @$pom;
1603 1592
1604 $viewer->set_offset (0); 1593 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1605 1594
1606 0 1595 $vb->add (new CFPlus::UI::Label
1596 text => "You should find a savebed and apply it first!",
1597 max_w => $WIDTH * 0.25,
1598 ellipsize => 0,
1599 );
1600 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1601 $hb->add (new CFPlus::UI::Button
1602 text => "Ok",
1603 expand => 1,
1604 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1605 );
1606 $hb->add (new CFPlus::UI::Button
1607 text => "Quit anyway",
1608 expand => 1,
1609 on_activate => sub { exit },
1610 );
1611 }
1612
1613 $QUIT_DIALOG->show;
1614 $QUIT_DIALOG->grab_focus;
1615}
1616
1617sub show_tip_of_the_day {
1618 # find all tips
1619 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1620
1621 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1622 $todindex = 0 if $todindex >= @tod;
1623 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1624
1625 # create dialog
1626 my $dialog;
1627
1628 my $close = sub {
1629 $dialog->destroy;
1630 };
1631
1632 $dialog = new CFPlus::UI::Toplevel
1633 x => "center",
1634 y => "center",
1635 z => 3,
1636 name => 'tip_of_the_day',
1637 force_w => int $WIDTH * 4/9,
1638 force_h => int $WIDTH * 2/9,
1639 title => "Tip of the day #" . (1 + $todindex),
1640 child => my $vbox = new CFPlus::UI::VBox,
1641 has_close_button => 1,
1642 on_delete => $close,
1643 ;
1644
1645 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1646 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1647 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1648
1649 $vbox->add (my $table = new CFPlus::UI::Table);
1650
1651 $table->add (0, 0, new CFPlus::UI::Button
1652 text => "Close",
1653 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1654 on_activate => $close,
1655 );
1656
1657 $table->add (2, 0, new CFPlus::UI::Button
1658 text => "Next",
1659 tooltip => "Show the next <b>Tip of the day</b>.",
1660 on_activate => sub {
1661 $close->();
1662 &show_tip_of_the_day;
1607 }, 1663 },
1608 on_visibility_change => sub {
1609 my ($self, $visible) = @_;
1610 return unless $visible;
1611 return if $self->{value};
1612 $self->set_value ("intro");
1613 0
1614 },
1615 ); 1664 );
1616 1665
1617 $win 1666 $dialog->show;
1618} 1667}
1619 1668
1620sub sdl_init { 1669sub sdl_init {
1621 CFClient::SDL_Init 1670 CFPlus::SDL_Init
1622 and die "SDL::Init failed!\n"; 1671 and die "SDL::Init failed!\n";
1623} 1672}
1624 1673
1625sub video_init { 1674sub video_init {
1626 sdl_init; 1675 sdl_init;
… …
1631 1680
1632 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1681 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633 $FULLSCREEN = $CFG->{fullscreen}; 1682 $FULLSCREEN = $CFG->{fullscreen};
1634 $FAST = $CFG->{fast}; 1683 $FAST = $CFG->{fast};
1635 1684
1636 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1685 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1637 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1686 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638 1687
1639 $SDL_ACTIVE = 1; 1688 $SDL_ACTIVE = 1;
1640 $LAST_REFRESH = time - 0.01; 1689 $LAST_REFRESH = time - 0.01;
1641 1690
1642 CFClient::OpenGL::init; 1691 CFPlus::OpenGL::init;
1643 1692
1644 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1693 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645 1694
1646 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1695 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647 1696
1648 ############################################################################# 1697 #############################################################################
1649 1698
1650 if ($DEBUG_STATUS) { 1699 if ($DEBUG_STATUS) {
1651 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1700 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652 } else { 1701 } else {
1653 # create the widgets 1702 # create the widgets
1654 1703
1655 $DEBUG_STATUS = new CFClient::UI::Label 1704 $DEBUG_STATUS = new CFPlus::UI::Label
1656 padding => 0, 1705 padding => 0,
1657 z => 100, 1706 z => 100,
1658 force_x => "max", 1707 force_x => "max",
1659 force_y => 0; 1708 force_y => 0;
1660 $DEBUG_STATUS->show; 1709 $DEBUG_STATUS->show;
1661 1710
1662 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1711 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1663 1712
1664 $STATUSBOX = new CFClient::UI::Statusbox; 1713 $STATUSBOX = new CFPlus::UI::Statusbox;
1665 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1714 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1666 1715
1667 (new CFClient::UI::Frame 1716 (new CFPlus::UI::Frame
1668 bg => [0, 0, 0, 0.4], 1717 bg => [0, 0, 0, 0.4],
1669 force_x => 0, 1718 force_x => 0,
1670 force_y => "max", 1719 force_y => "max",
1671 child => $STATUSBOX, 1720 child => $STATUSBOX,
1672 )->show; 1721 )->show;
1673 1722
1674 CFClient::UI::FancyFrame->new ( 1723 CFPlus::UI::Toplevel->new (
1675 title => "Map", 1724 title => "Map",
1676 name => "mapmap", 1725 name => "mapmap",
1677 x => 0, 1726 x => 0,
1678 y => $FONTSIZE + 8, 1727 y => $FONTSIZE + 8,
1679 border_bg => [1, 1, 1, 192/255], 1728 border_bg => [1, 1, 1, 192/255],
1680 bg => [1, 1, 1, 0], 1729 bg => [1, 1, 1, 0],
1681 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1730 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1731 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1683 ), 1732 ),
1684 )->show; 1733 )->show;
1685 1734
1686 $MAPWIDGET = new CFClient::MapWidget; 1735 $MAPWIDGET = new CFPlus::MapWidget;
1687 $MAPWIDGET->connect (activate_console => sub { 1736 $MAPWIDGET->connect (activate_console => sub {
1688 my ($mapwidget, $preset) = @_; 1737 my ($mapwidget, $preset) = @_;
1689 1738
1690 if ($CONSOLE) { 1739 if ($CONSOLE) {
1691 $CONSOLE->{input}->{auto_activated} = 1; 1740 $CONSOLE->{input}->{auto_activated} = 1;
… …
1697 } 1746 }
1698 }); 1747 });
1699 $MAPWIDGET->show; 1748 $MAPWIDGET->show;
1700 $MAPWIDGET->grab_focus; 1749 $MAPWIDGET->grab_focus;
1701 1750
1702 $LOGVIEW = new CFClient::UI::TextScroller 1751 $LOGVIEW = new CFPlus::UI::TextScroller
1703 expand => 1, 1752 expand => 1,
1704 font => $FONT_FIXED, 1753 font => $FONT_FIXED,
1705 fontsize => $::CFG->{log_fontsize}, 1754 fontsize => $::CFG->{log_fontsize},
1706 indent => -4, 1755 indent => -4,
1707 can_hover => 1, 1756 can_hover => 1,
1708 can_events => 1, 1757 can_events => 1,
1709 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1758 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1710 ; 1759 ;
1711 1760
1712 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1761 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1713 title => "Setup", 1762 title => "Setup",
1714 name => "setup_dialog", 1763 name => "setup_dialog",
1715 x => 'center', 1764 x => 'center',
1716 y => 'center', 1765 y => 'center',
1717 z => 2, 1766 z => 2,
… …
1720 has_close_button => 1, 1769 has_close_button => 1,
1721 ; 1770 ;
1722 1771
1723 $METASERVER = metaserver_dialog; 1772 $METASERVER = metaserver_dialog;
1724 1773
1725 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1774 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1726 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1775 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727 1776
1728 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1777 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1729 "Configure the server to play on, your username, password and other server-related options."); 1778 "Configure the server to play on, your username, password and other server-related options.");
1730 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1779 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1731 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1780 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1741 . "After pressing the combo the binding will be saved automatically and the " 1790 . "After pressing the combo the binding will be saved automatically and the "
1742 . "binding editor closes"); 1791 . "binding editor closes");
1743 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1792 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1744 "Some debuggin' options. Do not ask."); 1793 "Some debuggin' options. Do not ask.");
1745 1794
1746 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1795 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1747 1796
1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1797 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1798 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1750 1799
1751 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1752 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1801 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1753 1802
1754 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 1803 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
1755 1804
1756 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1805 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1806 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1758 1807
1759 $BUTTONBAR->add (new CFClient::UI::Button 1808 $BUTTONBAR->add (new CFPlus::UI::Button
1760 text => "Save Config", 1809 text => "Save Config",
1761 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1810 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1762 on_activate => sub { 1811 on_activate => sub {
1763 $::CFG->{layout} = CFClient::UI::get_layout; 1812 $::CFG->{layout} = CFPlus::UI::get_layout;
1764 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1813 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765 status "Configuration Saved"; 1814 status "Configuration Saved";
1766 0 1815 0
1767 }, 1816 },
1768 ); 1817 );
1769 1818
1770 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1819 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1771 tooltip => "View Documentation"); 1820 tooltip => "View Documentation");
1772 1821
1773 $BUTTONBAR->add (new CFClient::UI::Button 1822 $BUTTONBAR->add (new CFPlus::UI::Button
1774 text => "Quit", 1823 text => "Quit",
1775 tooltip => "Terminates the program", 1824 tooltip => "Terminates the program",
1776 on_activate => sub { 1825 on_activate => sub {
1777 if ($CONN) { 1826 if ($CONN) {
1778 open_quit_dialog; 1827 open_quit_dialog;
… …
1789 1838
1790 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1839 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1791} 1840}
1792 1841
1793sub video_shutdown { 1842sub video_shutdown {
1794 CFClient::OpenGL::shutdown; 1843 CFPlus::OpenGL::shutdown;
1795 1844
1796 undef $SDL_ACTIVE; 1845 undef $SDL_ACTIVE;
1797} 1846}
1798 1847
1799my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1848my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1807 1856
1808sub audio_music_finished { 1857sub audio_music_finished {
1809 return unless $CFG->{bgm_enable}; 1858 return unless $CFG->{bgm_enable};
1810 1859
1811 # TODO: hack, do play loop and mood music 1860 # TODO: hack, do play loop and mood music
1812 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1861 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1813 $bgmusic->play (0); 1862 $bgmusic->play (0);
1814 1863
1815 push @bgmusic, shift @bgmusic; 1864 push @bgmusic, shift @bgmusic;
1816} 1865}
1817 1866
1818sub audio_init { 1867sub audio_init {
1819 if ($CFG->{audio_enable}) { 1868 if ($CFG->{audio_enable}) {
1820 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1869 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1870 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822 1871
1823 unless ($SDL_MIXER) { 1872 unless ($SDL_MIXER) {
1824 status "Unable to open sound device: there will be no sound"; 1873 status "Unable to open sound device: there will be no sound";
1825 return; 1874 return;
1826 } 1875 }
1827 1876
1828 CFClient::Mix_AllocateChannels 8; 1877 CFPlus::Mix_AllocateChannels 8;
1829 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1878 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830 1879
1831 audio_music_finished; 1880 audio_music_finished;
1832 1881
1833 while (<$fh>) { 1882 while (<$fh>) {
1834 next if /^\s*#/; 1883 next if /^\s*#/;
… …
1837 my ($file, $volume, $event) = split /\s+/, $_, 3; 1886 my ($file, $volume, $event) = split /\s+/, $_, 3;
1838 1887
1839 push @SOUNDS, "$volume,$file"; 1888 push @SOUNDS, "$volume,$file";
1840 1889
1841 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1890 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1891 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843 $chunk->volume ($volume * 128 / 100); 1892 $chunk->volume ($volume * 128 / 100);
1844 $chunk 1893 $chunk
1845 }; 1894 };
1846 } 1895 }
1847 } else { 1896 } else {
… …
1849 } 1898 }
1850 } 1899 }
1851} 1900}
1852 1901
1853sub audio_shutdown { 1902sub audio_shutdown {
1854 CFClient::Mix_CloseAudio if $SDL_MIXER; 1903 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855 undef $SDL_MIXER; 1904 undef $SDL_MIXER;
1856 @SOUNDS = (); 1905 @SOUNDS = ();
1857 %AUDIO_CHUNKS = (); 1906 %AUDIO_CHUNKS = ();
1858} 1907}
1859 1908
… …
1866 1915
1867sub force_refresh { 1916sub force_refresh {
1868 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1917 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1918 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870 1919
1871 $CFClient::UI::ROOT->draw; 1920 $CFPlus::UI::ROOT->draw;
1872 1921
1873 $WANT_REFRESH = 0; 1922 $WANT_REFRESH = 0;
1874 $CAN_REFRESH = 0; 1923 $CAN_REFRESH = 0;
1875 $LAST_REFRESH = $NOW; 1924 $LAST_REFRESH = $NOW;
1876 1925
1877 CFClient::SDL_GL_SwapBuffers; 1926 CFPlus::SDL_GL_SwapBuffers;
1878} 1927}
1879 1928
1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1929my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881 $NOW = time; 1930 $NOW = time;
1882 1931
1883 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1932 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884 for CFClient::SDL_PollEvent; 1933 for CFPlus::SDL_PollEvent;
1885 1934
1886 if (%animate_object) { 1935 if (%animate_object) {
1887 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1936 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888 $WANT_REFRESH++; 1937 $WANT_REFRESH++;
1889 } 1938 }
… …
1913 $CONN->face_prefetch 1962 $CONN->face_prefetch
1914 if $CONN; 1963 if $CONN;
1915}); 1964});
1916 1965
1917%SDL_CB = ( 1966%SDL_CB = (
1918 CFClient::SDL_QUIT => sub { 1967 CFPlus::SDL_QUIT => sub {
1919 Event::unloop -1; 1968 Event::unloop -1;
1920 }, 1969 },
1921 CFClient::SDL_VIDEORESIZE => sub { 1970 CFPlus::SDL_VIDEORESIZE => sub {
1922 }, 1971 },
1923 CFClient::SDL_VIDEOEXPOSE => sub { 1972 CFPlus::SDL_VIDEOEXPOSE => sub {
1924 CFClient::UI::full_refresh; 1973 CFPlus::UI::full_refresh;
1925 }, 1974 },
1926 CFClient::SDL_ACTIVEEVENT => sub { 1975 CFPlus::SDL_ACTIVEEVENT => sub {
1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1976# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1928 }, 1977 },
1929 CFClient::SDL_KEYDOWN => sub { 1978 CFPlus::SDL_KEYDOWN => sub {
1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1979 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931 # alt-enter 1980 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle; 1981 $FULLSCREEN_ENABLE->toggle;
1933 video_shutdown; 1982 video_shutdown;
1934 video_init; 1983 video_init;
1935 } else { 1984 } else {
1936 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1985 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937 } 1986 }
1938 }, 1987 },
1939 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1988 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1989 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1990 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1991 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943 CFClient::SDL_USEREVENT => sub { 1992 CFPlus::SDL_USEREVENT => sub {
1944 if ($_[0]{code} == 1) { 1993 if ($_[0]{code} == 1) {
1945 audio_channel_finished $_[0]{data1}; 1994 audio_channel_finished $_[0]{data1};
1946 } elsif ($_[0]{code} == 0) { 1995 } elsif ($_[0]{code} == 0) {
1947 audio_music_finished; 1996 audio_music_finished;
1948 } 1997 }
… …
1952############################################################################# 2001#############################################################################
1953 2002
1954$SIG{INT} = $SIG{TERM} = sub { exit }; 2003$SIG{INT} = $SIG{TERM} = sub { exit };
1955 2004
1956{ 2005{
1957 local $SIG{__DIE__} = sub {
1958 return unless defined $^S && !$^S;
1959 Carp::confess $_[0];#d#TODO: remove when stable
1960 CFClient::fatal $_[0];
1961 };
1962
1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2006 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1964 CFClient::UI::set_layout ($::CFG->{layout}); 2007 CFPlus::UI::set_layout ($::CFG->{layout});
1965 2008
1966 my %DEF_CFG = ( 2009 my %DEF_CFG = (
1967 sdl_mode => 0, 2010 sdl_mode => 0,
1968 width => 640, 2011 width => 640,
1969 height => 480, 2012 height => 480,
… …
1985 bgm_volume => 0.25, 2028 bgm_volume => 0.25,
1986 face_prefetch => 0, 2029 face_prefetch => 0,
1987 output_sync => 1, 2030 output_sync => 1,
1988 output_count => 1, 2031 output_count => 1,
1989 pickup => 0, 2032 pickup => 0,
2033 inv_sort => "mtime",
1990 default => "profile", # default profile 2034 default => "profile", # default profile
2035 show_tips => 1,
1991 ); 2036 );
1992 2037
1993 while (my ($k, $v) = each %DEF_CFG) { 2038 while (my ($k, $v) = each %DEF_CFG) {
1994 $CFG->{$k} = $v unless exists $CFG->{$k}; 2039 $CFG->{$k} = $v unless exists $CFG->{$k};
1995 } 2040 }
… …
1998 2043
1999 sdl_init; 2044 sdl_init;
2000 2045
2001 @SDL_MODES = reverse 2046 @SDL_MODES = reverse
2002 grep $_->[0] >= 640 && $_->[1] >= 480, 2047 grep $_->[0] >= 640 && $_->[1] >= 480,
2003 CFClient::SDL_ListModes; 2048 CFPlus::SDL_ListModes;
2004 2049
2005 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2050 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2006 2051
2007 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2052 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008 2053
2009 { 2054 {
2010 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2055 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011 DejaVuSans.ttf 2056 DejaVuSans.ttf
2012 DejaVuSansMono.ttf 2057 DejaVuSansMono.ttf
2013 DejaVuSans-Bold.ttf 2058 DejaVuSans-Bold.ttf
2014 DejaVuSansMono-Bold.ttf 2059 DejaVuSansMono-Bold.ttf
2015 DejaVuSans-Oblique.ttf 2060 DejaVuSans-Oblique.ttf
2016 DejaVuSansMono-Oblique.ttf 2061 DejaVuSansMono-Oblique.ttf
2017 DejaVuSans-BoldOblique.ttf 2062 DejaVuSans-BoldOblique.ttf
2018 DejaVuSansMono-BoldOblique.ttf 2063 DejaVuSansMono-BoldOblique.ttf
2019 ); 2064 );
2020 2065
2021 CFClient::add_font $_ for @fonts; 2066 CFPlus::add_font $_ for @fonts;
2022 2067
2023 CFClient::pango_init; 2068 CFPlus::pango_init;
2024 2069
2025 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2070 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2071 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027 2072
2028 $FONT_PROP->make_default; 2073 $FONT_PROP->make_default;
2029 } 2074 }
2030 2075
2031# compare mono (ft) vs. rgba (cairo) 2076# compare mono (ft) vs. rgba (cairo)
2032# ft - 1.8s, cairo 3s, even in alpha-only mode 2077# ft - 1.8s, cairo 3s, even in alpha-only mode
2033# for my $rgba (0..1) { 2078# for my $rgba (0..1) {
2034# my $t1 = Time::HiRes::time; 2079# my $t1 = Time::HiRes::time;
2035# for (1..1000) { 2080# for (1..1000) {
2036# my $layout = CFClient::Layout->new ($rgba); 2081# my $layout = CFPlus::Layout->new ($rgba);
2037# $layout->set_text ("hallo" x 100); 2082# $layout->set_text ("hallo" x 100);
2038# $layout->render; 2083# $layout->render;
2039# } 2084# }
2040# my $t2 = Time::HiRes::time; 2085# my $t2 = Time::HiRes::time;
2041# warn $t2-$t1; 2086# warn $t2-$t1;
… …
2043 2088
2044 video_init; 2089 video_init;
2045 audio_init; 2090 audio_init;
2046} 2091}
2047 2092
2093show_tip_of_the_day if $CFG->{show_tips};
2094
2048Event::loop; 2095Event::loop;
2049#CFClient::SDL_Quit; 2096#CFPlus::SDL_Quit;
2050#CFClient::_exit 0; 2097#CFPlus::_exit 0;
2051 2098
2052END { CFClient::SDL_Quit } 2099END { CFPlus::SDL_Quit }
2053 2100
2054=head1 NAME 2101=head1 NAME
2055 2102
2056cfplus - A Crossfire+ and Crossfire game client 2103cfplus - A Crossfire+ and Crossfire game client
2057 2104

Diff Legend

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