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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC

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

Diff Legend

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