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

Diff Legend

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