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

Diff Legend

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