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

Diff Legend

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