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

Diff Legend

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