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

Diff Legend

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