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.86 by root, Sun Jul 2 21:07:27 2006 UTC vs.
Revision 1.114 by root, Mon Aug 14 01:21:02 2006 UTC

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

Diff Legend

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