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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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