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.98 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 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 $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
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 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1130sub open_quit_dialog { 1149sub open_quit_dialog {
1131 unless ($QUIT_DIALOG) { 1150 unless ($QUIT_DIALOG) {
1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1133 x => "center", 1152 x => "center",
1134 y => "center", 1153 y => "center",
1135 z => 50, 1154 z => 50,
1136 title => "Really Quit?", 1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1137 ; 1160 ;
1138 1161
1139 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1140 1163
1141 $vb->add (new CFClient::UI::Label 1164 $vb->add (new CFPlus::UI::Label
1142 text => "You should find a savebed and apply it first!", 1165 text => "You should find a savebed and apply it first!",
1143 max_w => $WIDTH * 0.25, 1166 max_w => $WIDTH * 0.25,
1144 ellipsize => 0, 1167 ellipsize => 0,
1145 ); 1168 );
1146 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1147 $hb->add (new CFClient::UI::Button 1170 $hb->add (new CFPlus::UI::Button
1148 text => "Ok", 1171 text => "Ok",
1149 expand => 1, 1172 expand => 1,
1150 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1151 ); 1174 );
1152 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFPlus::UI::Button
1153 text => "Quit anyway", 1176 text => "Quit anyway",
1154 expand => 1, 1177 expand => 1,
1155 on_activate => sub { exit }, 1178 on_activate => sub { exit },
1156 ); 1179 );
1157 } 1180 }
1158 1181
1159 $QUIT_DIALOG->show; 1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1160} 1184}
1161 1185
1162sub autopickup_setup { 1186sub autopickup_setup {
1163 my $table = new CFClient::UI::Table; 1187 my $table = new CFPlus::UI::Table;
1164 1188
1165 for ( 1189 for (
1166 ["General", 0, 0, 1190 ["General", 0, 0,
1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1168 ["Inhibit autopickup" => PICKUP_INHIBIT], 1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1202 ], 1226 ],
1203 ["Weight/Value ratio", 2, 17] 1227 ["Weight/Value ratio", 2, 17]
1204 ) 1228 )
1205 { 1229 {
1206 my ($title, $x, $y, @bits) = @$_; 1230 my ($title, $x, $y, @bits) = @$_;
1207 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1208 1232
1209 for (@bits) { 1233 for (@bits) {
1210 ++$y; 1234 ++$y;
1211 1235
1212 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $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 1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1215 state => $::CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1216 on_changed => sub { 1240 on_changed => sub {
1217 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1218 1242
1219 if ($value) { 1243 if ($value) {
… …
1230 1254
1231 ${$_->[2]} = $checkbox if $_->[2]; 1255 ${$_->[2]} = $checkbox if $_->[2];
1232 } 1256 }
1233 } 1257 }
1234 1258
1235 $table->add (2, 18, new CFClient::UI::ValSlider 1259 $table->add (2, 18, new CFPlus::UI::ValSlider
1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99", 1261 template => ">= 99",
1238 to_value => sub { ">= " . 5 * $_[0] }, 1262 to_value => sub { ">= " . 5 * $_[0] },
1239 on_changed => sub { 1263 on_changed => sub {
1240 my ($slider, $value) = @_; 1264 my ($slider, $value) = @_;
… …
1243 $::CFG->{pickup} |= int $value 1267 $::CFG->{pickup} |= int $value
1244 if $value; 1268 if $value;
1245 1; 1269 1;
1246 }); 1270 });
1247 1271
1248 $table->add (3, 18, new CFClient::UI::Button 1272 $table->add (3, 18, new CFPlus::UI::Button
1249 text => "set", 1273 text => "set",
1250 on_activate => sub { 1274 on_activate => sub {
1251 $::CONN->send_command ("pickup $::CFG->{pickup}") 1275 $::CONN->send_command ("pickup $::CFG->{pickup}")
1252 if defined $::CONN; 1276 if defined $::CONN;
1253 0 1277 0
1254 }); 1278 });
1255 1279
1256 $table 1280 $table
1257} 1281}
1258 1282
1283my %SORT_ORDER = (
1284 type => undef,
1285 mtime => sub { sort {
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime}
1288 or $a->{type} <=> $b->{type}
1289 } @_ },
1290 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type}
1293 } @_ },
1294);
1295
1259sub inventory_widget { 1296sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1; 1297 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1261 1298
1262 $hb->add (my $vb1 = new CFClient::UI::VBox); 1299 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1300 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1301
1302 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1303
1304 use sort 'stable';
1305
1306 $hb1->add (new CFPlus::UI::Selector
1307 value => $::CFG->{inv_sort},
1308 options => [
1309 [type => "Type/Name"],
1310 [mtime => "Recent/Normal/Locked"],
1311 [weight => "Weight/Type"],
1312 ],
1313 on_changed => sub {
1314 $::CFG->{inv_sort} = $_[1];
1315 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1316 },
1317 );
1318 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1319 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321
1264 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1265 $sw1->add ($INV = new CFClient::UI::Inventory); 1323 $sw1->add ($INV = new CFPlus::UI::Inventory);
1266 1324
1267 $hb->add (my $vb2 = new CFClient::UI::VBox); 1325 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1268 1326
1269 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1270 1328
1271 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1329 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 $sw2->add ($INVR = new CFClient::UI::Inventory); 1330 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1273 1331
1274 # XXX: Call after $INVR = ... because set_opencont sets the items 1332 # XXX: Call after $INVR = ... because set_opencont sets the items
1275 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1333 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1276 1334
1277 $hb 1335 $hb
1278} 1336}
1279 1337
1280sub toggle_player_page { 1338sub toggle_player_page {
… …
1287 $PL_WINDOW->show; 1345 $PL_WINDOW->show;
1288 } 1346 }
1289} 1347}
1290 1348
1291sub player_window { 1349sub player_window {
1292 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1350 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1293 x => "center", 1351 x => "center",
1294 y => "center", 1352 y => "center",
1295 force_w => $WIDTH * 9/10, 1353 force_w => $WIDTH * 9/10,
1296 force_h => $HEIGHT * 9/10, 1354 force_h => $HEIGHT * 9/10,
1297 title => "Player", 1355 title => "Player",
… …
1299 has_close_button => 1 1357 has_close_button => 1
1300 ; 1358 ;
1301 1359
1302 my $ntb = 1360 my $ntb =
1303 $PL_NOTEBOOK = 1361 $PL_NOTEBOOK =
1304 new CFClient::UI::Notebook expand => 1, debug => 1; 1362 new CFPlus::UI::Notebook expand => 1, debug => 1;
1305 1363
1306 $ntb->add ( 1364 $ntb->add (
1307 "Statistics (F2)" => $STATS_PAGE = stats_window, 1365 "Statistics (F2)" => $STATS_PAGE = stats_window,
1308 "Shows statistics, where all your Stats and Resistances are shown." 1366 "Shows statistics, where all your Stats and Resistances are shown."
1309 ); 1367 );
1310 $ntb->add ( 1368 $ntb->add (
1311 "Skills (F3)" => $SKILL_PAGE = skill_window, 1369 "Skills (F3)" => $SKILL_PAGE = skill_window,
1312 "Shows all your Skills." 1370 "Shows all your Skills."
1313 ); 1371 );
1314 1372
1315 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1316 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1317 $ntb->add ( 1375 $ntb->add (
1318 "Spellbook (F4)" => $spellsw, 1376 "Spellbook (F4)" => $spellsw,
1319 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1377 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1320 ); 1378 );
1321 $ntb->add ( 1379 $ntb->add (
… …
1333sub update_bindings { 1391sub update_bindings {
1334 $BIND_UPD_CB->() if $BIND_UPD_CB; 1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1335} 1393}
1336 1394
1337sub keyboard_setup { 1395sub keyboard_setup {
1338 my $binding_list = new CFClient::UI::VBox; 1396 my $binding_list = new CFPlus::UI::VBox;
1339 1397
1340 my $refresh; 1398 my $refresh;
1341 $refresh = $BIND_UPD_CB = sub { 1399 $refresh = $BIND_UPD_CB = sub {
1342 $binding_list->clear (); 1400 $binding_list->clear ();
1343 1401
… …
1345 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1346 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1347 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1348 1406
1349 my $lbl = join "; ", @$cmds; 1407 my $lbl = join "; ", @$cmds;
1350 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1351 $binding_list->add (my $hb = new CFClient::UI::HBox); 1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1352 $hb->add (new CFClient::UI::Button 1410 $hb->add (new CFPlus::UI::Button
1353 text => "delete", 1411 text => "delete",
1354 tooltip => "Deletes the binding", 1412 tooltip => "Deletes the binding",
1355 on_activate => sub { 1413 on_activate => sub {
1356 $binding_list->remove ($hb); 1414 $binding_list->remove ($hb);
1357 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1358 0 1416 0
1359 }); 1417 });
1360 1418
1361 $hb->add (new CFClient::UI::Button 1419 $hb->add (new CFPlus::UI::Button
1362 text => "edit", 1420 text => "edit",
1363 tooltip => "Edits the binding", 1421 tooltip => "Edits the binding",
1364 on_activate => sub { 1422 on_activate => sub {
1365 $::BIND_EDITOR->set_binding ( 1423 $::BIND_EDITOR->set_binding (
1366 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1379 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1380 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1381 0 1439 0
1382 }); 1440 });
1383 1441
1384 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1385 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1386 } 1444 }
1387 } 1445 }
1388 }; 1446 };
1389 1447
1390 my $vb = new CFClient::UI::VBox; 1448 my $vb = new CFPlus::UI::VBox;
1391 $vb->add (my $hb = new CFClient::UI::HBox); 1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1392 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1393 $hb->add (new CFClient::UI::CheckBox 1454 $hb->add (new CFPlus::UI::CheckBox
1394 expand => 1, 1455 expand => 1,
1395 state => $CFG->{shift_fire_stop}, 1456 state => $CFG->{shift_fire_stop},
1396 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1397 on_changed => sub { 1458 on_changed => sub {
1398 my ($cbox, $value) = @_; 1459 my ($cbox, $value) = @_;
1399 $CFG->{shift_fire_stop} = $value; 1460 $CFG->{shift_fire_stop} = $value;
1400 0 1461 0
1401 }); 1462 });
1402 1463
1403 $vb->add ($binding_list); 1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1404 $vb->add (my $hb = new CFClient::UI::HBox); 1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1405 1468
1406 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFPlus::UI::Button
1407 text => "record new", 1470 text => "record new",
1408 expand => 1, 1471 expand => 1,
1409 tooltip => "This button opens the binding editor with an empty binding.", 1472 tooltip => "This button opens the binding editor with an empty binding.",
1410 on_activate => sub { 1473 on_activate => sub {
1411 $::BIND_EDITOR->set_binding (undef, undef, [], 1474 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1425 $::BIND_EDITOR->show; 1488 $::BIND_EDITOR->show;
1426 0 1489 0
1427 }, 1490 },
1428 ); 1491 );
1429 1492
1430 $hb->add (new CFClient::UI::Button 1493 $hb->add (new CFPlus::UI::Button
1431 text => "close", 1494 text => "close",
1432 tooltip => "Closes the binding window", 1495 tooltip => "Closes the binding window",
1433 expand => 1, 1496 expand => 1,
1434 on_activate => sub { 1497 on_activate => sub {
1435 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
… …
1440 $refresh->(); 1503 $refresh->();
1441 1504
1442 $vb 1505 $vb
1443} 1506}
1444 1507
1445# just weirdness, pls. ignore
1446sub load_html_page {
1447 my ($viewer, $base) = @_;
1448
1449 $viewer->clear;
1450
1451 require LWP::Simple;
1452 require HTML::Parser;
1453 require URI;
1454
1455 my $page = LWP::Simple::get ($base)
1456 or return;
1457
1458 my @s = { };
1459 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1460
1461 my $parser = HTML::Parser->new (
1462 text_h => [sub {
1463 my ($text) = @_;
1464 $text =~ s/\s+/ /g;
1465 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1466 }, "dtext"],
1467 start_h => [sub {
1468 my ($tag, $attr) = @_;
1469 if ($passthrough{$tag}) {
1470 $s[-1]{text} .= "<$tag>";
1471 } elsif ($tag eq "h1") {
1472 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1473 } elsif ($tag eq "h2") {
1474 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1475 } elsif ($tag eq "h3") {
1476 push @s, { text => "<span size='large'>" };
1477 } elsif ($tag eq "a") {
1478 push @s, { text => "", url => $attr->{href} };
1479 } elsif ($tag eq "p") {
1480 push @s, { };
1481 } elsif ($tag eq "img") {
1482 eval {
1483 push @{$s[-1]{obj}}, new CFClient::UI::Image
1484 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1485 $s[-1]{text} .= "\x{fffc}";
1486 };
1487 }
1488 }, "tagname, attr"],
1489 end_h => [sub {
1490 my ($tag) = @_;
1491 if ($passthrough{$tag}) {
1492 $s[-1]{text} .= "</$tag>";
1493 } elsif ($tag =~ /^h\d$/) {
1494 $s[-1]{text} .= "</span>";
1495 push @s, { };
1496 } elsif ($tag eq "a") {
1497 my $S = pop @s;
1498 $s[-1]{text} .= "\x{fffc}";
1499 push @{$s[-1]{obj}}, new CFClient::UI::Label
1500 fg => [0.8, 0.8, 1],
1501 markup => "<u>$S->{text}</u>",
1502 fontsize => 0.8,
1503 can_events => 1,
1504 can_focus => 1,
1505 on_button_up => sub {
1506 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1507 },
1508 ;
1509 }
1510 }, "tagname"],
1511 );
1512
1513 $parser->parse ($page);
1514 $parser->eof;
1515
1516 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1517 for @s;
1518
1519 $viewer->set_offset (0);
1520}
1521
1522sub help_window { 1508sub help_window {
1523 my $win = new CFClient::UI::FancyFrame 1509 my $win = new CFPlus::UI::Toplevel
1524 x => 'center', 1510 x => 'center',
1525 y => 'center', 1511 y => 'center',
1526 z => 2, 1512 z => 2,
1527 name => 'doc_browser', 1513 name => 'doc_browser',
1528 force_w => int $WIDTH * 7/8, 1514 force_w => int $WIDTH * 7/8,
1529 force_h => int $HEIGHT * 7/8, 1515 force_h => int $HEIGHT * 7/8,
1530 title => "Help Browser", 1516 title => "Help Browser",
1531 has_close_button => 1; 1517 has_close_button => 1;
1532 1518
1533 $win->add (my $vbox = new CFClient::UI::VBox); 1519 $win->add (my $vbox = new CFPlus::UI::VBox);
1534 1520
1535 $vbox->add (my $buttons = new CFClient::UI::HBox); 1521 $vbox->add (new CFPlus::UI::FancyFrame
1522 label => "Navigation",
1523 child => (my $buttons = new CFPlus::UI::HBox),
1524 );
1536 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1537 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1538 1527
1539 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1528 my @history;
1540 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 my @future;
1541 value => undef, 1530 my $curnode;
1542 options => [ 1531
1543 [intro => "Introduction"], 1532 my $load_node; $load_node = sub {
1544 [manual => "Main Manual"], 1533 my ($node, $para) = @_;
1545 [skill_help => "Skill Reference"], 1534
1546 [command_help => "Command Reference"], 1535 $buttons->clear;
1547 [dmcommand_help => "DM Commands"], 1536
1548 [COPYING => "License Terms"], 1537 $buttons->add (new CFPlus::UI::Button
1549 [test => "test (do not select)"], #d#TODO 1538 text => "⇤",
1550 ], 1539 tooltip => "back to the starting page",
1551 on_changed => sub { 1540 on_activate => sub {
1552 my ($self, $pod) = @_; 1541 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1553 1542 unshift @future, @history;
1554 if ($pod eq "test") {#d#TODO 1543 @history = ();
1555 eval { 1544 $load_node->(@{shift @future});
1556 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1557 };
1558 warn "$@" if $@;
1559 return;
1560 } 1545 },
1546 );
1561 1547
1562 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1548 if (@history) {
1563 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1549 $buttons->add (new CFPlus::UI::Button
1564 1550 text => "⋘",
1565 $viewer->clear; 1551 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1566 1552 on_activate => sub {
1567# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1553 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1568# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1554 $load_node->(@{pop @history});
1569# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1555 },
1570# ]);#d#
1571 1556 );
1572 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1573 for @$pom;
1574
1575 $viewer->set_offset (0);
1576
1577 0
1578 }, 1557 }
1579 on_visibility_change => sub { 1558
1580 my ($self, $visible) = @_; 1559 if (@future) {
1581 return unless $visible; 1560 $buttons->add (new CFPlus::UI::Button
1582 return if $self->{value}; 1561 text => "⋙",
1583 $self->set_value ("intro"); 1562 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph];
1565 $load_node->(@{shift @future});
1566 },
1584 0 1567 );
1585 }, 1568 }
1569
1570 $buttons->add (new CFPlus::UI::Label text => " ");
1571
1572 my @path = CFPlus::Pod::full_path_of $node;
1573 pop @path; # drop current node
1574
1575 for my $node (@path) {
1576 $buttons->add (new CFPlus::UI::Button
1577 text => $node->{kw}[0],
1578 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1579 on_activate => sub {
1580 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1581 $load_node->($node);
1582 },
1583 );
1584 $buttons->add (new CFPlus::UI::Label text => "/");
1585 }
1586
1587 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1588
1589 $curnode = $node;
1590
1591 $viewer->clear;
1592 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1593 $viewer->scroll_to ($para);
1586 ); 1594 };
1595
1596 $load_node->(CFPlus::Pod::find pod => "mainpage");
1597
1598 $CFPlus::Pod::goto_document = sub {
1599 my (@path) = @_;
1600
1601 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1602
1603 $load_node->((CFPlus::Pod::find @path)[0]);
1604 $win->show;
1605 };
1587 1606
1588 $win 1607 $win
1589} 1608}
1590 1609
1591sub sdl_init { 1610sub sdl_init {
1592 CFClient::SDL_Init 1611 CFPlus::SDL_Init
1593 and die "SDL::Init failed!\n"; 1612 and die "SDL::Init failed!\n";
1594} 1613}
1595 1614
1596sub video_init { 1615sub video_init {
1597 sdl_init; 1616 sdl_init;
… …
1602 1621
1603 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1622 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1604 $FULLSCREEN = $CFG->{fullscreen}; 1623 $FULLSCREEN = $CFG->{fullscreen};
1605 $FAST = $CFG->{fast}; 1624 $FAST = $CFG->{fast};
1606 1625
1607 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1626 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1608 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1627 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1609 1628
1610 $SDL_ACTIVE = 1; 1629 $SDL_ACTIVE = 1;
1611 $LAST_REFRESH = time - 0.01; 1630 $LAST_REFRESH = time - 0.01;
1612 1631
1613 CFClient::OpenGL::init; 1632 CFPlus::OpenGL::init;
1614 1633
1615 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1634 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1616 1635
1617 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1636 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1618 1637
1619 ############################################################################# 1638 #############################################################################
1620 1639
1621 if ($DEBUG_STATUS) { 1640 if ($DEBUG_STATUS) {
1622 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1641 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1623 } else { 1642 } else {
1624 # create the widgets 1643 # create the widgets
1625 1644
1626 $DEBUG_STATUS = new CFClient::UI::Label 1645 $DEBUG_STATUS = new CFPlus::UI::Label
1627 padding => 0, 1646 padding => 0,
1628 z => 100, 1647 z => 100,
1629 force_x => "max", 1648 force_x => "max",
1630 force_y => 0; 1649 force_y => 0;
1631 $DEBUG_STATUS->show; 1650 $DEBUG_STATUS->show;
1632 1651
1633 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1652 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1634 1653
1635 $STATUSBOX = new CFClient::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1636 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1637 1656
1638 (new CFClient::UI::Frame 1657 (new CFPlus::UI::Frame
1639 bg => [0, 0, 0, 0.4], 1658 bg => [0, 0, 0, 0.4],
1640 force_x => 0, 1659 force_x => 0,
1641 force_y => "max", 1660 force_y => "max",
1642 child => $STATUSBOX, 1661 child => $STATUSBOX,
1643 )->show; 1662 )->show;
1644 1663
1645 CFClient::UI::FancyFrame->new ( 1664 CFPlus::UI::Toplevel->new (
1646 title => "Map", 1665 title => "Map",
1647 name => "mapmap", 1666 name => "mapmap",
1648 x => 0, 1667 x => 0,
1649 y => $FONTSIZE + 8, 1668 y => $FONTSIZE + 8,
1650 border_bg => [1, 1, 1, 192/255], 1669 border_bg => [1, 1, 1, 192/255],
1651 bg => [1, 1, 1, 0], 1670 bg => [1, 1, 1, 0],
1652 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1671 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1653 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1672 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1654 ), 1673 ),
1655 )->show; 1674 )->show;
1656 1675
1657 $MAPWIDGET = new CFClient::MapWidget; 1676 $MAPWIDGET = new CFPlus::MapWidget;
1658 $MAPWIDGET->connect (activate_console => sub { 1677 $MAPWIDGET->connect (activate_console => sub {
1659 my ($mapwidget, $preset) = @_; 1678 my ($mapwidget, $preset) = @_;
1660 1679
1661 if ($CONSOLE) { 1680 if ($CONSOLE) {
1662 $CONSOLE->{input}->{auto_activated} = 1; 1681 $CONSOLE->{input}->{auto_activated} = 1;
… …
1668 } 1687 }
1669 }); 1688 });
1670 $MAPWIDGET->show; 1689 $MAPWIDGET->show;
1671 $MAPWIDGET->grab_focus; 1690 $MAPWIDGET->grab_focus;
1672 1691
1673 $LOGVIEW = new CFClient::UI::TextScroller 1692 $LOGVIEW = new CFPlus::UI::TextScroller
1674 expand => 1, 1693 expand => 1,
1675 font => $FONT_FIXED, 1694 font => $FONT_FIXED,
1676 fontsize => $::CFG->{log_fontsize}, 1695 fontsize => $::CFG->{log_fontsize},
1677 indent => -4, 1696 indent => -4,
1678 can_hover => 1, 1697 can_hover => 1,
1679 can_events => 1, 1698 can_events => 1,
1680 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1681 ; 1700 ;
1682 1701
1683 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1684 title => "Setup", 1703 title => "Setup",
1685 name => "setup_dialog", 1704 name => "setup_dialog",
1686 x => 'center', 1705 x => 'center',
1687 y => 'center', 1706 y => 'center',
1688 z => 2, 1707 z => 2,
… …
1691 has_close_button => 1, 1710 has_close_button => 1,
1692 ; 1711 ;
1693 1712
1694 $METASERVER = metaserver_dialog; 1713 $METASERVER = metaserver_dialog;
1695 1714
1696 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1697 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1698 1717
1699 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1700 "Configure the server to play on, your username, password and other server-related options."); 1719 "Configure the server to play on, your username, password and other server-related options.");
1701 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1702 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1712 . "After pressing the combo the binding will be saved automatically and the " 1731 . "After pressing the combo the binding will be saved automatically and the "
1713 . "binding editor closes"); 1732 . "binding editor closes");
1714 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1733 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1715 "Some debuggin' options. Do not ask."); 1734 "Some debuggin' options. Do not ask.");
1716 1735
1717 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1718 1737
1719 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1720 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1739 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1721 1740
1722 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1723 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1724 1743
1725 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 1744 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
1726 1745
1727 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1728 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1747 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1729 1748
1730 $BUTTONBAR->add (new CFClient::UI::Button 1749 $BUTTONBAR->add (new CFPlus::UI::Button
1731 text => "Save Config", 1750 text => "Save Config",
1732 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1751 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1733 on_activate => sub { 1752 on_activate => sub {
1734 $::CFG->{layout} = CFClient::UI::get_layout; 1753 $::CFG->{layout} = CFPlus::UI::get_layout;
1735 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1754 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1736 status "Configuration Saved"; 1755 status "Configuration Saved";
1737 0 1756 0
1738 }, 1757 },
1739 ); 1758 );
1740 1759
1741 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1742 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1743 1762
1744 $BUTTONBAR->add (new CFClient::UI::Button 1763 $BUTTONBAR->add (new CFPlus::UI::Button
1745 text => "Quit", 1764 text => "Quit",
1746 tooltip => "Terminates the program", 1765 tooltip => "Terminates the program",
1747 on_activate => sub { 1766 on_activate => sub {
1748 if ($CONN) { 1767 if ($CONN) {
1749 open_quit_dialog; 1768 open_quit_dialog;
… …
1760 1779
1761 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1780 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1762} 1781}
1763 1782
1764sub video_shutdown { 1783sub video_shutdown {
1765 CFClient::OpenGL::shutdown; 1784 CFPlus::OpenGL::shutdown;
1766 1785
1767 undef $SDL_ACTIVE; 1786 undef $SDL_ACTIVE;
1768} 1787}
1769 1788
1770my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1789my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1778 1797
1779sub audio_music_finished { 1798sub audio_music_finished {
1780 return unless $CFG->{bgm_enable}; 1799 return unless $CFG->{bgm_enable};
1781 1800
1782 # TODO: hack, do play loop and mood music 1801 # TODO: hack, do play loop and mood music
1783 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1802 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1784 $bgmusic->play (0); 1803 $bgmusic->play (0);
1785 1804
1786 push @bgmusic, shift @bgmusic; 1805 push @bgmusic, shift @bgmusic;
1787} 1806}
1788 1807
1789sub audio_init { 1808sub audio_init {
1790 if ($CFG->{audio_enable}) { 1809 if ($CFG->{audio_enable}) {
1791 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1810 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1792 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1811 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1793 1812
1794 unless ($SDL_MIXER) { 1813 unless ($SDL_MIXER) {
1795 status "Unable to open sound device: there will be no sound"; 1814 status "Unable to open sound device: there will be no sound";
1796 return; 1815 return;
1797 } 1816 }
1798 1817
1799 CFClient::Mix_AllocateChannels 8; 1818 CFPlus::Mix_AllocateChannels 8;
1800 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1819 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1801 1820
1802 audio_music_finished; 1821 audio_music_finished;
1803 1822
1804 while (<$fh>) { 1823 while (<$fh>) {
1805 next if /^\s*#/; 1824 next if /^\s*#/;
… …
1808 my ($file, $volume, $event) = split /\s+/, $_, 3; 1827 my ($file, $volume, $event) = split /\s+/, $_, 3;
1809 1828
1810 push @SOUNDS, "$volume,$file"; 1829 push @SOUNDS, "$volume,$file";
1811 1830
1812 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1831 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1813 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1832 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1814 $chunk->volume ($volume * 128 / 100); 1833 $chunk->volume ($volume * 128 / 100);
1815 $chunk 1834 $chunk
1816 }; 1835 };
1817 } 1836 }
1818 } else { 1837 } else {
… …
1820 } 1839 }
1821 } 1840 }
1822} 1841}
1823 1842
1824sub audio_shutdown { 1843sub audio_shutdown {
1825 CFClient::Mix_CloseAudio if $SDL_MIXER; 1844 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1826 undef $SDL_MIXER; 1845 undef $SDL_MIXER;
1827 @SOUNDS = (); 1846 @SOUNDS = ();
1828 %AUDIO_CHUNKS = (); 1847 %AUDIO_CHUNKS = ();
1829} 1848}
1830 1849
… …
1837 1856
1838sub force_refresh { 1857sub force_refresh {
1839 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1858 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1840 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1859 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1841 1860
1842 $CFClient::UI::ROOT->draw; 1861 $CFPlus::UI::ROOT->draw;
1843 1862
1844 $WANT_REFRESH = 0; 1863 $WANT_REFRESH = 0;
1845 $CAN_REFRESH = 0; 1864 $CAN_REFRESH = 0;
1846 $LAST_REFRESH = $NOW; 1865 $LAST_REFRESH = $NOW;
1847 1866
18480 && do {
1849 # some weird model-drawing code, just a joke right now
1850 use CFClient::OpenGL;
1851
1852 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1853 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1854 $demo{r} ||= do {
1855 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1856 $mod->{v} = pack "f*", @{$mod->{v}};
1857 $_ = [scalar @$_, pack "S!*", @$_]
1858 for values %{$mod->{g}};
1859 $mod
1860 };
1861
1862 my $r = $demo{r} or die;
1863
1864 glDepthMask 1;
1865 glClear GL_DEPTH_BUFFER_BIT;
1866 glEnable GL_TEXTURE_2D;
1867 glEnable GL_DEPTH_TEST;
1868 glEnable GL_CULL_FACE;
1869 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1870
1871 glMatrixMode GL_PROJECTION;
1872 glLoadIdentity;
1873 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1874 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1875 glMatrixMode GL_MODELVIEW;
1876 glLoadIdentity;
1877
1878 glPushMatrix;
1879 glTranslate 0, 0, -800;
1880 glScale 1, -1, 1;
1881 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1882 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1883 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1884 glScale 50, 50, 50;
1885
1886 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1887 while (my ($k, $v) = each %{$r->{g}}) {
1888 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1889 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1890 }
1891
1892 glPopMatrix;
1893
1894 glShadeModel GL_FLAT;
1895 glDisable GL_DEPTH_TEST;
1896 glDisable GL_TEXTURE_2D;
1897 glDepthMask 0;
1898
1899 $WANT_REFRESH++;
1900};
1901
1902 CFClient::SDL_GL_SwapBuffers; 1867 CFPlus::SDL_GL_SwapBuffers;
1903} 1868}
1904 1869
1905my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1870my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1906 $NOW = time; 1871 $NOW = time;
1907 1872
1908 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1873 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1909 for CFClient::SDL_PollEvent; 1874 for CFPlus::SDL_PollEvent;
1910 1875
1911 if (%animate_object) { 1876 if (%animate_object) {
1912 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1877 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1913 $WANT_REFRESH++; 1878 $WANT_REFRESH++;
1914 } 1879 }
… …
1938 $CONN->face_prefetch 1903 $CONN->face_prefetch
1939 if $CONN; 1904 if $CONN;
1940}); 1905});
1941 1906
1942%SDL_CB = ( 1907%SDL_CB = (
1943 CFClient::SDL_QUIT => sub { 1908 CFPlus::SDL_QUIT => sub {
1944 Event::unloop -1; 1909 Event::unloop -1;
1945 }, 1910 },
1946 CFClient::SDL_VIDEORESIZE => sub { 1911 CFPlus::SDL_VIDEORESIZE => sub {
1947 }, 1912 },
1948 CFClient::SDL_VIDEOEXPOSE => sub { 1913 CFPlus::SDL_VIDEOEXPOSE => sub {
1949 CFClient::UI::full_refresh; 1914 CFPlus::UI::full_refresh;
1950 }, 1915 },
1951 CFClient::SDL_ACTIVEEVENT => sub { 1916 CFPlus::SDL_ACTIVEEVENT => sub {
1952# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1917# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1953 }, 1918 },
1954 CFClient::SDL_KEYDOWN => sub { 1919 CFPlus::SDL_KEYDOWN => sub {
1955 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1920 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1956 # alt-enter 1921 # alt-enter
1957 $FULLSCREEN_ENABLE->toggle; 1922 $FULLSCREEN_ENABLE->toggle;
1958 video_shutdown; 1923 video_shutdown;
1959 video_init; 1924 video_init;
1960 } else { 1925 } else {
1961 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1926 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1962 } 1927 }
1963 }, 1928 },
1964 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1929 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1965 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1930 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1966 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1931 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1967 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1932 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1968 CFClient::SDL_USEREVENT => sub { 1933 CFPlus::SDL_USEREVENT => sub {
1969 if ($_[0]{code} == 1) { 1934 if ($_[0]{code} == 1) {
1970 audio_channel_finished $_[0]{data1}; 1935 audio_channel_finished $_[0]{data1};
1971 } elsif ($_[0]{code} == 0) { 1936 } elsif ($_[0]{code} == 0) {
1972 audio_music_finished; 1937 audio_music_finished;
1973 } 1938 }
… …
1977############################################################################# 1942#############################################################################
1978 1943
1979$SIG{INT} = $SIG{TERM} = sub { exit }; 1944$SIG{INT} = $SIG{TERM} = sub { exit };
1980 1945
1981{ 1946{
1982 local $SIG{__DIE__} = sub {
1983 return unless defined $^S && !$^S;
1984 Carp::confess $_[0];#d#TODO: remove when stable
1985 CFClient::fatal $_[0];
1986 };
1987
1988 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1947 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1989 CFClient::UI::set_layout ($::CFG->{layout}); 1948 CFPlus::UI::set_layout ($::CFG->{layout});
1990 1949
1991 my %DEF_CFG = ( 1950 my %DEF_CFG = (
1992 sdl_mode => 0, 1951 sdl_mode => 0,
1993 width => 640, 1952 width => 640,
1994 height => 480, 1953 height => 480,
… …
2010 bgm_volume => 0.25, 1969 bgm_volume => 0.25,
2011 face_prefetch => 0, 1970 face_prefetch => 0,
2012 output_sync => 1, 1971 output_sync => 1,
2013 output_count => 1, 1972 output_count => 1,
2014 pickup => 0, 1973 pickup => 0,
1974 inv_sort => "mtime",
2015 default => "profile", # default profile 1975 default => "profile", # default profile
2016 ); 1976 );
2017 1977
2018 while (my ($k, $v) = each %DEF_CFG) { 1978 while (my ($k, $v) = each %DEF_CFG) {
2019 $CFG->{$k} = $v unless exists $CFG->{$k}; 1979 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
2023 1983
2024 sdl_init; 1984 sdl_init;
2025 1985
2026 @SDL_MODES = reverse 1986 @SDL_MODES = reverse
2027 grep $_->[0] >= 640 && $_->[1] >= 480, 1987 grep $_->[0] >= 640 && $_->[1] >= 480,
2028 CFClient::SDL_ListModes; 1988 CFPlus::SDL_ListModes;
2029 1989
2030 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1990 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2031 1991
2032 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1992 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2033 1993
2034 { 1994 {
2035 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1995 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2036 DejaVuSans.ttf 1996 DejaVuSans.ttf
2037 DejaVuSansMono.ttf 1997 DejaVuSansMono.ttf
2038 DejaVuSans-Bold.ttf 1998 DejaVuSans-Bold.ttf
2039 DejaVuSansMono-Bold.ttf 1999 DejaVuSansMono-Bold.ttf
2040 DejaVuSans-Oblique.ttf 2000 DejaVuSans-Oblique.ttf
2041 DejaVuSansMono-Oblique.ttf 2001 DejaVuSansMono-Oblique.ttf
2042 DejaVuSans-BoldOblique.ttf 2002 DejaVuSans-BoldOblique.ttf
2043 DejaVuSansMono-BoldOblique.ttf 2003 DejaVuSansMono-BoldOblique.ttf
2044 ); 2004 );
2045 2005
2046 CFClient::add_font $_ for @fonts; 2006 CFPlus::add_font $_ for @fonts;
2047 2007
2048 CFClient::pango_init; 2008 CFPlus::pango_init;
2049 2009
2050 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2010 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2051 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2011 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2052 2012
2053 $FONT_PROP->make_default; 2013 $FONT_PROP->make_default;
2054 } 2014 }
2055 2015
2056# compare mono (ft) vs. rgba (cairo) 2016# compare mono (ft) vs. rgba (cairo)
2057# ft - 1.8s, cairo 3s, even in alpha-only mode 2017# ft - 1.8s, cairo 3s, even in alpha-only mode
2058# for my $rgba (0..1) { 2018# for my $rgba (0..1) {
2059# my $t1 = Time::HiRes::time; 2019# my $t1 = Time::HiRes::time;
2060# for (1..1000) { 2020# for (1..1000) {
2061# my $layout = CFClient::Layout->new ($rgba); 2021# my $layout = CFPlus::Layout->new ($rgba);
2062# $layout->set_text ("hallo" x 100); 2022# $layout->set_text ("hallo" x 100);
2063# $layout->render; 2023# $layout->render;
2064# } 2024# }
2065# my $t2 = Time::HiRes::time; 2025# my $t2 = Time::HiRes::time;
2066# warn $t2-$t1; 2026# warn $t2-$t1;
… …
2069 video_init; 2029 video_init;
2070 audio_init; 2030 audio_init;
2071} 2031}
2072 2032
2073Event::loop; 2033Event::loop;
2074#CFClient::SDL_Quit; 2034#CFPlus::SDL_Quit;
2075#CFClient::_exit 0; 2035#CFPlus::_exit 0;
2076 2036
2077END { CFClient::SDL_Quit } 2037END { CFPlus::SDL_Quit }
2078 2038
2079=head1 NAME 2039=head1 NAME
2080 2040
2081cfplus - A Crossfire+ and Crossfire game client 2041cfplus - A Crossfire+ and Crossfire game client
2082 2042

Diff Legend

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