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

Diff Legend

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