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

Diff Legend

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