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

Diff Legend

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