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.95 by root, Sun Jul 16 23:30:08 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 {
664 my $r = new CFPlus::UI::ScrolledWindow (
665 expand => 1,
666 scroll_y => 1
667 );
649 my $vb = new CFClient::UI::VBox; 668 $r->add (my $vb = new CFPlus::UI::VBox);
650 669
670 $vb->add (new CFPlus::UI::FancyFrame
671 label => "Player",
672 child => (my $pi = new CFPlus::UI::VBox),
673 );
674
651 $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,
652 can_hover => 1, can_events => 1, 676 can_hover => 1, can_events => 1,
653 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.");
654 $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,
655 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
656 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).");
657 681
658 $vb->add (my $hb0 = new CFClient::UI::HBox); 682 $pi->add (my $hb0 = new CFPlus::UI::HBox);
659 $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,
660 can_hover => 1, can_events => 1, 684 can_hover => 1, can_events => 1,
661 tooltip => "The weight of the player including all inventory items."); 685 tooltip => "The weight of the player including all inventory items.");
662 $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,
663 can_hover => 1, can_events => 1, 687 can_hover => 1, can_events => 1,
664 tooltip => "The weight limit: you cannot carry more than this."); 688 tooltip => "The weight limit: you cannot carry more than this.");
665 689
666 690 $vb->add (new CFPlus::UI::FancyFrame
691 label => "Primary/Secondary Statistics",
667 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 692 child => (my $hb = new CFPlus::UI::HBox expand => 1),
693 );
668 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
669 695
670 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
671 697
672 for ( 698 for (
673 [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],
674 [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],
675 [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],
676 [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],
677 [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],
678 [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],
679 [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],
680 706
681 [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],
682 [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],
683 [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],
684 [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],
685 [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],
686 [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],
687 ) { 713 ) {
688 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
689 715
690 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
691 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");
692 $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
693 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");
694 } 722 }
695 723
724 $vb->add (new CFPlus::UI::FancyFrame
725 label => "Resistancies",
696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 726 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
727 );
697 728
698 my $row = 0; 729 my $row = 0;
699 my $col = 0; 730 my $col = 0;
700 731
701 my %resist_names = ( 732 my %resist_names = (
… …
740 drain acid pois para deat phys 771 drain acid pois para deat phys
741 blind fear tund elec cold ghit/) 772 blind fear tund elec cold ghit/)
742 { 773 {
743 $tbl2->add ($col, $row, 774 $tbl2->add ($col, $row,
744 $STATWIDS->{"res_$_"} = 775 $STATWIDS->{"res_$_"} =
745 new CFClient::UI::Label 776 new CFPlus::UI::Label
746 font => $FONT_FIXED, 777 font => $FONT_FIXED,
747 template => "-100%", 778 template => "-100%",
748 align => +1, 779 align => +1,
749 valign => 0, 780 valign => 0,
750 can_events => 1, 781 can_events => 1,
751 can_hover => 1, 782 can_hover => 1,
752 tooltip => $resist_names{$_}->[1], 783 tooltip => $resist_names{$_}->[1],
753 ); 784 );
754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 785 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
755 font => $FONT_FIXED, 786 font => $FONT_FIXED,
756 can_hover => 1, 787 can_hover => 1,
757 can_events => 1, 788 can_events => 1,
758 path => "ui/resist/resist_$_.png", 789 path => "ui/resist/resist_$_.png",
759 tooltip => $resist_names{$_}->[1], 790 tooltip => $resist_names{$_}->[1],
760 ); 791 );
761 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 792 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
762 text => $resist_names{$_}->[0], 793 text => $resist_names{$_}->[0],
763 font => $FONT_FIXED, 794 font => $FONT_FIXED,
764 can_hover => 1, 795 can_hover => 1,
765 can_events => 1, 796 can_events => 1,
766 tooltip => $resist_names{$_}->[1], 797 tooltip => $resist_names{$_}->[1],
… …
773 } 804 }
774 } 805 }
775 806
776 #update_stats_window ({}); 807 #update_stats_window ({});
777 808
778 $vb 809 $r
779} 810}
780 811
781sub skill_window { 812sub skill_window {
813 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
782 $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]);
815 $sw
783} 816}
784 817
785sub formsep($) { 818sub formsep($) {
786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 819 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
787} 820}
… …
797 return if $METASERVER_ATIME > time; 830 return if $METASERVER_ATIME > time;
798 $METASERVER_ATIME = time + 60; 831 $METASERVER_ATIME = time + 60;
799 832
800 my $table = $METASERVER->{table}; 833 my $table = $METASERVER->{table};
801 $table->clear; 834 $table->clear;
802 $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...");
803 836
804 my $buf; 837 my $buf;
805 838
806 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 839 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
807 840
… …
830 "The time this server has been running without being restarted.", 863 "The time this server has been running without being restarted.",
831 "The server software version - a '+' indicates a Crossfire+ server.", 864 "The server software version - a '+' indicates a Crossfire+ server.",
832 "Short information about this server provided by its admins.", 865 "Short information about this server provided by its admins.",
833 ); 866 );
834 my @col = qw(#Users Host Uptime Version Description); 867 my @col = qw(#Users Host Uptime Version Description);
835 $table->add ($_, 0, new CFClient::UI::Label 868 $table->add ($_, 0, new CFPlus::UI::Label
836 can_hover => 1, can_events => 1, 869 can_hover => 1, can_events => 1,
837 align => 0, fg => [1, 1, 0], 870 align => 0, fg => [1, 1, 0],
838 text => $col[$_], tooltip => $tip[$_]) 871 text => $col[$_], tooltip => $tip[$_])
839 for 0 .. $#col; 872 for 0 .. $#col;
840 873
… …
861 894
862 $m = [$users, $host, $uptime, $version, $desc]; 895 $m = [$users, $host, $uptime, $version, $desc];
863 896
864 $y++; 897 $y++;
865 898
866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 899 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
867 (new CFClient::UI::Button 900 (new CFPlus::UI::Button
868 text => "Use", 901 text => "Use",
869 tooltip => "Put this server into the <b>Host:Port</b> field", 902 tooltip => "Put this server into the <b>Host:Port</b> field",
870 on_activate => sub { 903 on_activate => sub {
871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 904 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
872 $METASERVER->hide; 905 $METASERVER->hide;
873 0 906 0
874 }, 907 },
875 ), 908 ),
876 (new CFClient::UI::Empty expand => 1), 909 (new CFPlus::UI::Empty expand => 1),
877 ]); 910 ]);
878 911
879 $table->add ($_, $y, new CFClient::UI::Label 912 $table->add ($_, $y, new CFPlus::UI::Label
880 ellipsise => 0, 913 ellipsise => 0,
881 align => $align[$_], 914 align => $align[$_],
882 text => $m->[$_], 915 text => $m->[$_],
883 tooltip => $tip[$_], 916 tooltip => $tip[$_],
884 can_hover => 1, 917 can_hover => 1,
… …
889 } 922 }
890 }); 923 });
891} 924}
892 925
893sub metaserver_dialog { 926sub metaserver_dialog {
894 my $vbox = new CFClient::UI::VBox; 927 my $vbox = new CFPlus::UI::VBox;
895 my $table = new CFClient::UI::Table; 928 my $table = new CFPlus::UI::Table;
896 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 929 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
897 930
898 my $dialog = new CFClient::UI::FancyFrame 931 my $dialog = new CFPlus::UI::Toplevel
899 title => "Server List", 932 title => "Server List",
900 name => 'metaserver_dialog', 933 name => 'metaserver_dialog',
901 x => 'center', 934 x => 'center',
902 y => 'center', 935 y => 'center',
903 z => 3, 936 z => 3,
… …
913 946
914 $dialog 947 $dialog
915} 948}
916 949
917sub server_setup { 950sub server_setup {
918 my $vbox = new CFClient::UI::VBox; 951 my $vbox = new CFPlus::UI::VBox;
919 952
953 $vbox->add (new CFPlus::UI::FancyFrame
954 label => "Connection Settings",
920 $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 );
921 $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");
922 958
923 { 959 {
924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 960 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
925 961
926 $vbox->add ( 962 $vbox->add (
927 $HOST_ENTRY = new CFClient::UI::Entry 963 $HOST_ENTRY = new CFPlus::UI::Entry
928 expand => 1, 964 expand => 1,
929 text => $CFG->{profile}{default}{host}, 965 text => $CFG->{profile}{default}{host},
930 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",
931 on_changed => sub { 967 on_changed => sub {
932 my ($self, $value) = @_; 968 my ($self, $value) = @_;
933 $CFG->{profile}{default}{host} = $value; 969 $CFG->{profile}{default}{host} = $value;
934 0 970 0
935 } 971 }
936 ); 972 );
937 973
938 $vbox->add (new CFClient::UI::Button 974 $vbox->add (new CFPlus::UI::Button
939 expand => 1, 975 expand => 1,
940 text => "Server List", 976 text => "Server List",
941 other => $METASERVER, 977 other => $METASERVER,
942 tooltip => "Show a list of available crossfire servers", 978 tooltip => "Show a list of available crossfire servers",
943 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 979 on_activate => sub { $METASERVER->toggle_visibility; 0 },
944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 980 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
945 ); 981 );
946 } 982 }
947 983
948 $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");
949 $table->add (1, 4, new CFClient::UI::Entry 985 $table->add (1, 4, new CFPlus::UI::Entry
950 text => $CFG->{profile}{default}{user}, 986 text => $CFG->{profile}{default}{user},
951 tooltip => "The name of your character on the server", 987 tooltip => "The name of your character on the server",
952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 988 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
953 ); 989 );
954 990
955 $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");
956 $table->add (1, 5, new CFClient::UI::Entry 992 $table->add (1, 5, new CFPlus::UI::Entry
957 text => $CFG->{profile}{default}{password}, 993 text => $CFG->{profile}{default}{password},
958 hidden => 1, 994 hidden => 1,
959 tooltip => "The password for your character", 995 tooltip => "The password for your character",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961 ); 997 );
962 998
963 $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");
964 $table->add (1, 7, new CFClient::UI::Slider 1000 $table->add (1, 7, new CFPlus::UI::Slider
965 force_w => 100, 1001 force_w => 100,
966 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1002 range => [$CFG->{mapsize}, 10, 100, 0, 1],
967 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. "
968 . "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, "
969 . "but you also increase bandwidth requirements and latency. " 1005 . "but you also increase bandwidth requirements and latency. "
970 . "This option is only used once at log-in.", 1006 . "This option is only used once at log-in.",
971 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 },
972 ); 1008 );
973 1009
974 $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");
975 $table->add (1, 8, new CFClient::UI::CheckBox 1011 $table->add (1, 8, new CFPlus::UI::CheckBox
976 state => $CFG->{face_prefetch}, 1012 state => $CFG->{face_prefetch},
977 tooltip => "<b>Background Image Prefetch</b>\n\n" 1013 tooltip => "<b>Background Image Prefetch</b>\n\n"
978 . "If enabled, the client automatically pre-fetches images from the server. " 1014 . "If enabled, the client automatically pre-fetches images from the server. "
979 . "This might increase or create lag, but increases the chances " 1015 . "This might increase or create lag, but increases the chances "
980 . "of faces being ready for display when you encounter them. " 1016 . "of faces being ready for display when you encounter them. "
… …
982 . "so only set it if you really need to prefetch images. " 1018 . "so only set it if you really need to prefetch images. "
983 . "This option can be set and unset any time.", 1019 . "This option can be set and unset any time.",
984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1020 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
985 ); 1021 );
986 1022
987 $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");
988 $table->add (1, 9, new CFClient::UI::Entry 1024 $table->add (1, 9, new CFPlus::UI::Entry
989 text => $CFG->{output_count}, 1025 text => $CFG->{output_count},
990 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.",
991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1027 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
992 ); 1028 );
993 1029
994 $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");
995 $table->add (1, 10, new CFClient::UI::Entry 1031 $table->add (1, 10, new CFPlus::UI::Entry
996 text => $CFG->{output_sync}, 1032 text => $CFG->{output_sync},
997 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.",
998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1034 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
999 ); 1035 );
1000 1036
1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1037 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1002 expand => 1, 1038 expand => 1,
1003 align => 0, 1039 align => 0,
1004 text => "Login", 1040 text => "Login",
1005 on_activate => sub { 1041 on_activate => sub {
1006 $CONN ? stop_game 1042 $CONN ? stop_game
1007 : start_game; 1043 : start_game;
1008 0 1044 0
1009 }, 1045 },
1010 ); 1046 );
1011 1047
1012 $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");
1013 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1049 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1014 text => $CFG->{say_command}, 1050 text => $CFG->{say_command},
1015 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. "
1016 . "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. "
1017 . "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.",
1018 on_changed => sub { 1054 on_changed => sub {
… …
1020 $CFG->{say_command} = $value; 1056 $CFG->{say_command} = $value;
1021 0 1057 0
1022 } 1058 }
1023 ); 1059 );
1024 1060
1025 $vbox->add (new CFClient::UI::Label 1061 $vbox->add (new CFPlus::UI::FancyFrame
1026 text => "Server Info", 1062 label => "Server Info",
1027 fontsize => 1.2,
1028 padding_y => 8,
1029 fg => [1, 1, 0, 1],
1030 );
1031
1032 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1063 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1064 );
1033 1065
1034 $vbox 1066 $vbox
1035} 1067}
1036 1068
1037sub message_window { 1069sub message_window {
1038 my $window = new CFClient::UI::FancyFrame 1070 my $window = new CFPlus::UI::Toplevel
1039 name => "message_window", 1071 name => "message_window",
1040 title => "Messages", 1072 title => "Messages",
1041 border_bg => [1, 1, 1, 1], 1073 border_bg => [1, 1, 1, 1],
1042 x => "max", 1074 x => "max",
1043 y => 0, 1075 y => 0,
1044 force_w => $::WIDTH * 0.4, 1076 force_w => $::WIDTH * 0.4,
1045 force_h => $::HEIGHT * 0.5, 1077 force_h => $::HEIGHT * 0.5,
1046 child => (my $vbox = new CFClient::UI::VBox), 1078 child => (my $vbox = new CFPlus::UI::VBox),
1047 has_close_button => 1; 1079 has_close_button => 1;
1048 1080
1049 $vbox->add ($LOGVIEW); 1081 $vbox->add ($LOGVIEW);
1050 1082
1051 $vbox->add (my $input = new CFClient::UI::Entry 1083 $vbox->add (my $input = new CFPlus::UI::Entry
1052 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> "
1053 . "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>...). "
1054 . "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). "
1055 . "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.",
1056 on_focus_in => sub { 1088 on_focus_in => sub {
… …
1095 }; 1127 };
1096 1128
1097 $window 1129 $window
1098} 1130}
1099 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
1100sub open_quit_dialog { 1153sub open_quit_dialog {
1101 unless ($QUIT_DIALOG) { 1154 unless ($QUIT_DIALOG) {
1102 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1155 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1103 x => "center", 1156 x => "center",
1104 y => "center", 1157 y => "center",
1105 z => 50, 1158 z => 50,
1106 title => "Really Quit?", 1159 title => "Really Quit?",
1160 on_key_down => sub {
1161 my ($dialog, $ev) = @_;
1162 $ev->{sym} == 27 and $dialog->hide;
1163 }
1107 ; 1164 ;
1108 1165
1109 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1166 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1110 1167
1111 $vb->add (new CFClient::UI::Label 1168 $vb->add (new CFPlus::UI::Label
1112 text => "You should find a savebed and apply it first!", 1169 text => "You should find a savebed and apply it first!",
1113 max_w => $WIDTH * 0.25, 1170 max_w => $WIDTH * 0.25,
1114 ellipsize => 0, 1171 ellipsize => 0,
1115 ); 1172 );
1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1173 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1117 $hb->add (new CFClient::UI::Button 1174 $hb->add (new CFPlus::UI::Button
1118 text => "Ok", 1175 text => "Ok",
1119 expand => 1, 1176 expand => 1,
1120 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1177 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1121 ); 1178 );
1122 $hb->add (new CFClient::UI::Button 1179 $hb->add (new CFPlus::UI::Button
1123 text => "Quit anyway", 1180 text => "Quit anyway",
1124 expand => 1, 1181 expand => 1,
1125 on_activate => sub { exit }, 1182 on_activate => sub { exit },
1126 ); 1183 );
1127 } 1184 }
1128 1185
1129 $QUIT_DIALOG->show; 1186 $QUIT_DIALOG->show;
1187 $QUIT_DIALOG->grab_focus;
1130} 1188}
1131 1189
1132sub autopickup_setup { 1190sub autopickup_setup {
1133 my $table = new CFClient::UI::Table; 1191 my $table = new CFPlus::UI::Table;
1134 1192
1135 for ( 1193 for (
1136 ["General", 0, 0, 1194 ["General", 0, 0,
1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1138 ["Inhibit autopickup" => PICKUP_INHIBIT], 1196 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1172 ], 1230 ],
1173 ["Weight/Value ratio", 2, 17] 1231 ["Weight/Value ratio", 2, 17]
1174 ) 1232 )
1175 { 1233 {
1176 my ($title, $x, $y, @bits) = @$_; 1234 my ($title, $x, $y, @bits) = @$_;
1177 $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]);
1178 1236
1179 for (@bits) { 1237 for (@bits) {
1180 ++$y; 1238 ++$y;
1181 1239
1182 my $mask = $_->[1]; 1240 my $mask = $_->[1];
1183 $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);
1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1242 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1185 state => $::CFG->{pickup} & $mask, 1243 state => $::CFG->{pickup} & $mask,
1186 on_changed => sub { 1244 on_changed => sub {
1187 my ($box, $value) = @_; 1245 my ($box, $value) = @_;
1188 1246
1189 if ($value) { 1247 if ($value) {
… …
1200 1258
1201 ${$_->[2]} = $checkbox if $_->[2]; 1259 ${$_->[2]} = $checkbox if $_->[2];
1202 } 1260 }
1203 } 1261 }
1204 1262
1205 $table->add (2, 18, new CFClient::UI::ValSlider 1263 $table->add (2, 18, new CFPlus::UI::ValSlider
1206 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207 template => ">= 99", 1265 template => ">= 99",
1208 to_value => sub { ">= " . 5 * $_[0] }, 1266 to_value => sub { ">= " . 5 * $_[0] },
1209 on_changed => sub { 1267 on_changed => sub {
1210 my ($slider, $value) = @_; 1268 my ($slider, $value) = @_;
… …
1213 $::CFG->{pickup} |= int $value 1271 $::CFG->{pickup} |= int $value
1214 if $value; 1272 if $value;
1215 1; 1273 1;
1216 }); 1274 });
1217 1275
1218 $table->add (3, 18, new CFClient::UI::Button 1276 $table->add (3, 18, new CFPlus::UI::Button
1219 text => "set", 1277 text => "set",
1220 on_activate => sub { 1278 on_activate => sub {
1221 $::CONN->send_command ("pickup $::CFG->{pickup}") 1279 $::CONN->send_command ("pickup $::CFG->{pickup}")
1222 if defined $::CONN; 1280 if defined $::CONN;
1223 0 1281 0
1224 }); 1282 });
1225 1283
1226 $table 1284 $table
1227} 1285}
1228 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
1229sub inventory_widget { 1300sub inventory_widget {
1230 my $hb = new CFClient::UI::HBox homogeneous => 1; 1301 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1231 1302
1232 $hb->add (my $vb1 = new CFClient::UI::VBox); 1303 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1233 $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
1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1234 $vb1->add ($INV = new CFClient::UI::Inventory); 1327 $sw1->add ($INV = new CFPlus::UI::Inventory);
1235 1328
1236 $hb->add (my $vb2 = new CFClient::UI::VBox); 1329 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1237 1330
1238 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1331 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1239 1332
1333 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1240 $vb2->add ($INVR = new CFClient::UI::Inventory); 1334 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1241 1335
1242 # XXX: Call after $INVR = ... because set_opencont sets the items 1336 # XXX: Call after $INVR = ... because set_opencont sets the items
1243 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1337 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1244 1338
1245 $hb 1339 $hb
1246} 1340}
1247 1341
1248sub toggle_player_page { 1342sub toggle_player_page {
… …
1255 $PL_WINDOW->show; 1349 $PL_WINDOW->show;
1256 } 1350 }
1257} 1351}
1258 1352
1259sub player_window { 1353sub player_window {
1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1354 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1261 x => "center", 1355 x => "center",
1262 y => "center", 1356 y => "center",
1263 force_w => $WIDTH * 9/10, 1357 force_w => $WIDTH * 9/10,
1264 force_h => $HEIGHT * 9/10, 1358 force_h => $HEIGHT * 9/10,
1265 title => "Player", 1359 title => "Player",
… …
1267 has_close_button => 1 1361 has_close_button => 1
1268 ; 1362 ;
1269 1363
1270 my $ntb = 1364 my $ntb =
1271 $PL_NOTEBOOK = 1365 $PL_NOTEBOOK =
1272 new CFClient::UI::Notebook 1366 new CFPlus::UI::Notebook expand => 1, debug => 1;
1273 expand => 1,
1274 debug => 1,
1275 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276 ;
1277 1367
1278 $ntb->add ( 1368 $ntb->add (
1279 "Statistics (F2)" => $STATS_PAGE = stats_window, 1369 "Statistics (F2)" => $STATS_PAGE = stats_window,
1280 "Shows statistics, where all your Stats and Resistances are shown." 1370 "Shows statistics, where all your Stats and Resistances are shown."
1281 ); 1371 );
1282 $ntb->add ( 1372 $ntb->add (
1283 "Skills (F3)" => $SKILL_PAGE = skill_window, 1373 "Skills (F3)" => $SKILL_PAGE = skill_window,
1284 "Shows all your Skills." 1374 "Shows all your Skills."
1285 ); 1375 );
1376
1377 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1378 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1286 $ntb->add ( 1379 $ntb->add (
1287 "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList, 1380 "Spellbook (F4)" => $spellsw,
1288 "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."
1289 ); 1382 );
1290 $ntb->add ( 1383 $ntb->add (
1291 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1384 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1385 "Toggles the inventory window, where you can manage your loot (or treasures :). "
… …
1302sub update_bindings { 1395sub update_bindings {
1303 $BIND_UPD_CB->() if $BIND_UPD_CB; 1396 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304} 1397}
1305 1398
1306sub keyboard_setup { 1399sub keyboard_setup {
1307 my $binding_list = new CFClient::UI::VBox; 1400 my $binding_list = new CFPlus::UI::VBox;
1308 1401
1309 my $refresh; 1402 my $refresh;
1310 $refresh = $BIND_UPD_CB = sub { 1403 $refresh = $BIND_UPD_CB = sub {
1311 $binding_list->clear (); 1404 $binding_list->clear ();
1312 1405
… …
1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1407 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1408 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1409 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317 1410
1318 my $lbl = join "; ", @$cmds; 1411 my $lbl = join "; ", @$cmds;
1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1412 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1320 $binding_list->add (my $hb = new CFClient::UI::HBox); 1413 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1321 $hb->add (new CFClient::UI::Button 1414 $hb->add (new CFPlus::UI::Button
1322 text => "delete", 1415 text => "delete",
1323 tooltip => "Deletes the binding", 1416 tooltip => "Deletes the binding",
1324 on_activate => sub { 1417 on_activate => sub {
1325 $binding_list->remove ($hb); 1418 $binding_list->remove ($hb);
1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1419 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0 1420 0
1328 }); 1421 });
1329 1422
1330 $hb->add (new CFClient::UI::Button 1423 $hb->add (new CFPlus::UI::Button
1331 text => "edit", 1424 text => "edit",
1332 tooltip => "Edits the binding", 1425 tooltip => "Edits the binding",
1333 on_activate => sub { 1426 on_activate => sub {
1334 $::BIND_EDITOR->set_binding ( 1427 $::BIND_EDITOR->set_binding (
1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1428 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1348 $::BIND_EDITOR->show; 1441 $::BIND_EDITOR->show;
1349 $SETUP_DIALOG->hide; 1442 $SETUP_DIALOG->hide;
1350 0 1443 0
1351 }); 1444 });
1352 1445
1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1446 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1447 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1355 } 1448 }
1356 } 1449 }
1357 }; 1450 };
1358 1451
1359 my $vb = new CFClient::UI::VBox; 1452 my $vb = new CFPlus::UI::VBox;
1360 $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 );
1361 $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");
1362 $hb->add (new CFClient::UI::CheckBox 1458 $hb->add (new CFPlus::UI::CheckBox
1363 expand => 1, 1459 expand => 1,
1364 state => $CFG->{shift_fire_stop}, 1460 state => $CFG->{shift_fire_stop},
1365 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",
1366 on_changed => sub { 1462 on_changed => sub {
1367 my ($cbox, $value) = @_; 1463 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value; 1464 $CFG->{shift_fire_stop} = $value;
1369 0 1465 0
1370 }); 1466 });
1371 1467
1372 $vb->add ($binding_list); 1468 $vb->add (new CFPlus::UI::FancyFrame
1469 label => "Bindings",
1470 child => $binding_list);
1373 $vb->add (my $hb = new CFClient::UI::HBox); 1471 $vb->add (my $hb = new CFPlus::UI::HBox);
1374 1472
1375 $hb->add (new CFClient::UI::Button 1473 $hb->add (new CFPlus::UI::Button
1376 text => "record new", 1474 text => "record new",
1377 expand => 1, 1475 expand => 1,
1378 tooltip => "This button opens the binding editor with an empty binding.", 1476 tooltip => "This button opens the binding editor with an empty binding.",
1379 on_activate => sub { 1477 on_activate => sub {
1380 $::BIND_EDITOR->set_binding (undef, undef, [], 1478 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1394 $::BIND_EDITOR->show; 1492 $::BIND_EDITOR->show;
1395 0 1493 0
1396 }, 1494 },
1397 ); 1495 );
1398 1496
1399 $hb->add (new CFClient::UI::Button 1497 $hb->add (new CFPlus::UI::Button
1400 text => "close", 1498 text => "close",
1401 tooltip => "Closes the binding window", 1499 tooltip => "Closes the binding window",
1402 expand => 1, 1500 expand => 1,
1403 on_activate => sub { 1501 on_activate => sub {
1404 $SETUP_DIALOG->hide; 1502 $SETUP_DIALOG->hide;
… …
1410 1508
1411 $vb 1509 $vb
1412} 1510}
1413 1511
1414sub help_window { 1512sub help_window {
1415 my $win = new CFClient::UI::FancyFrame 1513 my $win = new CFPlus::UI::Toplevel
1416 x => 'center', 1514 x => 'center',
1417 y => 'center', 1515 y => 'center',
1418 z => 2, 1516 z => 2,
1419 name => 'doc_browser', 1517 name => 'doc_browser',
1420 force_w => int $WIDTH * 7/8, 1518 force_w => int $WIDTH * 7/8,
1421 force_h => int $HEIGHT * 7/8, 1519 force_h => int $HEIGHT * 7/8,
1422 title => "Help Browser", 1520 title => "Help Browser",
1423 has_close_button => 1; 1521 has_close_button => 1;
1424 1522
1425 $win->add (my $vbox = new CFClient::UI::VBox); 1523 $win->add (my $vbox = new CFPlus::UI::VBox);
1426 1524
1427 $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 );
1428 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1529 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1429 expand => 1, fontsize => 0.8, padding_x => 4); 1530 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1430 1531
1431 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1532 my @history;
1432 $buttons->add (my $combo = new CFClient::UI::Combobox 1533 my @future;
1433 value => undef, 1534 my $curnode;
1434 options => [ 1535
1435 [intro => "Introduction"], 1536 my $load_node; $load_node = sub {
1436 [manual => "Main Manual"], 1537 my ($node, $para) = @_;
1437 [skill_help => "Skill Reference"], 1538
1438 [command_help => "Command Reference"], 1539 $buttons->clear;
1439 [dmcommand_help => "DM Commands"], 1540
1440 [COPYING => "License Terms"], 1541 $buttons->add (new CFPlus::UI::Button
1441 ], 1542 text => "⇤",
1543 tooltip => "back to the starting page",
1442 on_changed => sub { 1544 on_activate => sub {
1443 my ($self, $pod) = @_; 1545 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1444 1546 unshift @future, @history;
1445 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1547 @history = ();
1446 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1548 $load_node->(@{shift @future});
1447
1448 $viewer->clear;
1449
1450# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1451# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1452# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1453# ]);#d#
1454 1549 },
1455 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1550 );
1456 for @$pom;
1457 1551
1458 $viewer->set_offset (0); 1552 if (@history) {
1459 1553 $buttons->add (new CFPlus::UI::Button
1554 text => "⋘",
1555 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1556 on_activate => sub {
1557 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1558 $load_node->(@{pop @history});
1559 },
1460 0 1560 );
1461 }, 1561 }
1462 on_visibility_change => sub { 1562
1463 my ($self, $visible) = @_; 1563 if (@future) {
1464 return unless $visible; 1564 $buttons->add (new CFPlus::UI::Button
1465 return if $self->{value}; 1565 text => "⋙",
1466 $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 },
1467 0 1571 );
1468 }, 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);
1469 ); 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 };
1470 1610
1471 $win 1611 $win
1472} 1612}
1473 1613
1474sub sdl_init { 1614sub sdl_init {
1475 CFClient::SDL_Init 1615 CFPlus::SDL_Init
1476 and die "SDL::Init failed!\n"; 1616 and die "SDL::Init failed!\n";
1477} 1617}
1478 1618
1479sub video_init { 1619sub video_init {
1480 sdl_init; 1620 sdl_init;
… …
1485 1625
1486 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1626 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1487 $FULLSCREEN = $CFG->{fullscreen}; 1627 $FULLSCREEN = $CFG->{fullscreen};
1488 $FAST = $CFG->{fast}; 1628 $FAST = $CFG->{fast};
1489 1629
1490 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1630 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1491 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1631 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1492 1632
1493 $SDL_ACTIVE = 1; 1633 $SDL_ACTIVE = 1;
1494 $LAST_REFRESH = time - 0.01; 1634 $LAST_REFRESH = time - 0.01;
1495 1635
1496 CFClient::OpenGL::init; 1636 CFPlus::OpenGL::init;
1497 1637
1498 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1638 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1499 1639
1500 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1640 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1501 1641
1502 ############################################################################# 1642 #############################################################################
1503 1643
1504 if ($DEBUG_STATUS) { 1644 if ($DEBUG_STATUS) {
1505 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1645 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1506 } else { 1646 } else {
1507 # create the widgets 1647 # create the widgets
1508 1648
1509 $DEBUG_STATUS = new CFClient::UI::Label 1649 $DEBUG_STATUS = new CFPlus::UI::Label
1510 padding => 0, 1650 padding => 0,
1511 z => 100, 1651 z => 100,
1512 force_x => "max", 1652 force_x => "max",
1513 force_y => 0; 1653 force_y => 0;
1514 $DEBUG_STATUS->show; 1654 $DEBUG_STATUS->show;
1515 1655
1516 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1656 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1517 1657
1518 $STATUSBOX = new CFClient::UI::Statusbox; 1658 $STATUSBOX = new CFPlus::UI::Statusbox;
1519 $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]);
1520 1660
1521 (new CFClient::UI::Frame 1661 (new CFPlus::UI::Frame
1522 bg => [0, 0, 0, 0.4], 1662 bg => [0, 0, 0, 0.4],
1523 force_x => 0, 1663 force_x => 0,
1524 force_y => "max", 1664 force_y => "max",
1525 child => $STATUSBOX, 1665 child => $STATUSBOX,
1526 )->show; 1666 )->show;
1527 1667
1528 CFClient::UI::FancyFrame->new ( 1668 CFPlus::UI::Toplevel->new (
1529 title => "Map", 1669 title => "Map",
1530 name => "mapmap", 1670 name => "mapmap",
1531 x => 0, 1671 x => 0,
1532 y => $FONTSIZE + 8, 1672 y => $FONTSIZE + 8,
1533 border_bg => [1, 1, 1, 192/255], 1673 border_bg => [1, 1, 1, 192/255],
1534 bg => [1, 1, 1, 0], 1674 bg => [1, 1, 1, 0],
1535 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1675 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1536 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.",
1537 ), 1677 ),
1538 )->show; 1678 )->show;
1539 1679
1540 $MAPWIDGET = new CFClient::MapWidget; 1680 $MAPWIDGET = new CFPlus::MapWidget;
1541 $MAPWIDGET->connect (activate_console => sub { 1681 $MAPWIDGET->connect (activate_console => sub {
1542 my ($mapwidget, $preset) = @_; 1682 my ($mapwidget, $preset) = @_;
1543 1683
1544 if ($CONSOLE) { 1684 if ($CONSOLE) {
1545 $CONSOLE->{input}->{auto_activated} = 1; 1685 $CONSOLE->{input}->{auto_activated} = 1;
… …
1551 } 1691 }
1552 }); 1692 });
1553 $MAPWIDGET->show; 1693 $MAPWIDGET->show;
1554 $MAPWIDGET->grab_focus; 1694 $MAPWIDGET->grab_focus;
1555 1695
1556 $LOGVIEW = new CFClient::UI::TextScroller 1696 $LOGVIEW = new CFPlus::UI::TextScroller
1557 expand => 1, 1697 expand => 1,
1558 font => $FONT_FIXED, 1698 font => $FONT_FIXED,
1559 fontsize => $::CFG->{log_fontsize}, 1699 fontsize => $::CFG->{log_fontsize},
1560 indent => -4, 1700 indent => -4,
1561 can_hover => 1, 1701 can_hover => 1,
1562 can_events => 1, 1702 can_events => 1,
1563 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.",
1564 ; 1704 ;
1565 1705
1566 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1706 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1567 title => "Setup", 1707 title => "Setup",
1568 name => "setup_dialog", 1708 name => "setup_dialog",
1569 x => 'center', 1709 x => 'center',
1570 y => 'center', 1710 y => 'center',
1571 z => 2, 1711 z => 2,
… …
1574 has_close_button => 1, 1714 has_close_button => 1,
1575 ; 1715 ;
1576 1716
1577 $METASERVER = metaserver_dialog; 1717 $METASERVER = metaserver_dialog;
1578 1718
1579 $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,
1580 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1720 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1581 1721
1582 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1722 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1583 "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.");
1584 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1724 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1585 "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.");
… …
1595 . "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 "
1596 . "binding editor closes"); 1736 . "binding editor closes");
1597 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1737 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1598 "Some debuggin' options. Do not ask."); 1738 "Some debuggin' options. Do not ask.");
1599 1739
1600 $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
1601 1741
1602 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1742 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1603 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.");
1604 1744
1605 $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,
1606 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.");
1607 1747
1608 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
1609 1749
1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1750 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1611 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.");
1612 1752
1613 $BUTTONBAR->add (new CFClient::UI::Button 1753 $BUTTONBAR->add (new CFPlus::UI::Button
1614 text => "Save Config", 1754 text => "Save Config",
1615 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.",
1616 on_activate => sub { 1756 on_activate => sub {
1617 $::CFG->{layout} = CFClient::UI::get_layout; 1757 $::CFG->{layout} = CFPlus::UI::get_layout;
1618 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1758 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1619 status "Configuration Saved"; 1759 status "Configuration Saved";
1620 0 1760 0
1621 }, 1761 },
1622 ); 1762 );
1623 1763
1624 $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,
1625 tooltip => "View Documentation"); 1765 tooltip => "View Documentation");
1626 1766
1627 $BUTTONBAR->add (new CFClient::UI::Button 1767 $BUTTONBAR->add (new CFPlus::UI::Button
1628 text => "Quit", 1768 text => "Quit",
1629 tooltip => "Terminates the program", 1769 tooltip => "Terminates the program",
1630 on_activate => sub { 1770 on_activate => sub {
1631 if ($CONN) { 1771 if ($CONN) {
1632 open_quit_dialog; 1772 open_quit_dialog;
… …
1643 1783
1644 $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]);
1645} 1785}
1646 1786
1647sub video_shutdown { 1787sub video_shutdown {
1648 CFClient::OpenGL::shutdown; 1788 CFPlus::OpenGL::shutdown;
1649 1789
1650 undef $SDL_ACTIVE; 1790 undef $SDL_ACTIVE;
1651} 1791}
1652 1792
1653my @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#
… …
1661 1801
1662sub audio_music_finished { 1802sub audio_music_finished {
1663 return unless $CFG->{bgm_enable}; 1803 return unless $CFG->{bgm_enable};
1664 1804
1665 # TODO: hack, do play loop and mood music 1805 # TODO: hack, do play loop and mood music
1666 $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]";
1667 $bgmusic->play (0); 1807 $bgmusic->play (0);
1668 1808
1669 push @bgmusic, shift @bgmusic; 1809 push @bgmusic, shift @bgmusic;
1670} 1810}
1671 1811
1672sub audio_init { 1812sub audio_init {
1673 if ($CFG->{audio_enable}) { 1813 if ($CFG->{audio_enable}) {
1674 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1814 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1675 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1815 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1676 1816
1677 unless ($SDL_MIXER) { 1817 unless ($SDL_MIXER) {
1678 status "Unable to open sound device: there will be no sound"; 1818 status "Unable to open sound device: there will be no sound";
1679 return; 1819 return;
1680 } 1820 }
1681 1821
1682 CFClient::Mix_AllocateChannels 8; 1822 CFPlus::Mix_AllocateChannels 8;
1683 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1823 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1684 1824
1685 audio_music_finished; 1825 audio_music_finished;
1686 1826
1687 while (<$fh>) { 1827 while (<$fh>) {
1688 next if /^\s*#/; 1828 next if /^\s*#/;
… …
1691 my ($file, $volume, $event) = split /\s+/, $_, 3; 1831 my ($file, $volume, $event) = split /\s+/, $_, 3;
1692 1832
1693 push @SOUNDS, "$volume,$file"; 1833 push @SOUNDS, "$volume,$file";
1694 1834
1695 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1835 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1696 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";
1697 $chunk->volume ($volume * 128 / 100); 1837 $chunk->volume ($volume * 128 / 100);
1698 $chunk 1838 $chunk
1699 }; 1839 };
1700 } 1840 }
1701 } else { 1841 } else {
… …
1703 } 1843 }
1704 } 1844 }
1705} 1845}
1706 1846
1707sub audio_shutdown { 1847sub audio_shutdown {
1708 CFClient::Mix_CloseAudio if $SDL_MIXER; 1848 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1709 undef $SDL_MIXER; 1849 undef $SDL_MIXER;
1710 @SOUNDS = (); 1850 @SOUNDS = ();
1711 %AUDIO_CHUNKS = (); 1851 %AUDIO_CHUNKS = ();
1712} 1852}
1713 1853
… …
1720 1860
1721sub force_refresh { 1861sub force_refresh {
1722 $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;
1723 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1863 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1724 1864
1725 $CFClient::UI::ROOT->draw; 1865 $CFPlus::UI::ROOT->draw;
1726 1866
1727 $WANT_REFRESH = 0; 1867 $WANT_REFRESH = 0;
1728 $CAN_REFRESH = 0; 1868 $CAN_REFRESH = 0;
1729 $LAST_REFRESH = $NOW; 1869 $LAST_REFRESH = $NOW;
1730 1870
17310 && do {
1732 # some weird model-drawing code, just a joke right now
1733 use CFClient::OpenGL;
1734
1735 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1736 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1737 $demo{r} ||= do {
1738 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1739 $mod->{v} = pack "f*", @{$mod->{v}};
1740 $_ = [scalar @$_, pack "S!*", @$_]
1741 for values %{$mod->{g}};
1742 $mod
1743 };
1744
1745 my $r = $demo{r} or die;
1746
1747 glDepthMask 1;
1748 glClear GL_DEPTH_BUFFER_BIT;
1749 glEnable GL_TEXTURE_2D;
1750 glEnable GL_DEPTH_TEST;
1751 glEnable GL_CULL_FACE;
1752 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1753
1754 glMatrixMode GL_PROJECTION;
1755 glLoadIdentity;
1756 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1757 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1758 glMatrixMode GL_MODELVIEW;
1759 glLoadIdentity;
1760
1761 glPushMatrix;
1762 glTranslate 0, 0, -800;
1763 glScale 1, -1, 1;
1764 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1765 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1766 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1767 glScale 50, 50, 50;
1768
1769 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1770 while (my ($k, $v) = each %{$r->{g}}) {
1771 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1772 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1773 }
1774
1775 glPopMatrix;
1776
1777 glShadeModel GL_FLAT;
1778 glDisable GL_DEPTH_TEST;
1779 glDisable GL_TEXTURE_2D;
1780 glDepthMask 0;
1781
1782 $WANT_REFRESH++;
1783};
1784
1785 CFClient::SDL_GL_SwapBuffers; 1871 CFPlus::SDL_GL_SwapBuffers;
1786} 1872}
1787 1873
1788my $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 {
1789 $NOW = time; 1875 $NOW = time;
1790 1876
1791 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1877 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1792 for CFClient::SDL_PollEvent; 1878 for CFPlus::SDL_PollEvent;
1793 1879
1794 if (%animate_object) { 1880 if (%animate_object) {
1795 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1881 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1796 $WANT_REFRESH++; 1882 $WANT_REFRESH++;
1797 } 1883 }
… …
1821 $CONN->face_prefetch 1907 $CONN->face_prefetch
1822 if $CONN; 1908 if $CONN;
1823}); 1909});
1824 1910
1825%SDL_CB = ( 1911%SDL_CB = (
1826 CFClient::SDL_QUIT => sub { 1912 CFPlus::SDL_QUIT => sub {
1827 Event::unloop -1; 1913 Event::unloop -1;
1828 }, 1914 },
1829 CFClient::SDL_VIDEORESIZE => sub { 1915 CFPlus::SDL_VIDEORESIZE => sub {
1830 }, 1916 },
1831 CFClient::SDL_VIDEOEXPOSE => sub { 1917 CFPlus::SDL_VIDEOEXPOSE => sub {
1832 CFClient::UI::full_refresh; 1918 CFPlus::UI::full_refresh;
1833 }, 1919 },
1834 CFClient::SDL_ACTIVEEVENT => sub { 1920 CFPlus::SDL_ACTIVEEVENT => sub {
1835# 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#
1836 }, 1922 },
1837 CFClient::SDL_KEYDOWN => sub { 1923 CFPlus::SDL_KEYDOWN => sub {
1838 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1924 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1839 # alt-enter 1925 # alt-enter
1840 $FULLSCREEN_ENABLE->toggle; 1926 $FULLSCREEN_ENABLE->toggle;
1841 video_shutdown; 1927 video_shutdown;
1842 video_init; 1928 video_init;
1843 } else { 1929 } else {
1844 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1930 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1845 } 1931 }
1846 }, 1932 },
1847 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1933 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1848 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1934 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1849 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1935 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1850 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1936 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1851 CFClient::SDL_USEREVENT => sub { 1937 CFPlus::SDL_USEREVENT => sub {
1852 if ($_[0]{code} == 1) { 1938 if ($_[0]{code} == 1) {
1853 audio_channel_finished $_[0]{data1}; 1939 audio_channel_finished $_[0]{data1};
1854 } elsif ($_[0]{code} == 0) { 1940 } elsif ($_[0]{code} == 0) {
1855 audio_music_finished; 1941 audio_music_finished;
1856 } 1942 }
… …
1860############################################################################# 1946#############################################################################
1861 1947
1862$SIG{INT} = $SIG{TERM} = sub { exit }; 1948$SIG{INT} = $SIG{TERM} = sub { exit };
1863 1949
1864{ 1950{
1865 local $SIG{__DIE__} = sub {
1866 return unless defined $^S && !$^S;
1867 Carp::confess $_[0];#d#TODO: remove when stable
1868 CFClient::fatal $_[0];
1869 };
1870
1871 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1951 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1872 CFClient::UI::set_layout ($::CFG->{layout}); 1952 CFPlus::UI::set_layout ($::CFG->{layout});
1873 1953
1874 my %DEF_CFG = ( 1954 my %DEF_CFG = (
1875 sdl_mode => 0, 1955 sdl_mode => 0,
1876 width => 640, 1956 width => 640,
1877 height => 480, 1957 height => 480,
… …
1893 bgm_volume => 0.25, 1973 bgm_volume => 0.25,
1894 face_prefetch => 0, 1974 face_prefetch => 0,
1895 output_sync => 1, 1975 output_sync => 1,
1896 output_count => 1, 1976 output_count => 1,
1897 pickup => 0, 1977 pickup => 0,
1978 inv_sort => "mtime",
1898 default => "profile", # default profile 1979 default => "profile", # default profile
1899 ); 1980 );
1900 1981
1901 while (my ($k, $v) = each %DEF_CFG) { 1982 while (my ($k, $v) = each %DEF_CFG) {
1902 $CFG->{$k} = $v unless exists $CFG->{$k}; 1983 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
1906 1987
1907 sdl_init; 1988 sdl_init;
1908 1989
1909 @SDL_MODES = reverse 1990 @SDL_MODES = reverse
1910 grep $_->[0] >= 640 && $_->[1] >= 480, 1991 grep $_->[0] >= 640 && $_->[1] >= 480,
1911 CFClient::SDL_ListModes; 1992 CFPlus::SDL_ListModes;
1912 1993
1913 @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)";
1914 1995
1915 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1996 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1916 1997
1917 { 1998 {
1918 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1999 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1919 DejaVuSans.ttf 2000 DejaVuSans.ttf
1920 DejaVuSansMono.ttf 2001 DejaVuSansMono.ttf
1921 DejaVuSans-Bold.ttf 2002 DejaVuSans-Bold.ttf
1922 DejaVuSansMono-Bold.ttf 2003 DejaVuSansMono-Bold.ttf
1923 DejaVuSans-Oblique.ttf 2004 DejaVuSans-Oblique.ttf
1924 DejaVuSansMono-Oblique.ttf 2005 DejaVuSansMono-Oblique.ttf
1925 DejaVuSans-BoldOblique.ttf 2006 DejaVuSans-BoldOblique.ttf
1926 DejaVuSansMono-BoldOblique.ttf 2007 DejaVuSansMono-BoldOblique.ttf
1927 ); 2008 );
1928 2009
1929 CFClient::add_font $_ for @fonts; 2010 CFPlus::add_font $_ for @fonts;
1930 2011
1931 CFClient::pango_init; 2012 CFPlus::pango_init;
1932 2013
1933 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2014 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1934 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2015 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1935 2016
1936 $FONT_PROP->make_default; 2017 $FONT_PROP->make_default;
1937 } 2018 }
1938 2019
1939# compare mono (ft) vs. rgba (cairo) 2020# compare mono (ft) vs. rgba (cairo)
1940# ft - 1.8s, cairo 3s, even in alpha-only mode 2021# ft - 1.8s, cairo 3s, even in alpha-only mode
1941# for my $rgba (0..1) { 2022# for my $rgba (0..1) {
1942# my $t1 = Time::HiRes::time; 2023# my $t1 = Time::HiRes::time;
1943# for (1..1000) { 2024# for (1..1000) {
1944# my $layout = CFClient::Layout->new ($rgba); 2025# my $layout = CFPlus::Layout->new ($rgba);
1945# $layout->set_text ("hallo" x 100); 2026# $layout->set_text ("hallo" x 100);
1946# $layout->render; 2027# $layout->render;
1947# } 2028# }
1948# my $t2 = Time::HiRes::time; 2029# my $t2 = Time::HiRes::time;
1949# warn $t2-$t1; 2030# warn $t2-$t1;
… …
1952 video_init; 2033 video_init;
1953 audio_init; 2034 audio_init;
1954} 2035}
1955 2036
1956Event::loop; 2037Event::loop;
1957#CFClient::SDL_Quit; 2038#CFPlus::SDL_Quit;
1958#CFClient::_exit 0; 2039#CFPlus::_exit 0;
1959 2040
1960END { CFClient::SDL_Quit } 2041END { CFPlus::SDL_Quit }
1961 2042
1962=head1 NAME 2043=head1 NAME
1963 2044
1964cfplus - A Crossfire+ and Crossfire game client 2045cfplus - A Crossfire+ and Crossfire game client
1965 2046

Diff Legend

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