ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.89 by elmex, Sun Jul 9 21:11:48 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 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 => "Gauge fontsize"); 502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
481 $table->add (1, $row++, new CFClient::UI::Slider 503 $table->add (1, $row++, new CFPlus::UI::Slider
482 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
483 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
484 on_changed => sub { 506 on_changed => sub {
485 $CFG->{gauge_fontsize} = $_[1]; 507 $CFG->{gauge_fontsize} = $_[1];
486 &set_gauge_window_fontsize; 508 &set_gauge_window_fontsize;
487 0 509 0
488 } 510 }
489 ); 511 );
490 512
491 $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");
492 $table->add (1, $row++, new CFClient::UI::Slider 514 $table->add (1, $row++, new CFPlus::UI::Slider
493 range => [$CFG->{gauge_size}, 0.2, 0.8], 515 range => [$CFG->{gauge_size}, 0.2, 0.8],
494 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.",
495 on_changed => sub { 517 on_changed => sub {
496 $CFG->{gauge_size} = $_[1]; 518 $CFG->{gauge_size} = $_[1];
497 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
498 0 520 0
499 } 521 }
500 ); 522 );
501 523
502 $table->add (1, $row++, new CFClient::UI::Button 524 $table->add (1, $row++, new CFPlus::UI::Button
503 expand => 1, align => 0, text => "Apply", 525 expand => 1, align => 0, text => "Apply",
504 tooltip => "Apply the video settings", 526 tooltip => "Apply the video settings",
505 on_activate => sub { 527 on_activate => sub {
506 video_shutdown (); 528 video_shutdown ();
507 video_init (); 529 video_init ();
… …
511 533
512 $vbox 534 $vbox
513} 535}
514 536
515sub audio_setup { 537sub audio_setup {
516 my $vbox = new CFClient::UI::VBox; 538 my $vbox = new CFPlus::UI::VBox;
517 539
518 $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]);
519 541
520 my $row = 0; 542 my $row = 0;
521 543
522 $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");
523 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, new CFPlus::UI::CheckBox
524 state => $CFG->{audio_enable}, 546 state => $CFG->{audio_enable},
525 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
526 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
527 ); 549 );
528# $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");
529# $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 {
530# $CFG->{effects_volume} = $_[1]; 552# $CFG->{effects_volume} = $_[1];
531# }); 553# });
532 $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");
533 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
534 $hbox->add (new CFClient::UI::CheckBox 556 $hbox->add (new CFPlus::UI::CheckBox
535 expand => 1, state => $CFG->{bgm_enable}, 557 expand => 1, state => $CFG->{bgm_enable},
536 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.",
537 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
538 ); 560 );
539 $hbox->add (new CFClient::UI::Slider 561 $hbox->add (new CFPlus::UI::Slider
540 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
541 tooltip => "The volume of the background music. Changes are instant.", 563 tooltip => "The volume of the background music. Changes are instant.",
542 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 }
543 ); 565 );
544 566
545 $table->add (1, $row++, new CFClient::UI::Button 567 $table->add (1, $row++, new CFPlus::UI::Button
546 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
547 tooltip => "Apply the audio settings", 569 tooltip => "Apply the audio settings",
548 on_activate => sub { 570 on_activate => sub {
549 audio_shutdown (); 571 audio_shutdown ();
550 audio_init (); 572 audio_init ();
… …
562} 584}
563 585
564sub make_gauge_window { 586sub make_gauge_window {
565 my $gh = int $HEIGHT * $CFG->{gauge_size}; 587 my $gh = int $HEIGHT * $CFG->{gauge_size};
566 588
567 my $win = new CFClient::UI::Frame ( 589 my $win = new CFPlus::UI::Frame (
568 force_x => 0, 590 force_x => 0,
569 force_y => "max", 591 force_y => "max",
570 force_w => $WIDTH, 592 force_w => $WIDTH,
571 force_h => $gh, 593 force_h => $gh,
572 ); 594 );
573 595
574 $win->add (my $hbox = new CFClient::UI::HBox 596 $win->add (my $hbox = new CFPlus::UI::HBox
575 children => [ 597 children => [
576 (new CFClient::UI::HBox expand => 1), 598 (new CFPlus::UI::HBox expand => 1),
577 (new CFClient::UI::VBox children => [ 599 (new CFPlus::UI::VBox children => [
578 (new CFClient::UI::Empty expand => 1), 600 (new CFPlus::UI::Empty expand => 1),
579 (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)),
580 ]), 602 ]),
581 (my $vbox = new CFClient::UI::VBox), 603 (my $vbox = new CFPlus::UI::VBox),
582 ], 604 ],
583 ); 605 );
584 606
585 $vbox->add (new CFClient::UI::HBox 607 $vbox->add (new CFPlus::UI::HBox
586 expand => 1, 608 expand => 1,
587 children => [ 609 children => [
588 (new CFClient::UI::Empty expand => 1), 610 (new CFPlus::UI::Empty expand => 1),
589 (my $hb = new CFClient::UI::HBox), 611 (my $hb = new CFPlus::UI::HBox),
590 ], 612 ],
591 ); 613 );
592 614
593 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 615 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
594 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
595 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 616 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
596 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
597 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 617 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
598 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
599 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 618 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
600 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
601 619
602 $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");
603 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
604 $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");
605 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
606 622
607 $GAUGES = { 623 $GAUGES = {
608 exp => $exp, win => $win, range => $rng, 624 exp => $exp, win => $win, range => $rng,
609 food => $fg, mana => $mg, hp => $hg, grace => $gg 625 food => $fg, mana => $mg, hp => $hg, grace => $gg
610 }; 626 };
… …
613 629
614 $win 630 $win
615} 631}
616 632
617sub debug_setup { 633sub debug_setup {
618 my $table = new CFClient::UI::Table; 634 my $table = new CFPlus::UI::Table;
619 635
620 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
621 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
622 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
623 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
624 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
625 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
626 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
627 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
628 644
629 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);
630 646
631 for my $x (0..2) { 647 for my $x (0..2) {
632 for my $y (0 .. 2) { 648 for my $y (0 .. 2) {
633 $table->add ($x + 3, $y, 649 $table->add ($x + 3, $y,
634 new CFClient::UI::Entry 650 new CFPlus::UI::Entry
635 text => $default_smooth[$x * 3 + $y], 651 text => $default_smooth[$x * 3 + $y],
636 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 },
637 ); 653 );
638 } 654 }
639 } 655 }
… …
641 657
642 $table 658 $table
643} 659}
644 660
645sub stats_window { 661sub stats_window {
662 my $r = new CFPlus::UI::ScrolledWindow (
663 expand => 1,
664 scroll_y => 1
665 );
646 my $vb = new CFClient::UI::VBox; 666 $r->add (my $vb = new CFPlus::UI::VBox);
647 667
668 $vb->add (new CFPlus::UI::FancyFrame
669 label => "Player",
670 child => (my $pi = new CFPlus::UI::VBox),
671 );
672
648 $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,
649 can_hover => 1, can_events => 1, 674 can_hover => 1, can_events => 1,
650 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 675 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 676 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
652 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
653 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).");
654 679
655 $vb->add (my $hb0 = new CFClient::UI::HBox); 680 $pi->add (my $hb0 = new CFPlus::UI::HBox);
656 $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,
657 can_hover => 1, can_events => 1, 682 can_hover => 1, can_events => 1,
658 tooltip => "The weight of the player including all inventory items."); 683 tooltip => "The weight of the player including all inventory items.");
659 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 684 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
660 can_hover => 1, can_events => 1, 685 can_hover => 1, can_events => 1,
661 tooltip => "The weight limit: you cannot carry more than this."); 686 tooltip => "The weight limit: you cannot carry more than this.");
662 687
663 688 $vb->add (new CFPlus::UI::FancyFrame
689 label => "Primary/Secondary Statistics",
664 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 690 child => (my $hb = new CFPlus::UI::HBox expand => 1),
691 );
665 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 692 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
666 693
667 my $color2 = [1, 1, 0]; 694 my $color2 = [1, 1, 0];
668 695
669 for ( 696 for (
670 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 697 [0, 0, st_str => "Str", 30],
671 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 698 [0, 1, st_dex => "Dex", 30],
672 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 699 [0, 2, st_con => "Con", 30],
673 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 700 [0, 3, st_int => "Int", 30],
674 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 701 [0, 4, st_wis => "Wis", 30],
675 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 702 [0, 5, st_pow => "Pow", 30],
676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 703 [0, 6, st_cha => "Cha", 30],
677 704
678 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 705 [2, 0, st_wc => "Wc", -120],
679 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 706 [2, 1, st_ac => "Ac", -120],
680 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 707 [2, 2, st_dam => "Dam", 120],
681 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."], 708 [2, 3, st_arm => "Arm", 120],
682 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 709 [2, 4, st_spd => "Spd", 10.54],
683 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 710 [2, 5, st_wspd => "WSp", 10.54],
684 ) { 711 ) {
685 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 712 my ($col, $row, $id, $label, $template) = @$_;
686 713
687 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
688 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label");
689 $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
690 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");
691 } 720 }
692 721
722 $vb->add (new CFPlus::UI::FancyFrame
723 label => "Resistancies",
693 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
725 );
694 726
695 my $row = 0; 727 my $row = 0;
696 my $col = 0; 728 my $col = 0;
697 729
698 my %resist_names = ( 730 my %resist_names = (
731 slow => ["Slow",
699 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 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",
700 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 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",
701 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",
702 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",
703 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",
704 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",
705 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",
706 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",
707 pois => "<b>Poison</b> (resistance to getting poisoned)", 748 "<b>Poison</b> (resistance to getting poisoned)"],
749 para => ["Paralysation",
708 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",
709 deat => "<b>Death</b> (resistance against death spells)", 752 "<b>Death</b> (resistance against death spells)"],
753 phys => ["Physical",
710 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)", 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",
711 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",
712 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 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",
713 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",
714 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",
715 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",
716 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)"],
717 ); 767 );
718 for (qw/slow holyw conf fire depl magic 768 for (qw/slow holyw conf fire depl magic
719 drain acid pois para deat phys 769 drain acid pois para deat phys
720 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
721 { 771 {
722 $tbl2->add ($col, $row, 772 $tbl2->add ($col, $row,
723 $STATWIDS->{"res_$_"} = 773 $STATWIDS->{"res_$_"} =
724 new CFClient::UI::Label 774 new CFPlus::UI::Label
725 font => $FONT_FIXED, 775 font => $FONT_FIXED,
726 template => "-100%", 776 template => "-100%",
727 align => +1, 777 align => +1,
728 valign => 0, 778 valign => 0,
729 can_events => 1, 779 can_events => 1,
730 can_hover => 1, 780 can_hover => 1,
731 tooltip => $resist_names{$_}, 781 tooltip => $resist_names{$_}->[1],
732 ); 782 );
733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
734 font => $FONT_FIXED, 784 font => $FONT_FIXED,
735 can_hover => 1, 785 can_hover => 1,
736 can_events => 1, 786 can_events => 1,
737 path => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
738 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],
739 ); 796 );
740 797
741 $row++; 798 $row++;
742 if ($row % 6 == 0) { 799 if ($row % 6 == 0) {
743 $col += 2; 800 $col += 3;
744 $row = 0; 801 $row = 0;
745 } 802 }
746 } 803 }
747 804
748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
751 update_stats_window ({}); 805 #update_stats_window ({});
752 806
753 $vb 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]);
813 $sw
754} 814}
755 815
756sub formsep($) { 816sub formsep($) {
757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
758} 818}
759 819
760sub update_stats_window {
761 my ($stats) = @_;
762
763 # I love text protocols...
764
765 my $hp = $stats->{+CS_STAT_HP} * 1;
766 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
767 my $sp = $stats->{+CS_STAT_SP} * 1;
768 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
769 my $fo = $stats->{+CS_STAT_FOOD} * 1;
770 my $fo_m = 999;
771 my $gr = $stats->{+CS_STAT_GRACE} * 1;
772 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
773
774 $GAUGES->{hp} ->set_value ($hp, $hp_m);
775 $GAUGES->{mana} ->set_value ($sp, $sp_m);
776 $GAUGES->{food} ->set_value ($fo, $fo_m);
777 $GAUGES->{grace} ->set_value ($gr, $gr_m);
778 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
779 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
780 my $rng = $stats->{+CS_STAT_RANGE};
781 $rng =~ s/^Range: //; # thank you so much dear server
782 $GAUGES->{range} ->set_text ("Rng: " . $rng);
783 my $title = $stats->{+CS_STAT_TITLE};
784 $title =~ s/^Player: //;
785 $STATWIDS->{title} ->set_text ("Title: " . $title);
786
787 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
788 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
789 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
790 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
791 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
800
801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
802
803 my %tbl = (
804 phys => CS_STAT_RES_PHYS,
805 magic => CS_STAT_RES_MAG,
806 fire => CS_STAT_RES_FIRE,
807 elec => CS_STAT_RES_ELEC,
808 cold => CS_STAT_RES_COLD,
809 conf => CS_STAT_RES_CONF,
810 acid => CS_STAT_RES_ACID,
811 drain => CS_STAT_RES_DRAIN,
812 ghit => CS_STAT_RES_GHOSTHIT,
813 pois => CS_STAT_RES_POISON,
814 slow => CS_STAT_RES_SLOW,
815 para => CS_STAT_RES_PARA,
816 tund => CS_STAT_TURN_UNDEAD,
817 fear => CS_STAT_RES_FEAR,
818 depl => CS_STAT_RES_DEPLETE,
819 deat => CS_STAT_RES_DEATH,
820 holyw => CS_STAT_RES_HOLYWORD,
821 blind => CS_STAT_RES_BLIND,
822 );
823
824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
825 my $sktbl = $STATWIDS->{_skill_tbl};
826 $sktbl->clear;
827
828 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
829 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
830 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
831
832 my @skills;
833
834 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
835 push @skills, [$i, $::CONN->{skill_info}{$i}];
836 }
837
838 my $y = 1;
839 for (sort { $a->[1] cmp $b->[1] } @skills) {
840 my ($idx, $name) = @$_;
841
842 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
843 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
844 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
846 }
847 }
848
849 $STATWIDS->{_skill_tbl_init} = 1;
850 }
851
852 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
853 if (exists $stats->{$i}) {
854 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
855 if $STATWIDS->{"sk_xp_$i"};
856 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
857 if $STATWIDS->{"sk_lvl_$i"};
858 }
859 }
860
861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
862 for keys %tbl;
863}
864
865my $METASERVER_ATIME; 820my $METASERVER_ATIME;
866 821
867sub update_metaserver { 822sub update_metaserver {
868 my ($metaserver_dialog) = @_; 823 my ($metaserver_dialog) = @_;
869 824
… …
873 return if $METASERVER_ATIME > time; 828 return if $METASERVER_ATIME > time;
874 $METASERVER_ATIME = time + 60; 829 $METASERVER_ATIME = time + 60;
875 830
876 my $table = $METASERVER->{table}; 831 my $table = $METASERVER->{table};
877 $table->clear; 832 $table->clear;
878 $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...");
879 834
880 my $buf; 835 my $buf;
881 836
882 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
883 838
… …
906 "The time this server has been running without being restarted.", 861 "The time this server has been running without being restarted.",
907 "The server software version - a '+' indicates a Crossfire+ server.", 862 "The server software version - a '+' indicates a Crossfire+ server.",
908 "Short information about this server provided by its admins.", 863 "Short information about this server provided by its admins.",
909 ); 864 );
910 my @col = qw(#Users Host Uptime Version Description); 865 my @col = qw(#Users Host Uptime Version Description);
911 $table->add ($_, 0, new CFClient::UI::Label 866 $table->add ($_, 0, new CFPlus::UI::Label
912 can_hover => 1, can_events => 1, 867 can_hover => 1, can_events => 1,
913 align => 0, fg => [1, 1, 0], 868 align => 0, fg => [1, 1, 0],
914 text => $col[$_], tooltip => $tip[$_]) 869 text => $col[$_], tooltip => $tip[$_])
915 for 0 .. $#col; 870 for 0 .. $#col;
916 871
… …
937 892
938 $m = [$users, $host, $uptime, $version, $desc]; 893 $m = [$users, $host, $uptime, $version, $desc];
939 894
940 $y++; 895 $y++;
941 896
942 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
943 (new CFClient::UI::Button 898 (new CFPlus::UI::Button
944 text => "Use", 899 text => "Use",
945 tooltip => "Put this server into the <b>Host:Port</b> field", 900 tooltip => "Put this server into the <b>Host:Port</b> field",
946 on_activate => sub { 901 on_activate => sub {
947 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
948 $METASERVER->hide; 903 $METASERVER->hide;
949 0 904 0
950 }, 905 },
951 ), 906 ),
952 (new CFClient::UI::Empty expand => 1), 907 (new CFPlus::UI::Empty expand => 1),
953 ]); 908 ]);
954 909
955 $table->add ($_, $y, new CFClient::UI::Label 910 $table->add ($_, $y, new CFPlus::UI::Label
956 ellipsise => 0, 911 ellipsise => 0,
957 align => $align[$_], 912 align => $align[$_],
958 text => $m->[$_], 913 text => $m->[$_],
959 tooltip => $tip[$_], 914 tooltip => $tip[$_],
960 can_hover => 1, 915 can_hover => 1,
… …
965 } 920 }
966 }); 921 });
967} 922}
968 923
969sub metaserver_dialog { 924sub metaserver_dialog {
970 my $vbox = new CFClient::UI::VBox; 925 my $vbox = new CFPlus::UI::VBox;
971 my $table = new CFClient::UI::Table; 926 my $table = new CFPlus::UI::Table;
972 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 927 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
973 928
974 my $dialog = new CFClient::UI::FancyFrame 929 my $dialog = new CFPlus::UI::Toplevel
975 title => "Server List", 930 title => "Server List",
976 name => 'metaserver_dialog', 931 name => 'metaserver_dialog',
977 x => 'center', 932 x => 'center',
978 y => 'center', 933 y => 'center',
979 z => 3, 934 z => 3,
… …
989 944
990 $dialog 945 $dialog
991} 946}
992 947
993sub server_setup { 948sub server_setup {
994 my $vbox = new CFClient::UI::VBox; 949 my $vbox = new CFPlus::UI::VBox;
995 950
951 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings",
996 $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 );
997 $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");
998 956
999 { 957 {
1000 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
1001 959
1002 $vbox->add ( 960 $vbox->add (
1003 $HOST_ENTRY = new CFClient::UI::Entry 961 $HOST_ENTRY = new CFPlus::UI::Entry
1004 expand => 1, 962 expand => 1,
1005 text => $CFG->{profile}{default}{host}, 963 text => $CFG->{profile}{default}{host},
1006 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",
1007 on_changed => sub { 965 on_changed => sub {
1008 my ($self, $value) = @_; 966 my ($self, $value) = @_;
1009 $CFG->{profile}{default}{host} = $value; 967 $CFG->{profile}{default}{host} = $value;
1010 0 968 0
1011 } 969 }
1012 ); 970 );
1013 971
1014 $vbox->add (new CFClient::UI::Button 972 $vbox->add (new CFPlus::UI::Button
1015 expand => 1, 973 expand => 1,
1016 text => "Server List", 974 text => "Server List",
1017 other => $METASERVER, 975 other => $METASERVER,
1018 tooltip => "Show a list of available crossfire servers", 976 tooltip => "Show a list of available crossfire servers",
1019 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 977 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1021 ); 979 );
1022 } 980 }
1023 981
1024 $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");
1025 $table->add (1, 4, new CFClient::UI::Entry 983 $table->add (1, 4, new CFPlus::UI::Entry
1026 text => $CFG->{profile}{default}{user}, 984 text => $CFG->{profile}{default}{user},
1027 tooltip => "The name of your character on the server", 985 tooltip => "The name of your character on the server",
1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1029 ); 987 );
1030 988
1031 $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");
1032 $table->add (1, 5, new CFClient::UI::Entry 990 $table->add (1, 5, new CFPlus::UI::Entry
1033 text => $CFG->{profile}{default}{password}, 991 text => $CFG->{profile}{default}{password},
1034 hidden => 1, 992 hidden => 1,
1035 tooltip => "The password for your character", 993 tooltip => "The password for your character",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1037 ); 995 );
1038 996
1039 $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");
1040 $table->add (1, 7, new CFClient::UI::Slider 998 $table->add (1, 7, new CFPlus::UI::Slider
1041 force_w => 100, 999 force_w => 100,
1042 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1000 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1043 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. "
1044 . "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, "
1045 . "but you also increase bandwidth requirements and latency. " 1003 . "but you also increase bandwidth requirements and latency. "
1046 . "This option is only used once at log-in.", 1004 . "This option is only used once at log-in.",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1048 ); 1006 );
1049 1007
1050 $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");
1051 $table->add (1, 8, new CFClient::UI::CheckBox 1009 $table->add (1, 8, new CFPlus::UI::CheckBox
1052 state => $CFG->{face_prefetch}, 1010 state => $CFG->{face_prefetch},
1053 tooltip => "<b>Background Image Prefetch</b>\n\n" 1011 tooltip => "<b>Background Image Prefetch</b>\n\n"
1054 . "If enabled, the client automatically pre-fetches images from the server. " 1012 . "If enabled, the client automatically pre-fetches images from the server. "
1055 . "This might increase or create lag, but increases the chances " 1013 . "This might increase or create lag, but increases the chances "
1056 . "of faces being ready for display when you encounter them. " 1014 . "of faces being ready for display when you encounter them. "
… …
1058 . "so only set it if you really need to prefetch images. " 1016 . "so only set it if you really need to prefetch images. "
1059 . "This option can be set and unset any time.", 1017 . "This option can be set and unset any time.",
1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1061 ); 1019 );
1062 1020
1063 $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");
1064 $table->add (1, 9, new CFClient::UI::Entry 1022 $table->add (1, 9, new CFPlus::UI::Entry
1065 text => $CFG->{output_count}, 1023 text => $CFG->{output_count},
1066 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1068 ); 1026 );
1069 1027
1070 $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");
1071 $table->add (1, 10, new CFClient::UI::Entry 1029 $table->add (1, 10, new CFPlus::UI::Entry
1072 text => $CFG->{output_sync}, 1030 text => $CFG->{output_sync},
1073 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1075 ); 1033 );
1076 1034
1077 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1078 expand => 1, 1036 expand => 1,
1079 align => 0, 1037 align => 0,
1080 text => "Login", 1038 text => "Login",
1081 on_activate => sub { 1039 on_activate => sub {
1082 $CONN ? stop_game 1040 $CONN ? stop_game
1083 : start_game; 1041 : start_game;
1084 0 1042 0
1085 }, 1043 },
1086 ); 1044 );
1087 1045
1088 $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");
1089 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1090 text => $CFG->{say_command}, 1048 text => $CFG->{say_command},
1091 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 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. "
1092 . "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. "
1093 . "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.",
1094 on_changed => sub { 1052 on_changed => sub {
… …
1096 $CFG->{say_command} = $value; 1054 $CFG->{say_command} = $value;
1097 0 1055 0
1098 } 1056 }
1099 ); 1057 );
1100 1058
1101 $vbox->add (new CFClient::UI::Label 1059 $vbox->add (new CFPlus::UI::FancyFrame
1102 text => "Server Info", 1060 label => "Server Info",
1103 fontsize => 1.2,
1104 padding_y => 8,
1105 fg => [1, 1, 0, 1],
1106 );
1107
1108 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 );
1109 1063
1110 $vbox 1064 $vbox
1111} 1065}
1112 1066
1113sub message_window { 1067sub message_window {
1114 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFPlus::UI::Toplevel
1115 name => "message_window", 1069 name => "message_window",
1116 title => "Messages", 1070 title => "Messages",
1117 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1118 bg => [0, 0, 0, 0.75],
1119 x => "max", 1072 x => "max",
1120 y => 0, 1073 y => 0,
1121 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1122 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1123 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFPlus::UI::VBox),
1124 has_close_button => 1; 1077 has_close_button => 1;
1125 1078
1126 $vbox->add ($LOGVIEW); 1079 $vbox->add ($LOGVIEW);
1127 1080
1128 $vbox->add (my $input = new CFClient::UI::Entry 1081 $vbox->add (my $input = new CFPlus::UI::Entry
1129 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1130 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1131 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1132 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1133 on_focus_in => sub { 1086 on_focus_in => sub {
… …
1172 }; 1125 };
1173 1126
1174 $window 1127 $window
1175} 1128}
1176 1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
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 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1177sub open_quit_dialog { 1149sub open_quit_dialog {
1178 unless ($QUIT_DIALOG) { 1150 unless ($QUIT_DIALOG) {
1179 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1180 x => "center", 1152 x => "center",
1181 y => "center", 1153 y => "center",
1182 z => 50, 1154 z => 50,
1183 title => "Really Quit?", 1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1184 ; 1160 ;
1185 1161
1186 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1187 1163
1188 $vb->add (new CFClient::UI::Label 1164 $vb->add (new CFPlus::UI::Label
1189 text => "You should find a savebed and apply it first!", 1165 text => "You should find a savebed and apply it first!",
1190 max_w => $WIDTH * 0.25, 1166 max_w => $WIDTH * 0.25,
1191 ellipsize => 0, 1167 ellipsize => 0,
1192 ); 1168 );
1193 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1194 $hb->add (new CFClient::UI::Button 1170 $hb->add (new CFPlus::UI::Button
1195 text => "Ok", 1171 text => "Ok",
1196 expand => 1, 1172 expand => 1,
1197 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1198 ); 1174 );
1199 $hb->add (new CFClient::UI::Button 1175 $hb->add (new CFPlus::UI::Button
1200 text => "Quit anyway", 1176 text => "Quit anyway",
1201 expand => 1, 1177 expand => 1,
1202 on_activate => sub { exit }, 1178 on_activate => sub { exit },
1203 ); 1179 );
1204 } 1180 }
1205 1181
1206 $QUIT_DIALOG->show; 1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1207} 1184}
1208 1185
1209sub autopickup_setup { 1186sub autopickup_setup {
1210 my $table = new CFClient::UI::Table; 1187 my $table = new CFPlus::UI::Table;
1211 1188
1212 for ( 1189 for (
1213 ["General", 0, 0, 1190 ["General", 0, 0,
1214 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1191 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1215 ["Inhibit autopickup" => PICKUP_INHIBIT], 1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1249 ], 1226 ],
1250 ["Weight/Value ratio", 2, 17] 1227 ["Weight/Value ratio", 2, 17]
1251 ) 1228 )
1252 { 1229 {
1253 my ($title, $x, $y, @bits) = @$_; 1230 my ($title, $x, $y, @bits) = @$_;
1254 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1231 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1255 1232
1256 for (@bits) { 1233 for (@bits) {
1257 ++$y; 1234 ++$y;
1258 1235
1259 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1260 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1261 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1262 state => $::CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1263 on_changed => sub { 1240 on_changed => sub {
1264 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1265 1242
1266 if ($value) { 1243 if ($value) {
… …
1277 1254
1278 ${$_->[2]} = $checkbox if $_->[2]; 1255 ${$_->[2]} = $checkbox if $_->[2];
1279 } 1256 }
1280 } 1257 }
1281 1258
1282 $table->add (2, 18, new CFClient::UI::ValSlider 1259 $table->add (2, 18, new CFPlus::UI::ValSlider
1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1260 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1284 template => ">= 99", 1261 template => ">= 99",
1285 to_value => sub { ">= " . 5 * $_[0] }, 1262 to_value => sub { ">= " . 5 * $_[0] },
1286 on_changed => sub { 1263 on_changed => sub {
1287 my ($slider, $value) = @_; 1264 my ($slider, $value) = @_;
… …
1290 $::CFG->{pickup} |= int $value 1267 $::CFG->{pickup} |= int $value
1291 if $value; 1268 if $value;
1292 1; 1269 1;
1293 }); 1270 });
1294 1271
1295 $table->add (3, 18, new CFClient::UI::Button 1272 $table->add (3, 18, new CFPlus::UI::Button
1296 text => "set", 1273 text => "set",
1297 on_activate => sub { 1274 on_activate => sub {
1298 $::CONN->send_command ("pickup $::CFG->{pickup}") 1275 $::CONN->send_command ("pickup $::CFG->{pickup}")
1299 if defined $::CONN; 1276 if defined $::CONN;
1300 0 1277 0
1301 }); 1278 });
1302 1279
1303 $table 1280 $table
1304} 1281}
1305 1282
1283my %SORT_ORDER = (
1284 type => undef,
1285 mtime => sub { sort {
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime}
1288 or $a->{type} <=> $b->{type}
1289 } @_ },
1290 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type}
1293 } @_ },
1294);
1295
1306sub inventory_widget { 1296sub inventory_widget {
1307 my $hb = new CFClient::UI::HBox homogeneous => 1; 1297 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1308 1298
1309 $hb->add (my $vb1 = new CFClient::UI::VBox); 1299 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1310 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1300 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1301
1302 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1303
1304 use sort 'stable';
1305
1306 $hb1->add (new CFPlus::UI::Selector
1307 value => $::CFG->{inv_sort},
1308 options => [
1309 [type => "Type/Name"],
1310 [mtime => "Recent/Normal/Locked"],
1311 [weight => "Weight/Type"],
1312 ],
1313 on_changed => sub {
1314 $::CFG->{inv_sort} = $_[1];
1315 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1316 },
1317 );
1318 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1319 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $vb1->add ($INV = new CFClient::UI::Inventory); 1323 $sw1->add ($INV = new CFPlus::UI::Inventory);
1312 1324
1313 $hb->add (my $vb2 = new CFClient::UI::VBox); 1325 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1314 1326
1315 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1316 1328
1329 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1317 $vb2->add ($INVR = new CFClient::UI::Inventory); 1330 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1318 1331
1319 # XXX: Call after $INVR = ... because set_opencont sets the items 1332 # XXX: Call after $INVR = ... because set_opencont sets the items
1320 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1333 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1321 1334
1322 $hb 1335 $hb
1323} 1336}
1324 1337
1325sub toggle_player_page { 1338sub toggle_player_page {
… …
1332 $PL_WINDOW->show; 1345 $PL_WINDOW->show;
1333 } 1346 }
1334} 1347}
1335 1348
1336sub player_window { 1349sub player_window {
1337 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1350 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1338 x => "center", 1351 x => "center",
1339 y => "center", 1352 y => "center",
1340 force_w => $WIDTH * 9/10, 1353 force_w => $WIDTH * 9/10,
1341 force_h => $HEIGHT * 9/10, 1354 force_h => $HEIGHT * 9/10,
1342 title => "Player", 1355 title => "Player",
1356 name => "playerbook",
1343 has_close_button => 1 1357 has_close_button => 1
1344 ; 1358 ;
1345 1359
1346 my $ntb = 1360 my $ntb =
1347 $PL_NOTEBOOK = 1361 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook 1362 new CFPlus::UI::Notebook expand => 1, debug => 1;
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1353 1363
1354 $ntb->add ( 1364 $ntb->add (
1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1365 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1366 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1367 );
1358 $ntb->add ( 1368 $ntb->add (
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1369 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills."
1371 );
1372
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1375 $ntb->add (
1376 "Spellbook (F4)" => $spellsw,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1377 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 ); 1378 );
1362 $ntb->add ( 1379 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget, 1380 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1381 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1382 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 ); 1383 );
1367 1384
1368 $ntb->set_current_page ($INVENTORY_PAGE); 1385 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1374sub update_bindings { 1391sub update_bindings {
1375 $BIND_UPD_CB->() if $BIND_UPD_CB; 1392 $BIND_UPD_CB->() if $BIND_UPD_CB;
1376} 1393}
1377 1394
1378sub keyboard_setup { 1395sub keyboard_setup {
1379 my $binding_list = new CFClient::UI::VBox; 1396 my $binding_list = new CFPlus::UI::VBox;
1380 1397
1381 my $refresh; 1398 my $refresh;
1382 $refresh = $BIND_UPD_CB = sub { 1399 $refresh = $BIND_UPD_CB = sub {
1383 $binding_list->clear (); 1400 $binding_list->clear ();
1384 1401
… …
1386 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1387 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1388 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1389 1406
1390 my $lbl = join "; ", @$cmds; 1407 my $lbl = join "; ", @$cmds;
1391 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1392 $binding_list->add (my $hb = new CFClient::UI::HBox); 1409 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1393 $hb->add (new CFClient::UI::Button 1410 $hb->add (new CFPlus::UI::Button
1394 text => "delete", 1411 text => "delete",
1395 tooltip => "Deletes the binding", 1412 tooltip => "Deletes the binding",
1396 on_activate => sub { 1413 on_activate => sub {
1397 $binding_list->remove ($hb); 1414 $binding_list->remove ($hb);
1398 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1399 0 1416 0
1400 }); 1417 });
1401 1418
1402 $hb->add (new CFClient::UI::Button 1419 $hb->add (new CFPlus::UI::Button
1403 text => "edit", 1420 text => "edit",
1404 tooltip => "Edits the binding", 1421 tooltip => "Edits the binding",
1405 on_activate => sub { 1422 on_activate => sub {
1406 $::BIND_EDITOR->set_binding ( 1423 $::BIND_EDITOR->set_binding (
1407 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1420 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1421 $SETUP_DIALOG->hide; 1438 $SETUP_DIALOG->hide;
1422 0 1439 0
1423 }); 1440 });
1424 1441
1425 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1442 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1426 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1443 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1427 } 1444 }
1428 } 1445 }
1429 }; 1446 };
1430 1447
1431 my $vb = new CFClient::UI::VBox; 1448 my $vb = new CFPlus::UI::VBox;
1432 $vb->add (my $hb = new CFClient::UI::HBox); 1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Options",
1451 child => (my $hb = new CFPlus::UI::HBox),
1452 );
1433 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1453 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1434 $hb->add (new CFClient::UI::CheckBox 1454 $hb->add (new CFPlus::UI::CheckBox
1435 expand => 1, 1455 expand => 1,
1436 state => $CFG->{shift_fire_stop}, 1456 state => $CFG->{shift_fire_stop},
1437 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1457 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1438 on_changed => sub { 1458 on_changed => sub {
1439 my ($cbox, $value) = @_; 1459 my ($cbox, $value) = @_;
1440 $CFG->{shift_fire_stop} = $value; 1460 $CFG->{shift_fire_stop} = $value;
1441 0 1461 0
1442 }); 1462 });
1443 1463
1444 $vb->add ($binding_list); 1464 $vb->add (new CFPlus::UI::FancyFrame
1465 label => "Bindings",
1466 child => $binding_list);
1445 $vb->add (my $hb = new CFClient::UI::HBox); 1467 $vb->add (my $hb = new CFPlus::UI::HBox);
1446 1468
1447 $hb->add (new CFClient::UI::Button 1469 $hb->add (new CFPlus::UI::Button
1448 text => "record new", 1470 text => "record new",
1449 expand => 1, 1471 expand => 1,
1450 tooltip => "This button opens the binding editor with an empty binding.", 1472 tooltip => "This button opens the binding editor with an empty binding.",
1451 on_activate => sub { 1473 on_activate => sub {
1452 $::BIND_EDITOR->set_binding (undef, undef, [], 1474 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1466 $::BIND_EDITOR->show; 1488 $::BIND_EDITOR->show;
1467 0 1489 0
1468 }, 1490 },
1469 ); 1491 );
1470 1492
1471 $hb->add (new CFClient::UI::Button 1493 $hb->add (new CFPlus::UI::Button
1472 text => "close", 1494 text => "close",
1473 tooltip => "Closes the binding window", 1495 tooltip => "Closes the binding window",
1474 expand => 1, 1496 expand => 1,
1475 on_activate => sub { 1497 on_activate => sub {
1476 $SETUP_DIALOG->hide; 1498 $SETUP_DIALOG->hide;
… …
1482 1504
1483 $vb 1505 $vb
1484} 1506}
1485 1507
1486sub help_window { 1508sub help_window {
1487 my $win = new CFClient::UI::FancyFrame 1509 my $win = new CFPlus::UI::Toplevel
1488 x => 'center', 1510 x => 'center',
1489 y => 'center', 1511 y => 'center',
1490 z => 2, 1512 z => 2,
1491 name => 'doc_browser', 1513 name => 'doc_browser',
1492 force_w => int $WIDTH * 7/8, 1514 force_w => int $WIDTH * 7/8,
1493 force_h => int $HEIGHT * 7/8, 1515 force_h => int $HEIGHT * 7/8,
1494 title => "Help Browser", 1516 title => "Help Browser",
1495 has_close_button => 1; 1517 has_close_button => 1;
1496 1518
1497 $win->add (my $vbox = new CFClient::UI::VBox); 1519 $win->add (my $vbox = new CFPlus::UI::VBox);
1498 1520
1499 $vbox->add (my $buttons = new CFClient::UI::HBox); 1521 $vbox->add (new CFPlus::UI::FancyFrame
1522 label => "Navigation",
1523 child => (my $buttons = new CFPlus::UI::HBox),
1524 );
1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1501 expand => 1, fontsize => 0.8, padding_x => 4); 1526 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1502 1527
1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1528 my @history;
1504 $buttons->add (my $combo = new CFClient::UI::Combobox 1529 my @future;
1505 value => undef, 1530 my $curnode;
1506 options => [ 1531
1507 [intro => "Introduction"], 1532 my $load_node; $load_node = sub {
1508 [manual => "Main Manual"], 1533 my ($node, $para) = @_;
1509 [skill_help => "Skill Reference"], 1534
1510 [command_help => "Command Reference"], 1535 $buttons->clear;
1511 [dmcommand_help => "DM Commands"], 1536
1512 [COPYING => "License Terms"], 1537 $buttons->add (new CFPlus::UI::Button
1513 ], 1538 text => "⇤",
1539 tooltip => "back to the starting page",
1514 on_changed => sub { 1540 on_activate => sub {
1515 my ($self, $pod) = @_; 1541 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1516 1542 unshift @future, @history;
1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1543 @history = ();
1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1544 $load_node->(@{shift @future});
1519
1520 $viewer->clear;
1521
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1526 1545 },
1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1546 );
1528 for @$pom;
1529 1547
1530 $viewer->set_offset (0); 1548 if (@history) {
1531 1549 $buttons->add (new CFPlus::UI::Button
1550 text => "⋘",
1551 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1552 on_activate => sub {
1553 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1554 $load_node->(@{pop @history});
1555 },
1532 0 1556 );
1533 }, 1557 }
1534 on_visibility_change => sub { 1558
1535 my ($self, $visible) = @_; 1559 if (@future) {
1536 return unless $visible; 1560 $buttons->add (new CFPlus::UI::Button
1537 return if $self->{value}; 1561 text => "⋙",
1538 $self->set_value ("intro"); 1562 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph];
1565 $load_node->(@{shift @future});
1566 },
1539 0 1567 );
1540 }, 1568 }
1569
1570 $buttons->add (new CFPlus::UI::Label text => " ");
1571
1572 my @path = CFPlus::Pod::full_path_of $node;
1573 pop @path; # drop current node
1574
1575 for my $node (@path) {
1576 $buttons->add (new CFPlus::UI::Button
1577 text => $node->{kw}[0],
1578 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1579 on_activate => sub {
1580 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1581 $load_node->($node);
1582 },
1583 );
1584 $buttons->add (new CFPlus::UI::Label text => "/");
1585 }
1586
1587 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1588
1589 $curnode = $node;
1590
1591 $viewer->clear;
1592 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1593 $viewer->scroll_to ($para);
1541 ); 1594 };
1595
1596 $load_node->(CFPlus::Pod::find pod => "mainpage");
1597
1598 $CFPlus::Pod::goto_document = sub {
1599 my (@path) = @_;
1600
1601 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1602
1603 $load_node->((CFPlus::Pod::find @path)[0]);
1604 $win->show;
1605 };
1542 1606
1543 $win 1607 $win
1544} 1608}
1545 1609
1546sub sdl_init { 1610sub sdl_init {
1547 CFClient::SDL_Init 1611 CFPlus::SDL_Init
1548 and die "SDL::Init failed!\n"; 1612 and die "SDL::Init failed!\n";
1549} 1613}
1550 1614
1551sub video_init { 1615sub video_init {
1552 sdl_init; 1616 sdl_init;
… …
1557 1621
1558 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1622 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1559 $FULLSCREEN = $CFG->{fullscreen}; 1623 $FULLSCREEN = $CFG->{fullscreen};
1560 $FAST = $CFG->{fast}; 1624 $FAST = $CFG->{fast};
1561 1625
1562 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1626 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1563 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1627 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1564 1628
1565 $SDL_ACTIVE = 1; 1629 $SDL_ACTIVE = 1;
1566 $LAST_REFRESH = time - 0.01; 1630 $LAST_REFRESH = time - 0.01;
1567 1631
1568 CFClient::OpenGL::init; 1632 CFPlus::OpenGL::init;
1569 1633
1570 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1634 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1571 1635
1572 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1636 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1573 1637
1574 ############################################################################# 1638 #############################################################################
1575 1639
1576 if ($DEBUG_STATUS) { 1640 if ($DEBUG_STATUS) {
1577 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1641 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1578 } else { 1642 } else {
1579 # create the widgets 1643 # create the widgets
1580 1644
1581 $DEBUG_STATUS = new CFClient::UI::Label 1645 $DEBUG_STATUS = new CFPlus::UI::Label
1582 padding => 0, 1646 padding => 0,
1583 z => 100, 1647 z => 100,
1584 force_x => "max", 1648 force_x => "max",
1585 force_y => 0; 1649 force_y => 0;
1586 $DEBUG_STATUS->show; 1650 $DEBUG_STATUS->show;
1587 1651
1588 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1652 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1589 1653
1590 $STATUSBOX = new CFClient::UI::Statusbox; 1654 $STATUSBOX = new CFPlus::UI::Statusbox;
1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1655 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1592 1656
1593 (new CFClient::UI::Frame 1657 (new CFPlus::UI::Frame
1594 bg => [0, 0, 0, 0.4], 1658 bg => [0, 0, 0, 0.4],
1595 force_x => 0, 1659 force_x => 0,
1596 force_y => "max", 1660 force_y => "max",
1597 child => $STATUSBOX, 1661 child => $STATUSBOX,
1598 )->show; 1662 )->show;
1599 1663
1600 CFClient::UI::FancyFrame->new ( 1664 CFPlus::UI::Toplevel->new (
1601 title => "Map", 1665 title => "Map",
1602 name => "mapmap", 1666 name => "mapmap",
1603 x => 0, 1667 x => 0,
1604 y => $FONTSIZE + 8, 1668 y => $FONTSIZE + 8,
1605 border_bg => [1, 1, 1, 192/255], 1669 border_bg => [1, 1, 1, 192/255],
1606 bg => [1, 1, 1, 0], 1670 bg => [1, 1, 1, 0],
1607 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1671 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1608 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1672 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1609 ), 1673 ),
1610 )->show; 1674 )->show;
1611 1675
1612 $MAPWIDGET = new CFClient::MapWidget; 1676 $MAPWIDGET = new CFPlus::MapWidget;
1613 $MAPWIDGET->connect (activate_console => sub { 1677 $MAPWIDGET->connect (activate_console => sub {
1614 my ($mapwidget, $preset) = @_; 1678 my ($mapwidget, $preset) = @_;
1615 1679
1616 if ($CONSOLE) { 1680 if ($CONSOLE) {
1617 $CONSOLE->{input}->{auto_activated} = 1; 1681 $CONSOLE->{input}->{auto_activated} = 1;
… …
1623 } 1687 }
1624 }); 1688 });
1625 $MAPWIDGET->show; 1689 $MAPWIDGET->show;
1626 $MAPWIDGET->grab_focus; 1690 $MAPWIDGET->grab_focus;
1627 1691
1628 $LOGVIEW = new CFClient::UI::TextScroller 1692 $LOGVIEW = new CFPlus::UI::TextScroller
1629 expand => 1, 1693 expand => 1,
1630 font => $FONT_FIXED, 1694 font => $FONT_FIXED,
1631 fontsize => $::CFG->{log_fontsize}, 1695 fontsize => $::CFG->{log_fontsize},
1632 indent => -4, 1696 indent => -4,
1633 can_hover => 1, 1697 can_hover => 1,
1634 can_events => 1, 1698 can_events => 1,
1635 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1636 ; 1700 ;
1637 1701
1638 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1639 title => "Setup", 1703 title => "Setup",
1640 name => "setup_dialog", 1704 name => "setup_dialog",
1641 x => 'center', 1705 x => 'center',
1642 y => 'center', 1706 y => 'center',
1643 z => 2, 1707 z => 2,
… …
1646 has_close_button => 1, 1710 has_close_button => 1,
1647 ; 1711 ;
1648 1712
1649 $METASERVER = metaserver_dialog; 1713 $METASERVER = metaserver_dialog;
1650 1714
1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1652 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1653 1717
1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1655 "Configure the server to play on, your username, password and other server-related options."); 1719 "Configure the server to play on, your username, password and other server-related options.");
1656 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1657 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1667 . "After pressing the combo the binding will be saved automatically and the " 1731 . "After pressing the combo the binding will be saved automatically and the "
1668 . "binding editor closes"); 1732 . "binding editor closes");
1669 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1733 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1670 "Some debuggin' options. Do not ask."); 1734 "Some debuggin' options. Do not ask.");
1671 1735
1672 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1736 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1673 1737
1674 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1738 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1675 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1739 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1676 1740
1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1741 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1742 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1679 1743
1680 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1744 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1681 1745
1682 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1746 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1683 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1747 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1684 1748
1685 $BUTTONBAR->add (new CFClient::UI::Button 1749 $BUTTONBAR->add (new CFPlus::UI::Button
1686 text => "Save Config", 1750 text => "Save Config",
1687 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1751 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1688 on_activate => sub { 1752 on_activate => sub {
1689 $::CFG->{layout} = CFClient::UI::get_layout; 1753 $::CFG->{layout} = CFPlus::UI::get_layout;
1690 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1754 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1691 status "Configuration Saved"; 1755 status "Configuration Saved";
1692 0 1756 0
1693 }, 1757 },
1694 ); 1758 );
1695 1759
1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1760 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1697 tooltip => "View Documentation"); 1761 tooltip => "View Documentation");
1698 1762
1699 $BUTTONBAR->add (new CFClient::UI::Button 1763 $BUTTONBAR->add (new CFPlus::UI::Button
1700 text => "Quit", 1764 text => "Quit",
1701 tooltip => "Terminates the program", 1765 tooltip => "Terminates the program",
1702 on_activate => sub { 1766 on_activate => sub {
1703 if ($CONN) { 1767 if ($CONN) {
1704 open_quit_dialog; 1768 open_quit_dialog;
… …
1715 1779
1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1780 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1717} 1781}
1718 1782
1719sub video_shutdown { 1783sub video_shutdown {
1720 CFClient::OpenGL::shutdown; 1784 CFPlus::OpenGL::shutdown;
1721 1785
1722 undef $SDL_ACTIVE; 1786 undef $SDL_ACTIVE;
1723} 1787}
1724 1788
1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1789my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1733 1797
1734sub audio_music_finished { 1798sub audio_music_finished {
1735 return unless $CFG->{bgm_enable}; 1799 return unless $CFG->{bgm_enable};
1736 1800
1737 # TODO: hack, do play loop and mood music 1801 # TODO: hack, do play loop and mood music
1738 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1802 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1739 $bgmusic->play (0); 1803 $bgmusic->play (0);
1740 1804
1741 push @bgmusic, shift @bgmusic; 1805 push @bgmusic, shift @bgmusic;
1742} 1806}
1743 1807
1744sub audio_init { 1808sub audio_init {
1745 if ($CFG->{audio_enable}) { 1809 if ($CFG->{audio_enable}) {
1746 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1810 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1747 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1811 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1748 1812
1749 unless ($SDL_MIXER) { 1813 unless ($SDL_MIXER) {
1750 status "Unable to open sound device: there will be no sound"; 1814 status "Unable to open sound device: there will be no sound";
1751 return; 1815 return;
1752 } 1816 }
1753 1817
1754 CFClient::Mix_AllocateChannels 8; 1818 CFPlus::Mix_AllocateChannels 8;
1755 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1819 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1756 1820
1757 audio_music_finished; 1821 audio_music_finished;
1758 1822
1759 while (<$fh>) { 1823 while (<$fh>) {
1760 next if /^\s*#/; 1824 next if /^\s*#/;
… …
1763 my ($file, $volume, $event) = split /\s+/, $_, 3; 1827 my ($file, $volume, $event) = split /\s+/, $_, 3;
1764 1828
1765 push @SOUNDS, "$volume,$file"; 1829 push @SOUNDS, "$volume,$file";
1766 1830
1767 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1831 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1768 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1832 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1769 $chunk->volume ($volume * 128 / 100); 1833 $chunk->volume ($volume * 128 / 100);
1770 $chunk 1834 $chunk
1771 }; 1835 };
1772 } 1836 }
1773 } else { 1837 } else {
… …
1775 } 1839 }
1776 } 1840 }
1777} 1841}
1778 1842
1779sub audio_shutdown { 1843sub audio_shutdown {
1780 CFClient::Mix_CloseAudio if $SDL_MIXER; 1844 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1781 undef $SDL_MIXER; 1845 undef $SDL_MIXER;
1782 @SOUNDS = (); 1846 @SOUNDS = ();
1783 %AUDIO_CHUNKS = (); 1847 %AUDIO_CHUNKS = ();
1784} 1848}
1785 1849
… …
1792 1856
1793sub force_refresh { 1857sub force_refresh {
1794 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1858 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1795 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1859 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1796 1860
1797 $CFClient::UI::ROOT->draw; 1861 $CFPlus::UI::ROOT->draw;
1798 1862
1799 $WANT_REFRESH = 0; 1863 $WANT_REFRESH = 0;
1800 $CAN_REFRESH = 0; 1864 $CAN_REFRESH = 0;
1801 $LAST_REFRESH = $NOW; 1865 $LAST_REFRESH = $NOW;
1802 1866
18030 && do {
1804 # some weird model-drawing code, just a joke right now
1805 use CFClient::OpenGL;
1806
1807 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1808 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1809 $demo{r} ||= do {
1810 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1811 $mod->{v} = pack "f*", @{$mod->{v}};
1812 $_ = [scalar @$_, pack "S!*", @$_]
1813 for values %{$mod->{g}};
1814 $mod
1815 };
1816
1817 my $r = $demo{r} or die;
1818
1819 glDepthMask 1;
1820 glClear GL_DEPTH_BUFFER_BIT;
1821 glEnable GL_TEXTURE_2D;
1822 glEnable GL_DEPTH_TEST;
1823 glEnable GL_CULL_FACE;
1824 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1825
1826 glMatrixMode GL_PROJECTION;
1827 glLoadIdentity;
1828 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1829 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1830 glMatrixMode GL_MODELVIEW;
1831 glLoadIdentity;
1832
1833 glPushMatrix;
1834 glTranslate 0, 0, -800;
1835 glScale 1, -1, 1;
1836 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1837 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1838 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1839 glScale 50, 50, 50;
1840
1841 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1842 while (my ($k, $v) = each %{$r->{g}}) {
1843 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1844 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1845 }
1846
1847 glPopMatrix;
1848
1849 glShadeModel GL_FLAT;
1850 glDisable GL_DEPTH_TEST;
1851 glDisable GL_TEXTURE_2D;
1852 glDepthMask 0;
1853
1854 $WANT_REFRESH++;
1855};
1856
1857 CFClient::SDL_GL_SwapBuffers; 1867 CFPlus::SDL_GL_SwapBuffers;
1858} 1868}
1859 1869
1860my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1870my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1861 $NOW = time; 1871 $NOW = time;
1862 1872
1863 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1873 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1864 for CFClient::SDL_PollEvent; 1874 for CFPlus::SDL_PollEvent;
1865 1875
1866 if (%animate_object) { 1876 if (%animate_object) {
1867 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1877 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1868 $WANT_REFRESH++; 1878 $WANT_REFRESH++;
1869 } 1879 }
… …
1893 $CONN->face_prefetch 1903 $CONN->face_prefetch
1894 if $CONN; 1904 if $CONN;
1895}); 1905});
1896 1906
1897%SDL_CB = ( 1907%SDL_CB = (
1898 CFClient::SDL_QUIT => sub { 1908 CFPlus::SDL_QUIT => sub {
1899 Event::unloop -1; 1909 Event::unloop -1;
1900 }, 1910 },
1901 CFClient::SDL_VIDEORESIZE => sub { 1911 CFPlus::SDL_VIDEORESIZE => sub {
1902 }, 1912 },
1903 CFClient::SDL_VIDEOEXPOSE => sub { 1913 CFPlus::SDL_VIDEOEXPOSE => sub {
1904 CFClient::UI::full_refresh; 1914 CFPlus::UI::full_refresh;
1905 }, 1915 },
1906 CFClient::SDL_ACTIVEEVENT => sub { 1916 CFPlus::SDL_ACTIVEEVENT => sub {
1907# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1917# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1908 }, 1918 },
1909 CFClient::SDL_KEYDOWN => sub { 1919 CFPlus::SDL_KEYDOWN => sub {
1910 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1920 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1911 # alt-enter 1921 # alt-enter
1922 $FULLSCREEN_ENABLE->toggle;
1912 video_shutdown; 1923 video_shutdown;
1913 $CFG->{fullscreen} = !$CFG->{fullscreen};
1914 video_init; 1924 video_init;
1915 } else { 1925 } else {
1916 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1926 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1917 } 1927 }
1918 }, 1928 },
1919 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1929 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1920 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1930 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1921 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1931 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1922 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1932 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1923 CFClient::SDL_USEREVENT => sub { 1933 CFPlus::SDL_USEREVENT => sub {
1924 if ($_[0]{code} == 1) { 1934 if ($_[0]{code} == 1) {
1925 audio_channel_finished $_[0]{data1}; 1935 audio_channel_finished $_[0]{data1};
1926 } elsif ($_[0]{code} == 0) { 1936 } elsif ($_[0]{code} == 0) {
1927 audio_music_finished; 1937 audio_music_finished;
1928 } 1938 }
… …
1932############################################################################# 1942#############################################################################
1933 1943
1934$SIG{INT} = $SIG{TERM} = sub { exit }; 1944$SIG{INT} = $SIG{TERM} = sub { exit };
1935 1945
1936{ 1946{
1937 local $SIG{__DIE__} = sub {
1938 return unless defined $^S && !$^S;
1939 Carp::confess $_[1];#d#TODO: remove when stable
1940 CFClient::fatal $_[0];
1941 };
1942
1943 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1947 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1944 CFClient::UI::set_layout ($::CFG->{layout}); 1948 CFPlus::UI::set_layout ($::CFG->{layout});
1945 1949
1946 my %DEF_CFG = ( 1950 my %DEF_CFG = (
1947 sdl_mode => 0, 1951 sdl_mode => 0,
1948 width => 640, 1952 width => 640,
1949 height => 480, 1953 height => 480,
… …
1965 bgm_volume => 0.25, 1969 bgm_volume => 0.25,
1966 face_prefetch => 0, 1970 face_prefetch => 0,
1967 output_sync => 1, 1971 output_sync => 1,
1968 output_count => 1, 1972 output_count => 1,
1969 pickup => 0, 1973 pickup => 0,
1974 inv_sort => "mtime",
1970 default => "profile", # default profile 1975 default => "profile", # default profile
1971 ); 1976 );
1972 1977
1973 while (my ($k, $v) = each %DEF_CFG) { 1978 while (my ($k, $v) = each %DEF_CFG) {
1974 $CFG->{$k} = $v unless exists $CFG->{$k}; 1979 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
1978 1983
1979 sdl_init; 1984 sdl_init;
1980 1985
1981 @SDL_MODES = reverse 1986 @SDL_MODES = reverse
1982 grep $_->[0] >= 640 && $_->[1] >= 480, 1987 grep $_->[0] >= 640 && $_->[1] >= 480,
1983 CFClient::SDL_ListModes; 1988 CFPlus::SDL_ListModes;
1984 1989
1985 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1990 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1986 1991
1987 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1992 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1988 1993
1989 { 1994 {
1990 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1995 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1991 DejaVuSans.ttf 1996 DejaVuSans.ttf
1992 DejaVuSansMono.ttf 1997 DejaVuSansMono.ttf
1993 DejaVuSans-Bold.ttf 1998 DejaVuSans-Bold.ttf
1994 DejaVuSansMono-Bold.ttf 1999 DejaVuSansMono-Bold.ttf
1995 DejaVuSans-Oblique.ttf 2000 DejaVuSans-Oblique.ttf
1996 DejaVuSansMono-Oblique.ttf 2001 DejaVuSansMono-Oblique.ttf
1997 DejaVuSans-BoldOblique.ttf 2002 DejaVuSans-BoldOblique.ttf
1998 DejaVuSansMono-BoldOblique.ttf 2003 DejaVuSansMono-BoldOblique.ttf
1999 ); 2004 );
2000 2005
2001 CFClient::add_font $_ for @fonts; 2006 CFPlus::add_font $_ for @fonts;
2002 2007
2003 CFClient::pango_init; 2008 CFPlus::pango_init;
2004 2009
2005 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2010 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2006 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2011 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2007 2012
2008 $FONT_PROP->make_default; 2013 $FONT_PROP->make_default;
2009 } 2014 }
2010 2015
2011# compare mono (ft) vs. rgba (cairo) 2016# compare mono (ft) vs. rgba (cairo)
2012# ft - 1.8s, cairo 3s, even in alpha-only mode 2017# ft - 1.8s, cairo 3s, even in alpha-only mode
2013# for my $rgba (0..1) { 2018# for my $rgba (0..1) {
2014# my $t1 = Time::HiRes::time; 2019# my $t1 = Time::HiRes::time;
2015# for (1..1000) { 2020# for (1..1000) {
2016# my $layout = CFClient::Layout->new ($rgba); 2021# my $layout = CFPlus::Layout->new ($rgba);
2017# $layout->set_text ("hallo" x 100); 2022# $layout->set_text ("hallo" x 100);
2018# $layout->render; 2023# $layout->render;
2019# } 2024# }
2020# my $t2 = Time::HiRes::time; 2025# my $t2 = Time::HiRes::time;
2021# warn $t2-$t1; 2026# warn $t2-$t1;
… …
2024 video_init; 2029 video_init;
2025 audio_init; 2030 audio_init;
2026} 2031}
2027 2032
2028Event::loop; 2033Event::loop;
2029#CFClient::SDL_Quit; 2034#CFPlus::SDL_Quit;
2030#CFClient::_exit 0; 2035#CFPlus::_exit 0;
2031 2036
2032END { CFClient::SDL_Quit } 2037END { CFPlus::SDL_Quit }
2033 2038
2034=head1 NAME 2039=head1 NAME
2035 2040
2036cfplus - A Crossfire+ and Crossfire game client 2041cfplus - A Crossfire+ and Crossfire game client
2037 2042

Diff Legend

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