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

Diff Legend

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