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.91 by root, Tue Jul 11 13:51:38 2006 UTC vs.
Revision 1.104 by root, Sun Jul 30 13:14:15 2006 UTC

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

Diff Legend

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