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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.108 by elmex, Sun Aug 13 11:29:19 2006 UTC

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

Diff Legend

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