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.99 by root, Sun Jul 23 08:58:44 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 and the text entry below:\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 . "and the center of the screen to see how this race looks like "
222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
224 . "You can look at another race, or accept this race (you will cycle back to "
225 . "this race eventually, 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 and the text entry below:\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
257 expand => 1, 252 expand => 1,
258 value => $_, 253 value => $_,
259 options => [ 254 options => [
260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 255 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 256 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
265 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 260 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
266 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 261 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
267 ], 262 ],
268 ), 1 .. 2; 263 ), 1 .. 2;
269 264
270 $table->add (2, 0, new CFClient::UI::Button 265 $table->add (2, 0, new CFPlus::UI::Button
271 text => "Swap Stats", 266 text => "Swap Stats",
272 on_activate => sub { 267 on_activate => sub {
273 $conn->{stat_change_with} = $sw2->{value}; 268 $conn->{stat_change_with} = $sw2->{value};
274 $conn->send ("reply $sw1->{value}"); 269 $conn->send ("reply $sw1->{value}");
275 destroy_query_dialog $conn; 270 destroy_query_dialog $conn;
276 0 271 0
277 }, 272 },
278 ); 273 );
279 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 274 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
280 275
281 # right: accept 276 # right: accept
282 $table->add (4, 0, new CFClient::UI::Button 277 $table->add (4, 0, new CFPlus::UI::Button
283 text => "Accept", 278 text => "Accept",
284 on_activate => sub { 279 on_activate => sub {
285 $conn->send ("reply n"); 280 $conn->send ("reply n");
286 $STATS_PAGE->hide; 281 $STATS_PAGE->hide;
287 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
288 0 283 0
289 }, 284 },
290 ); 285 );
291 286
292 unshift @dialog, my $hbox = new CFClient::UI::HBox; 287 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
293 for ( 288 for (
294 [Str => CS_STAT_STR], 289 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX], 290 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON], 291 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT], 292 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS], 293 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW], 294 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA], 295 [Cha => CS_STAT_CHA],
301 ) { 296 ) {
302 my ($name, $id) = @$_; 297 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label 298 $hbox->add (new CFPlus::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 299 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0, 300 align => 0,
306 expand => 1, 301 expand => 1,
307 can_events => 1, 302 can_events => 1,
308 can_hover => 1, 303 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name}, 304 tooltip => "#stat_$name",
310 ); 305 );
311 } 306 }
312 307
313 unshift @dialog, new CFClient::UI::Label 308 unshift @dialog, new CFPlus::UI::Label
314 max_w => $::WIDTH * 0.4, 309 max_w => $::WIDTH * 0.4,
315 ellipsise => 0, 310 ellipsise => 0,
316 markup => 311 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
317 "<big><b>Character Creation: Stats</b></big>\n\n"
318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
322 ; 312 ;
323 } 313 }
324 314
325 push @dialog, my $entry = new CFClient::UI::Entry 315 push @dialog, my $entry = new CFPlus::UI::Entry
326 on_changed => sub { 316 on_changed => sub {
327 $conn->send ("reply $_[1]"); 317 $conn->send ("reply $_[1]");
328 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
329 0 319 0
330 }, 320 },
… …
333 $entry->grab_focus; 323 $entry->grab_focus;
334 324
335 } else { 325 } else {
336 $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)";
337 327
338 push @dialog, my $entry = new CFClient::UI::Entry 328 push @dialog, my $entry = new CFPlus::UI::Entry
339 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 329 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
340 on_activate => sub { 330 on_activate => sub {
341 $conn->send ("reply $_[1]"); 331 $conn->send ("reply $_[1]");
342 destroy_query_dialog $conn; 332 destroy_query_dialog $conn;
343 0 333 0
… …
355 status "logging in..."; 345 status "logging in...";
356 346
357 $LOGIN_BUTTON->set_text ("Logout"); 347 $LOGIN_BUTTON->set_text ("Logout");
358 $SETUP_DIALOG->hide; 348 $SETUP_DIALOG->hide;
359 349
350 $PROFILE = $CFG->{profile}{default};
351
360 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;
361 353
362 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 354 my ($host, $port) = split /:/, $PROFILE->{host};
363 355
364 $MAP = new CFClient::Map $mapsize, $mapsize; 356 $MAP = new CFPlus::Map $mapsize, $mapsize;
365 357
366 $CONN = eval { 358 $CONN = eval {
367 new CFClient::Protocol 359 new CFPlus::Protocol
368 host => $host, 360 host => $host,
369 port => $port || 13327, 361 port => $port || 13327,
370 user => $CFG->{profile}{default}{user}, 362 user => $PROFILE->{user},
371 pass => $CFG->{profile}{default}{password}, 363 pass => $PROFILE->{password},
372 mapw => $mapsize, 364 mapw => $mapsize,
373 maph => $mapsize, 365 maph => $mapsize,
366
367 client => "cfplus $VERSION $] $^O",
374 368
375 map_widget => $MAPWIDGET, 369 map_widget => $MAPWIDGET,
376 logview => $LOGVIEW, 370 logview => $LOGVIEW,
377 statusbox => $STATUSBOX, 371 statusbox => $STATUSBOX,
378 map => $MAP, 372 map => $MAP,
… …
391 $chunk->play; 385 $chunk->play;
392 }, 386 },
393 }; 387 };
394 388
395 if ($CONN) { 389 if ($CONN) {
396 CFClient::lowdelay fileno $CONN->{fh}; 390 CFPlus::lowdelay fileno $CONN->{fh};
397 391
398 status "login successful"; 392 status "login successful";
399 } else { 393 } else {
400 status "unable to connect"; 394 status "unable to connect";
401 stop_game(); 395 stop_game();
… …
416 destroy_query_dialog $CONN; 410 destroy_query_dialog $CONN;
417 $CONN->destroy; 411 $CONN->destroy;
418 $CONN = 0; # false, does not autovivify 412 $CONN = 0; # false, does not autovivify
419 413
420 undef $MAP; 414 undef $MAP;
415 undef $PROFILE;
421} 416}
422 417
423sub graphics_setup { 418sub graphics_setup {
424 my $vbox = new CFClient::UI::VBox; 419 my $vbox = new CFPlus::UI::VBox;
425 420
426 $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]);
427 422
428 $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");
429 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 424 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
430 425
431 $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]);
432 $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");
433 428
434 $mode_slider->connect (changed => sub { 429 $mode_slider->connect (changed => sub {
435 my ($self, $value) = @_; 430 my ($self, $value) = @_;
436 431
437 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 432 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
439 }); 434 });
440 $mode_slider->emit (changed => $mode_slider->{range}[0]); 435 $mode_slider->emit (changed => $mode_slider->{range}[0]);
441 436
442 my $row = 1; 437 my $row = 1;
443 438
444 $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");
445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 440 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
446 state => $CFG->{fullscreen}, 441 state => $CFG->{fullscreen},
447 tooltip => "Bring the client into fullscreen mode.", 442 tooltip => "Bring the client into fullscreen mode.",
448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 443 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
449 ); 444 );
450 445
451 $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");
452 $table->add (1, $row++, new CFClient::UI::CheckBox 447 $table->add (1, $row++, new CFPlus::UI::CheckBox
453 state => $CFG->{fast}, 448 state => $CFG->{fast},
454 tooltip => "Lower the visual quality considerably to speed up rendering.", 449 tooltip => "Lower the visual quality considerably to speed up rendering.",
455 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 450 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
456 ); 451 );
457 452
458 $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");
459 $table->add (1, $row++, new CFClient::UI::Slider 454 $table->add (1, $row++, new CFPlus::UI::Slider
460 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 455 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
461 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 456 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
462 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 }
463 ); 458 );
464 459
465 $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");
466 $table->add (1, $row++, new CFClient::UI::CheckBox 461 $table->add (1, $row++, new CFPlus::UI::CheckBox
467 state => $CFG->{fow_enable}, 462 state => $CFG->{fow_enable},
468 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.",
469 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 464 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
470 ); 465 );
471 466
472 $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");
473 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFPlus::UI::Slider
474 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 469 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
475 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.",
476 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 471 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
477 ); 472 );
478 473
479 $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");
480 $table->add (1, $row++, new CFClient::UI::CheckBox 475 $table->add (1, $row++, new CFPlus::UI::CheckBox
481 state => $CFG->{fow_smooth}, 476 state => $CFG->{fow_smooth},
482 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.",
483 on_changed => sub { 478 on_changed => sub {
484 my ($self, $value) = @_; 479 my ($self, $value) = @_;
485 $CFG->{fow_smooth} = $value; 480 $CFG->{fow_smooth} = $value;
486 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;
487 0 482 0
488 } 483 }
489 ); 484 );
490 485
491 $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");
492 $table->add (1, $row++, new CFClient::UI::Slider 487 $table->add (1, $row++, new CFPlus::UI::Slider
493 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 488 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
494 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.",
495 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 490 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
496 ); 491 );
497 492
498 $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");
499 $table->add (1, $row++, new CFClient::UI::Slider 494 $table->add (1, $row++, new CFPlus::UI::Slider
500 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 495 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
501 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.",
502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 497 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
503 ); 498 );
504 499
505 $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");
506 $table->add (1, $row++, new CFClient::UI::Slider 501 $table->add (1, $row++, new CFPlus::UI::Slider
507 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 502 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
508 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.",
509 on_changed => sub { 504 on_changed => sub {
510 $CFG->{gauge_fontsize} = $_[1]; 505 $CFG->{gauge_fontsize} = $_[1];
511 &set_gauge_window_fontsize; 506 &set_gauge_window_fontsize;
512 0 507 0
513 } 508 }
514 ); 509 );
515 510
516 $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");
517 $table->add (1, $row++, new CFClient::UI::Slider 512 $table->add (1, $row++, new CFPlus::UI::Slider
518 range => [$CFG->{gauge_size}, 0.2, 0.8], 513 range => [$CFG->{gauge_size}, 0.2, 0.8],
519 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.",
520 on_changed => sub { 515 on_changed => sub {
521 $CFG->{gauge_size} = $_[1]; 516 $CFG->{gauge_size} = $_[1];
522 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 517 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
523 0 518 0
524 } 519 }
525 ); 520 );
526 521
527 $table->add (1, $row++, new CFClient::UI::Button 522 $table->add (1, $row++, new CFPlus::UI::Button
528 expand => 1, align => 0, text => "Apply", 523 expand => 1, align => 0, text => "Apply",
529 tooltip => "Apply the video settings", 524 tooltip => "Apply the video settings",
530 on_activate => sub { 525 on_activate => sub {
531 video_shutdown (); 526 video_shutdown ();
532 video_init (); 527 video_init ();
… …
536 531
537 $vbox 532 $vbox
538} 533}
539 534
540sub audio_setup { 535sub audio_setup {
541 my $vbox = new CFClient::UI::VBox; 536 my $vbox = new CFPlus::UI::VBox;
542 537
543 $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]);
544 539
545 my $row = 0; 540 my $row = 0;
546 541
547 $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");
548 $table->add (1, $row++, new CFClient::UI::CheckBox 543 $table->add (1, $row++, new CFPlus::UI::CheckBox
549 state => $CFG->{audio_enable}, 544 state => $CFG->{audio_enable},
550 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.",
551 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 546 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
552 ); 547 );
553# $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");
554# $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 {
555# $CFG->{effects_volume} = $_[1]; 550# $CFG->{effects_volume} = $_[1];
556# }); 551# });
557 $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");
558 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 553 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
559 $hbox->add (new CFClient::UI::CheckBox 554 $hbox->add (new CFPlus::UI::CheckBox
560 expand => 1, state => $CFG->{bgm_enable}, 555 expand => 1, state => $CFG->{bgm_enable},
561 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.",
562 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 557 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
563 ); 558 );
564 $hbox->add (new CFClient::UI::Slider 559 $hbox->add (new CFPlus::UI::Slider
565 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 560 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
566 tooltip => "The volume of the background music. Changes are instant.", 561 tooltip => "The volume of the background music. Changes are instant.",
567 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 }
568 ); 563 );
569 564
570 $table->add (1, $row++, new CFClient::UI::Button 565 $table->add (1, $row++, new CFPlus::UI::Button
571 expand => 1, align => 0, text => "Apply", 566 expand => 1, align => 0, text => "Apply",
572 tooltip => "Apply the audio settings", 567 tooltip => "Apply the audio settings",
573 on_activate => sub { 568 on_activate => sub {
574 audio_shutdown (); 569 audio_shutdown ();
575 audio_init (); 570 audio_init ();
… …
587} 582}
588 583
589sub make_gauge_window { 584sub make_gauge_window {
590 my $gh = int $HEIGHT * $CFG->{gauge_size}; 585 my $gh = int $HEIGHT * $CFG->{gauge_size};
591 586
592 my $win = new CFClient::UI::Frame ( 587 my $win = new CFPlus::UI::Frame (
593 force_x => 0, 588 force_x => 0,
594 force_y => "max", 589 force_y => "max",
595 force_w => $WIDTH, 590 force_w => $WIDTH,
596 force_h => $gh, 591 force_h => $gh,
597 ); 592 );
598 593
599 $win->add (my $hbox = new CFClient::UI::HBox 594 $win->add (my $hbox = new CFPlus::UI::HBox
600 children => [ 595 children => [
601 (new CFClient::UI::HBox expand => 1), 596 (new CFPlus::UI::HBox expand => 1),
602 (new CFClient::UI::VBox children => [ 597 (new CFPlus::UI::VBox children => [
603 (new CFClient::UI::Empty expand => 1), 598 (new CFPlus::UI::Empty expand => 1),
604 (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)),
605 ]), 600 ]),
606 (my $vbox = new CFClient::UI::VBox), 601 (my $vbox = new CFPlus::UI::VBox),
607 ], 602 ],
608 ); 603 );
609 604
610 $vbox->add (new CFClient::UI::HBox 605 $vbox->add (new CFPlus::UI::HBox
611 expand => 1, 606 expand => 1,
612 children => [ 607 children => [
613 (new CFClient::UI::Empty expand => 1), 608 (new CFPlus::UI::Empty expand => 1),
614 (my $hb = new CFClient::UI::HBox), 609 (my $hb = new CFPlus::UI::HBox),
615 ], 610 ],
616 ); 611 );
617 612
618 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 613 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
619 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.");
620 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 614 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
621 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.");
622 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 615 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
623 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.");
624 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 616 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
625 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.");
626 617
627 $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");
628 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.");
629 $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");
630 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
631 620
632 $GAUGES = { 621 $GAUGES = {
633 exp => $exp, win => $win, range => $rng, 622 exp => $exp, win => $win, range => $rng,
634 food => $fg, mana => $mg, hp => $hg, grace => $gg 623 food => $fg, mana => $mg, hp => $hg, grace => $gg
635 }; 624 };
… …
638 627
639 $win 628 $win
640} 629}
641 630
642sub debug_setup { 631sub debug_setup {
643 my $table = new CFClient::UI::Table; 632 my $table = new CFPlus::UI::Table;
644 633
645 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 634 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
646 $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 });
647 $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");
648 $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 });
649 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 638 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
650 $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 });
651 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 640 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
652 $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 });
653 642
654 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);
655 644
656 for my $x (0..2) { 645 for my $x (0..2) {
657 for my $y (0 .. 2) { 646 for my $y (0 .. 2) {
658 $table->add ($x + 3, $y, 647 $table->add ($x + 3, $y,
659 new CFClient::UI::Entry 648 new CFPlus::UI::Entry
660 text => $default_smooth[$x * 3 + $y], 649 text => $default_smooth[$x * 3 + $y],
661 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 },
662 ); 651 );
663 } 652 }
664 } 653 }
… …
666 655
667 $table 656 $table
668} 657}
669 658
670sub stats_window { 659sub stats_window {
671 my $r = new CFClient::UI::ScrolledWindow ( 660 my $r = new CFPlus::UI::ScrolledWindow (
672 expand => 1, 661 expand => 1,
673 scroll_y => 1 662 scroll_y => 1
674 ); 663 );
675 $r->add (my $vb = new CFClient::UI::VBox); 664 $r->add (my $vb = new CFPlus::UI::VBox);
676 665
666 $vb->add (new CFPlus::UI::FancyFrame
667 label => "Player",
668 child => (my $pi = new CFPlus::UI::VBox),
669 );
670
677 $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,
678 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
679 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.");
680 $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,
681 can_hover => 1, can_events => 1, 675 can_hover => 1, can_events => 1,
682 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).");
683 677
684 $vb->add (my $hb0 = new CFClient::UI::HBox); 678 $pi->add (my $hb0 = new CFPlus::UI::HBox);
685 $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,
686 can_hover => 1, can_events => 1, 680 can_hover => 1, can_events => 1,
687 tooltip => "The weight of the player including all inventory items."); 681 tooltip => "The weight of the player including all inventory items.");
688 $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,
689 can_hover => 1, can_events => 1, 683 can_hover => 1, can_events => 1,
690 tooltip => "The weight limit: you cannot carry more than this."); 684 tooltip => "The weight limit: you cannot carry more than this.");
691 685
692 686 $vb->add (new CFPlus::UI::FancyFrame
687 label => "Primary/Secondary Statistics",
693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 688 child => (my $hb = new CFPlus::UI::HBox expand => 1),
689 );
694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 690 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695 691
696 my $color2 = [1, 1, 0]; 692 my $color2 = [1, 1, 0];
697 693
698 for ( 694 for (
699 [0, 0, st_str => "Str", 30], 695 [0, 0, st_str => "Str", 30],
… …
711 [2, 4, st_spd => "Spd", 10.54], 707 [2, 4, st_spd => "Spd", 10.54],
712 [2, 5, st_wspd => "WSp", 10.54], 708 [2, 5, st_wspd => "WSp", 10.54],
713 ) { 709 ) {
714 my ($col, $row, $id, $label, $template) = @$_; 710 my ($col, $row, $id, $label, $template) = @$_;
715 711
716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 712 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 713 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label}); 714 align => +1, template => $template, tooltip => "#stat_$label");
719 $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
720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 716 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label}); 717 align => -1, text => $label, tooltip => "#stat_$label");
722 } 718 }
723 719
720 $vb->add (new CFPlus::UI::FancyFrame
721 label => "Resistancies",
724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 722 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
723 );
725 724
726 my $row = 0; 725 my $row = 0;
727 my $col = 0; 726 my $col = 0;
728 727
729 my %resist_names = ( 728 my %resist_names = (
… …
768 drain acid pois para deat phys 767 drain acid pois para deat phys
769 blind fear tund elec cold ghit/) 768 blind fear tund elec cold ghit/)
770 { 769 {
771 $tbl2->add ($col, $row, 770 $tbl2->add ($col, $row,
772 $STATWIDS->{"res_$_"} = 771 $STATWIDS->{"res_$_"} =
773 new CFClient::UI::Label 772 new CFPlus::UI::Label
774 font => $FONT_FIXED, 773 font => $FONT_FIXED,
775 template => "-100%", 774 template => "-100%",
776 align => +1, 775 align => +1,
777 valign => 0, 776 valign => 0,
778 can_events => 1, 777 can_events => 1,
779 can_hover => 1, 778 can_hover => 1,
780 tooltip => $resist_names{$_}->[1], 779 tooltip => $resist_names{$_}->[1],
781 ); 780 );
782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 781 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
783 font => $FONT_FIXED, 782 font => $FONT_FIXED,
784 can_hover => 1, 783 can_hover => 1,
785 can_events => 1, 784 can_events => 1,
786 path => "ui/resist/resist_$_.png", 785 path => "ui/resist/resist_$_.png",
787 tooltip => $resist_names{$_}->[1], 786 tooltip => $resist_names{$_}->[1],
788 ); 787 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label 788 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
790 text => $resist_names{$_}->[0], 789 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED, 790 font => $FONT_FIXED,
792 can_hover => 1, 791 can_hover => 1,
793 can_events => 1, 792 can_events => 1,
794 tooltip => $resist_names{$_}->[1], 793 tooltip => $resist_names{$_}->[1],
… …
805 804
806 $r 805 $r
807} 806}
808 807
809sub skill_window { 808sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1); 809 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
811 $sw->add ($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]);
812 $sw 811 $sw
813} 812}
814 813
815sub formsep($) { 814sub formsep($) {
816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 815 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
827 return if $METASERVER_ATIME > time; 826 return if $METASERVER_ATIME > time;
828 $METASERVER_ATIME = time + 60; 827 $METASERVER_ATIME = time + 60;
829 828
830 my $table = $METASERVER->{table}; 829 my $table = $METASERVER->{table};
831 $table->clear; 830 $table->clear;
832 $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...");
833 832
834 my $buf; 833 my $buf;
835 834
836 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 835 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
837 836
… …
860 "The time this server has been running without being restarted.", 859 "The time this server has been running without being restarted.",
861 "The server software version - a '+' indicates a Crossfire+ server.", 860 "The server software version - a '+' indicates a Crossfire+ server.",
862 "Short information about this server provided by its admins.", 861 "Short information about this server provided by its admins.",
863 ); 862 );
864 my @col = qw(#Users Host Uptime Version Description); 863 my @col = qw(#Users Host Uptime Version Description);
865 $table->add ($_, 0, new CFClient::UI::Label 864 $table->add ($_, 0, new CFPlus::UI::Label
866 can_hover => 1, can_events => 1, 865 can_hover => 1, can_events => 1,
867 align => 0, fg => [1, 1, 0], 866 align => 0, fg => [1, 1, 0],
868 text => $col[$_], tooltip => $tip[$_]) 867 text => $col[$_], tooltip => $tip[$_])
869 for 0 .. $#col; 868 for 0 .. $#col;
870 869
… …
891 890
892 $m = [$users, $host, $uptime, $version, $desc]; 891 $m = [$users, $host, $uptime, $version, $desc];
893 892
894 $y++; 893 $y++;
895 894
896 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 895 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
897 (new CFClient::UI::Button 896 (new CFPlus::UI::Button
898 text => "Use", 897 text => "Use",
899 tooltip => "Put this server into the <b>Host:Port</b> field", 898 tooltip => "Put this server into the <b>Host:Port</b> field",
900 on_activate => sub { 899 on_activate => sub {
901 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 900 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902 $METASERVER->hide; 901 $METASERVER->hide;
903 0 902 0
904 }, 903 },
905 ), 904 ),
906 (new CFClient::UI::Empty expand => 1), 905 (new CFPlus::UI::Empty expand => 1),
907 ]); 906 ]);
908 907
909 $table->add ($_, $y, new CFClient::UI::Label 908 $table->add ($_, $y, new CFPlus::UI::Label
910 ellipsise => 0, 909 ellipsise => 0,
911 align => $align[$_], 910 align => $align[$_],
912 text => $m->[$_], 911 text => $m->[$_],
913 tooltip => $tip[$_], 912 tooltip => $tip[$_],
914 can_hover => 1, 913 can_hover => 1,
… …
919 } 918 }
920 }); 919 });
921} 920}
922 921
923sub metaserver_dialog { 922sub metaserver_dialog {
924 my $vbox = new CFClient::UI::VBox; 923 my $vbox = new CFPlus::UI::VBox;
925 my $table = new CFClient::UI::Table; 924 my $table = new CFPlus::UI::Table;
926 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 925 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927 926
928 my $dialog = new CFClient::UI::FancyFrame 927 my $dialog = new CFPlus::UI::Toplevel
929 title => "Server List", 928 title => "Server List",
930 name => 'metaserver_dialog', 929 name => 'metaserver_dialog',
931 x => 'center', 930 x => 'center',
932 y => 'center', 931 y => 'center',
933 z => 3, 932 z => 3,
… …
943 942
944 $dialog 943 $dialog
945} 944}
946 945
947sub server_setup { 946sub server_setup {
948 my $vbox = new CFClient::UI::VBox; 947 my $vbox = new CFPlus::UI::VBox;
949 948
949 $vbox->add (new CFPlus::UI::FancyFrame
950 label => "Connection Settings",
950 $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 );
951 $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");
952 954
953 { 955 {
954 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 956 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
955 957
956 $vbox->add ( 958 $vbox->add (
957 $HOST_ENTRY = new CFClient::UI::Entry 959 $HOST_ENTRY = new CFPlus::UI::Entry
958 expand => 1, 960 expand => 1,
959 text => $CFG->{profile}{default}{host}, 961 text => $CFG->{profile}{default}{host},
960 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",
961 on_changed => sub { 963 on_changed => sub {
962 my ($self, $value) = @_; 964 my ($self, $value) = @_;
963 $CFG->{profile}{default}{host} = $value; 965 $CFG->{profile}{default}{host} = $value;
964 0 966 0
965 } 967 }
966 ); 968 );
967 969
968 $vbox->add (new CFClient::UI::Button 970 $vbox->add (new CFPlus::UI::Button
969 expand => 1, 971 expand => 1,
970 text => "Server List", 972 text => "Server List",
971 other => $METASERVER, 973 other => $METASERVER,
972 tooltip => "Show a list of available crossfire servers", 974 tooltip => "Show a list of available crossfire servers",
973 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 975 on_activate => sub { $METASERVER->toggle_visibility; 0 },
974 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 976 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
975 ); 977 );
976 } 978 }
977 979
978 $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");
979 $table->add (1, 4, new CFClient::UI::Entry 981 $table->add (1, 4, new CFPlus::UI::Entry
980 text => $CFG->{profile}{default}{user}, 982 text => $CFG->{profile}{default}{user},
981 tooltip => "The name of your character on the server", 983 tooltip => "The name of your character on the server",
982 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 984 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
983 ); 985 );
984 986
985 $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");
986 $table->add (1, 5, new CFClient::UI::Entry 988 $table->add (1, 5, new CFPlus::UI::Entry
987 text => $CFG->{profile}{default}{password}, 989 text => $CFG->{profile}{default}{password},
988 hidden => 1, 990 hidden => 1,
989 tooltip => "The password for your character", 991 tooltip => "The password for your character",
990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 992 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
991 ); 993 );
992 994
993 $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");
994 $table->add (1, 7, new CFClient::UI::Slider 996 $table->add (1, 7, new CFPlus::UI::Slider
995 force_w => 100, 997 force_w => 100,
996 range => [$CFG->{mapsize}, 10, 100, 0, 1], 998 range => [$CFG->{mapsize}, 10, 100, 0, 1],
997 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. "
998 . "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, "
999 . "but you also increase bandwidth requirements and latency. " 1001 . "but you also increase bandwidth requirements and latency. "
1000 . "This option is only used once at log-in.", 1002 . "This option is only used once at log-in.",
1001 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 },
1002 ); 1004 );
1003 1005
1004 $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");
1005 $table->add (1, 8, new CFClient::UI::CheckBox 1007 $table->add (1, 8, new CFPlus::UI::CheckBox
1006 state => $CFG->{face_prefetch}, 1008 state => $CFG->{face_prefetch},
1007 tooltip => "<b>Background Image Prefetch</b>\n\n" 1009 tooltip => "<b>Background Image Prefetch</b>\n\n"
1008 . "If enabled, the client automatically pre-fetches images from the server. " 1010 . "If enabled, the client automatically pre-fetches images from the server. "
1009 . "This might increase or create lag, but increases the chances " 1011 . "This might increase or create lag, but increases the chances "
1010 . "of faces being ready for display when you encounter them. " 1012 . "of faces being ready for display when you encounter them. "
… …
1012 . "so only set it if you really need to prefetch images. " 1014 . "so only set it if you really need to prefetch images. "
1013 . "This option can be set and unset any time.", 1015 . "This option can be set and unset any time.",
1014 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1016 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1015 ); 1017 );
1016 1018
1017 $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");
1018 $table->add (1, 9, new CFClient::UI::Entry 1020 $table->add (1, 9, new CFPlus::UI::Entry
1019 text => $CFG->{output_count}, 1021 text => $CFG->{output_count},
1020 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.",
1021 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1023 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1022 ); 1024 );
1023 1025
1024 $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");
1025 $table->add (1, 10, new CFClient::UI::Entry 1027 $table->add (1, 10, new CFPlus::UI::Entry
1026 text => $CFG->{output_sync}, 1028 text => $CFG->{output_sync},
1027 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.",
1028 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1030 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1029 ); 1031 );
1030 1032
1031 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1033 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1032 expand => 1, 1034 expand => 1,
1033 align => 0, 1035 align => 0,
1034 text => "Login", 1036 text => "Login",
1035 on_activate => sub { 1037 on_activate => sub {
1036 $CONN ? stop_game 1038 $CONN ? stop_game
1037 : start_game; 1039 : start_game;
1038 0 1040 0
1039 }, 1041 },
1040 ); 1042 );
1041 1043
1042 $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");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1045 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1044 text => $CFG->{say_command}, 1046 text => $CFG->{say_command},
1045 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. "
1046 . "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. "
1047 . "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.",
1048 on_changed => sub { 1050 on_changed => sub {
1049 my ($self, $value) = @_; 1051 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1052 $CFG->{say_command} = $value;
1051 0 1053 0
1052 } 1054 }
1053 ); 1055 );
1054 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
1055 $vbox->add (new CFClient::UI::Label 1068 $vbox->add (new CFPlus::UI::FancyFrame
1056 text => "Server Info", 1069 label => "Server Info",
1057 fontsize => 1.2,
1058 padding_y => 8,
1059 fg => [1, 1, 0, 1],
1060 );
1061
1062 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1070 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1071 );
1063 1072
1064 $vbox 1073 $vbox
1065} 1074}
1066 1075
1067sub message_window { 1076sub message_window {
1068 my $window = new CFClient::UI::FancyFrame 1077 my $window = new CFPlus::UI::Toplevel
1069 name => "message_window", 1078 name => "message_window",
1070 title => "Messages", 1079 title => "Messages",
1071 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1072 x => "max", 1081 x => "max",
1073 y => 0, 1082 y => 0,
1074 force_w => $::WIDTH * 0.4, 1083 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5, 1084 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFClient::UI::VBox), 1085 child => (my $vbox = new CFPlus::UI::VBox),
1077 has_close_button => 1; 1086 has_close_button => 1;
1078 1087
1079 $vbox->add ($LOGVIEW); 1088 $vbox->add ($LOGVIEW);
1080 1089
1081 $vbox->add (my $input = new CFClient::UI::Entry 1090 $vbox->add (my $input = new CFPlus::UI::Entry
1082 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> "
1083 . "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>...). "
1084 . "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). "
1085 . "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.",
1086 on_focus_in => sub { 1095 on_focus_in => sub {
… …
1125 }; 1134 };
1126 1135
1127 $window 1136 $window
1128} 1137}
1129 1138
1130sub open_quit_dialog {
1131 unless ($QUIT_DIALOG) {
1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 title => "Really Quit?",
1137 ;
1138
1139 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1140
1141 $vb->add (new CFClient::UI::Label
1142 text => "You should find a savebed and apply it first!",
1143 max_w => $WIDTH * 0.25,
1144 ellipsize => 0,
1145 );
1146 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1147 $hb->add (new CFClient::UI::Button
1148 text => "Ok",
1149 expand => 1,
1150 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1151 );
1152 $hb->add (new CFClient::UI::Button
1153 text => "Quit anyway",
1154 expand => 1,
1155 on_activate => sub { exit },
1156 );
1157 }
1158
1159 $QUIT_DIALOG->show;
1160}
1161
1162sub autopickup_setup { 1139sub autopickup_setup {
1163 my $table = new CFClient::UI::Table; 1140 my $table = new CFPlus::UI::Table;
1164 1141
1165 for ( 1142 for (
1166 ["General", 0, 0, 1143 ["General", 0, 0,
1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1144 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1168 ["Inhibit autopickup" => PICKUP_INHIBIT], 1145 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1202 ], 1179 ],
1203 ["Weight/Value ratio", 2, 17] 1180 ["Weight/Value ratio", 2, 17]
1204 ) 1181 )
1205 { 1182 {
1206 my ($title, $x, $y, @bits) = @$_; 1183 my ($title, $x, $y, @bits) = @$_;
1207 $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]);
1208 1185
1209 for (@bits) { 1186 for (@bits) {
1210 ++$y; 1187 ++$y;
1211 1188
1212 my $mask = $_->[1]; 1189 my $mask = $_->[1];
1213 $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);
1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1191 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1215 state => $::CFG->{pickup} & $mask, 1192 state => $::CFG->{pickup} & $mask,
1216 on_changed => sub { 1193 on_changed => sub {
1217 my ($box, $value) = @_; 1194 my ($box, $value) = @_;
1218 1195
1219 if ($value) { 1196 if ($value) {
… …
1230 1207
1231 ${$_->[2]} = $checkbox if $_->[2]; 1208 ${$_->[2]} = $checkbox if $_->[2];
1232 } 1209 }
1233 } 1210 }
1234 1211
1235 $table->add (2, 18, new CFClient::UI::ValSlider 1212 $table->add (2, 18, new CFPlus::UI::ValSlider
1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1213 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99", 1214 template => ">= 99",
1238 to_value => sub { ">= " . 5 * $_[0] }, 1215 to_value => sub { ">= " . 5 * $_[0] },
1239 on_changed => sub { 1216 on_changed => sub {
1240 my ($slider, $value) = @_; 1217 my ($slider, $value) = @_;
… …
1243 $::CFG->{pickup} |= int $value 1220 $::CFG->{pickup} |= int $value
1244 if $value; 1221 if $value;
1245 1; 1222 1;
1246 }); 1223 });
1247 1224
1248 $table->add (3, 18, new CFClient::UI::Button 1225 $table->add (3, 18, new CFPlus::UI::Button
1249 text => "set", 1226 text => "set",
1250 on_activate => sub { 1227 on_activate => sub {
1251 $::CONN->send_command ("pickup $::CFG->{pickup}") 1228 $::CONN->send_command ("pickup $::CFG->{pickup}")
1252 if defined $::CONN; 1229 if defined $::CONN;
1253 0 1230 0
1254 }); 1231 });
1255 1232
1256 $table 1233 $table
1257} 1234}
1258 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
1259sub inventory_widget { 1249sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1; 1250 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1261 1251
1262 $hb->add (my $vb1 = new CFClient::UI::VBox); 1252 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1253 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1264 1254
1265 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1255 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1266 1256
1267 use sort 'stable'; 1257 use sort 'stable';
1268 1258
1269 $hb1->add (new CFClient::UI::Combobox 1259 $hb1->add (new CFPlus::UI::Selector
1270 value => undef, 1260 value => $::CFG->{inv_sort},
1271 options => [ 1261 options => [
1272 [undef, "Type/Name"], 1262 [type => "Type/Name"],
1273 [ 1263 [mtime => "Recent/Normal/Locked"],
1274 sub { sort {
1275 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1276 or $a->{type} <=> $b->{type}
1277 } @_ },
1278 "Weight/Type", 1264 [weight => "Weight/Type"],
1279 ],
1280 [sub { } => "#TODO#"],
1281 ], 1265 ],
1282 on_changed => sub { 1266 on_changed => sub {
1267 $::CFG->{inv_sort} = $_[1];
1283 $INV->set_sort_order ($_[1]); 1268 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1284 }, 1269 },
1285 ); 1270 );
1286 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); 1271 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1287 #TODO# update to weigh/maxweight 1272 #TODO# update to weigh/maxweight
1288 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1273 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1289 1274
1290 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1275 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1291 $sw1->add ($INV = new CFClient::UI::Inventory); 1276 $sw1->add ($INV = new CFPlus::UI::Inventory);
1292 1277
1293 $hb->add (my $vb2 = new CFClient::UI::VBox); 1278 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1294 1279
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1280 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1296 1281
1297 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1282 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1298 $sw2->add ($INVR = new CFClient::UI::Inventory); 1283 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1299 1284
1300 # XXX: Call after $INVR = ... because set_opencont sets the items 1285 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1286 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1302 1287
1303 $hb 1288 $hb
1304} 1289}
1305 1290
1306sub toggle_player_page { 1291sub toggle_player_page {
… …
1313 $PL_WINDOW->show; 1298 $PL_WINDOW->show;
1314 } 1299 }
1315} 1300}
1316 1301
1317sub player_window { 1302sub player_window {
1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1303 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1319 x => "center", 1304 x => "center",
1320 y => "center", 1305 y => "center",
1321 force_w => $WIDTH * 9/10, 1306 force_w => $WIDTH * 9/10,
1322 force_h => $HEIGHT * 9/10, 1307 force_h => $HEIGHT * 9/10,
1323 title => "Player", 1308 title => "Player",
… …
1325 has_close_button => 1 1310 has_close_button => 1
1326 ; 1311 ;
1327 1312
1328 my $ntb = 1313 my $ntb =
1329 $PL_NOTEBOOK = 1314 $PL_NOTEBOOK =
1330 new CFClient::UI::Notebook expand => 1, debug => 1; 1315 new CFPlus::UI::Notebook expand => 1, debug => 1;
1331 1316
1332 $ntb->add ( 1317 $ntb->add (
1333 "Statistics (F2)" => $STATS_PAGE = stats_window, 1318 "Statistics (F2)" => $STATS_PAGE = stats_window,
1334 "Shows statistics, where all your Stats and Resistances are shown." 1319 "Shows statistics, where all your Stats and Resistances are shown."
1335 ); 1320 );
1336 $ntb->add ( 1321 $ntb->add (
1337 "Skills (F3)" => $SKILL_PAGE = skill_window, 1322 "Skills (F3)" => $SKILL_PAGE = skill_window,
1338 "Shows all your Skills." 1323 "Shows all your Skills."
1339 ); 1324 );
1340 1325
1341 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1326 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1342 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1327 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1343 $ntb->add ( 1328 $ntb->add (
1344 "Spellbook (F4)" => $spellsw, 1329 "Spellbook (F4)" => $spellsw,
1345 "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."
1346 ); 1331 );
1347 $ntb->add ( 1332 $ntb->add (
… …
1359sub update_bindings { 1344sub update_bindings {
1360 $BIND_UPD_CB->() if $BIND_UPD_CB; 1345 $BIND_UPD_CB->() if $BIND_UPD_CB;
1361} 1346}
1362 1347
1363sub keyboard_setup { 1348sub keyboard_setup {
1364 my $binding_list = new CFClient::UI::VBox; 1349 my $binding_list = new CFPlus::UI::VBox;
1365 1350
1366 my $refresh; 1351 my $refresh;
1367 $refresh = $BIND_UPD_CB = sub { 1352 $refresh = $BIND_UPD_CB = sub {
1368 $binding_list->clear (); 1353 $binding_list->clear ();
1369 1354
1355 return unless $PROFILE;
1356
1370 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1357 for my $mod (keys %{$PROFILE->{bindings}}) {
1371 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1358 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1372 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1359 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1373 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1360 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1374 1361
1375 my $lbl = join "; ", @$cmds; 1362 my $lbl = join "; ", @$cmds;
1376 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1363 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1377 $binding_list->add (my $hb = new CFClient::UI::HBox); 1364 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1378 $hb->add (new CFClient::UI::Button 1365 $hb->add (new CFPlus::UI::Button
1379 text => "delete", 1366 text => "delete",
1380 tooltip => "Deletes the binding", 1367 tooltip => "Deletes the binding",
1381 on_activate => sub { 1368 on_activate => sub {
1382 $binding_list->remove ($hb); 1369 $binding_list->remove ($hb);
1383 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1370 delete $PROFILE->{bindings}{$mod}{$sym};
1384 0 1371 0
1385 }); 1372 });
1386 1373
1387 $hb->add (new CFClient::UI::Button 1374 $hb->add (new CFPlus::UI::Button
1388 text => "edit", 1375 text => "edit",
1389 tooltip => "Edits the binding", 1376 tooltip => "Edits the binding",
1390 on_activate => sub { 1377 on_activate => sub {
1391 $::BIND_EDITOR->set_binding ( 1378 $::BIND_EDITOR->set_binding (
1392 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1379 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1393 sub { 1380 sub {
1394 my ($nmod, $nsym, $ncmds) = @_; 1381 my ($nmod, $nsym, $ncmds) = @_;
1395 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1382 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1396 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1383 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1397 $refresh->(); 1384 $refresh->();
… …
1405 $::BIND_EDITOR->show; 1392 $::BIND_EDITOR->show;
1406 $SETUP_DIALOG->hide; 1393 $SETUP_DIALOG->hide;
1407 0 1394 0
1408 }); 1395 });
1409 1396
1410 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1397 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1411 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1398 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1412 } 1399 }
1413 } 1400 }
1414 }; 1401 };
1415 1402
1416 my $vb = new CFClient::UI::VBox; 1403 my $vb = new CFPlus::UI::VBox;
1417 $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 );
1418 $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");
1419 $hb->add (new CFClient::UI::CheckBox 1409 $hb->add (new CFPlus::UI::CheckBox
1420 expand => 1, 1410 expand => 1,
1421 state => $CFG->{shift_fire_stop}, 1411 state => $CFG->{shift_fire_stop},
1422 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",
1423 on_changed => sub { 1413 on_changed => sub {
1424 my ($cbox, $value) = @_; 1414 my ($cbox, $value) = @_;
1425 $CFG->{shift_fire_stop} = $value; 1415 $CFG->{shift_fire_stop} = $value;
1426 0 1416 0
1427 }); 1417 });
1428 1418
1429 $vb->add ($binding_list); 1419 $vb->add (new CFPlus::UI::FancyFrame
1420 label => "Bindings",
1421 child => $binding_list);
1430 $vb->add (my $hb = new CFClient::UI::HBox); 1422 $vb->add (my $hb = new CFPlus::UI::HBox);
1431 1423
1432 $hb->add (new CFClient::UI::Button 1424 $hb->add (new CFPlus::UI::Button
1433 text => "record new", 1425 text => "record new",
1434 expand => 1, 1426 expand => 1,
1435 tooltip => "This button opens the binding editor with an empty binding.", 1427 tooltip => "This button opens the binding editor with an empty binding.",
1436 on_activate => sub { 1428 on_activate => sub {
1437 $::BIND_EDITOR->set_binding (undef, undef, [], 1429 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1451 $::BIND_EDITOR->show; 1443 $::BIND_EDITOR->show;
1452 0 1444 0
1453 }, 1445 },
1454 ); 1446 );
1455 1447
1456 $hb->add (new CFClient::UI::Button 1448 $hb->add (new CFPlus::UI::Button
1457 text => "close", 1449 text => "close",
1458 tooltip => "Closes the binding window", 1450 tooltip => "Closes the binding window",
1459 expand => 1, 1451 expand => 1,
1460 on_activate => sub { 1452 on_activate => sub {
1461 $SETUP_DIALOG->hide; 1453 $SETUP_DIALOG->hide;
… …
1466 $refresh->(); 1458 $refresh->();
1467 1459
1468 $vb 1460 $vb
1469} 1461}
1470 1462
1471# just weirdness, pls. ignore
1472sub load_html_page {
1473 my ($viewer, $base) = @_;
1474
1475 $viewer->clear;
1476
1477 require LWP::Simple;
1478 require HTML::Parser;
1479 require URI;
1480
1481 my $page = LWP::Simple::get ($base)
1482 or return;
1483
1484 my @s = { };
1485 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1486
1487 my $parser = HTML::Parser->new (
1488 text_h => [sub {
1489 my ($text) = @_;
1490 $text =~ s/\s+/ /g;
1491 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1492 }, "dtext"],
1493 start_h => [sub {
1494 my ($tag, $attr) = @_;
1495 if ($passthrough{$tag}) {
1496 $s[-1]{text} .= "<$tag>";
1497 } elsif ($tag eq "h1") {
1498 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1499 } elsif ($tag eq "h2") {
1500 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1501 } elsif ($tag eq "h3") {
1502 push @s, { text => "<span size='large'>" };
1503 } elsif ($tag eq "a") {
1504 push @s, { text => "", url => $attr->{href} };
1505 } elsif ($tag eq "p") {
1506 push @s, { };
1507 } elsif ($tag eq "img") {
1508 eval {
1509 push @{$s[-1]{obj}}, new CFClient::UI::Image
1510 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1511 $s[-1]{text} .= "\x{fffc}";
1512 };
1513 }
1514 }, "tagname, attr"],
1515 end_h => [sub {
1516 my ($tag) = @_;
1517 if ($passthrough{$tag}) {
1518 $s[-1]{text} .= "</$tag>";
1519 } elsif ($tag =~ /^h\d$/) {
1520 $s[-1]{text} .= "</span>";
1521 push @s, { };
1522 } elsif ($tag eq "a") {
1523 my $S = pop @s;
1524 $s[-1]{text} .= "\x{fffc}";
1525 push @{$s[-1]{obj}}, new CFClient::UI::Label
1526 fg => [0.8, 0.8, 1],
1527 markup => "<u>$S->{text}</u>",
1528 fontsize => 0.8,
1529 can_events => 1,
1530 can_focus => 1,
1531 on_button_up => sub {
1532 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1533 },
1534 ;
1535 }
1536 }, "tagname"],
1537 );
1538
1539 $parser->parse ($page);
1540 $parser->eof;
1541
1542 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1543 for @s;
1544
1545 $viewer->set_offset (0);
1546}
1547
1548sub help_window { 1463sub help_window {
1549 my $win = new CFClient::UI::FancyFrame 1464 my $win = new CFPlus::UI::Toplevel
1550 x => 'center', 1465 x => 'center',
1551 y => 'center', 1466 y => 'center',
1552 z => 2, 1467 z => 4,
1553 name => 'doc_browser', 1468 name => 'doc_browser',
1554 force_w => int $WIDTH * 7/8, 1469 force_w => int $WIDTH * 7/8,
1555 force_h => int $HEIGHT * 7/8, 1470 force_h => int $HEIGHT * 7/8,
1556 title => "Help Browser", 1471 title => "Help Browser",
1557 has_close_button => 1; 1472 has_close_button => 1;
1558 1473
1559 $win->add (my $vbox = new CFClient::UI::VBox); 1474 $win->add (my $vbox = new CFPlus::UI::VBox);
1560 1475
1561 $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 );
1562 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1480 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1563 expand => 1, fontsize => 0.8, padding_x => 4); 1481 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1564 1482
1565 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1483 my @history;
1566 $buttons->add (my $combo = new CFClient::UI::Combobox 1484 my @future;
1567 value => undef, 1485 my $curnode;
1568 options => [ 1486
1569 [intro => "Introduction"], 1487 my $load_node; $load_node = sub {
1570 [manual => "Main Manual"], 1488 my ($node, $para) = @_;
1571 [skill_help => "Skill Reference"], 1489
1572 [command_help => "Command Reference"], 1490 $buttons->clear;
1573 [dmcommand_help => "DM Commands"], 1491
1574 [COPYING => "License Terms"], 1492 $buttons->add (new CFPlus::UI::Button
1575 [test => "test (do not select)"], #d#TODO 1493 text => "⇤",
1576 ], 1494 tooltip => "back to the starting page",
1577 on_changed => sub { 1495 on_activate => sub {
1578 my ($self, $pod) = @_; 1496 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1497 unshift @future, @history;
1498 @history = ();
1499 $load_node->(@{shift @future});
1500 },
1501 );
1579 1502
1580 if ($pod eq "test") {#d#TODO 1503 if (@history) {
1581 eval { 1504 $buttons->add (new CFPlus::UI::Button
1582 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; 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});
1583 }; 1510 },
1584 warn "$@" if $@; 1511 );
1585 return; 1512 }
1513
1514 if (@future) {
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 }
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
1546 $viewer->clear;
1547 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1548 $viewer->scroll_to ($para);
1549 };
1550
1551 $load_node->(CFPlus::Pod::find pod => "mainpage");
1552
1553 $CFPlus::Pod::goto_document = sub {
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;
1586 } 1596 }
1587
1588 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1589 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1590
1591 $viewer->clear;
1592
1593# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1594# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1595# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1596# ]);#d#
1597 1597 ;
1598 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1599 for @$pom;
1600 1598
1601 $viewer->set_offset (0); 1599 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1602 1600
1603 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;
1604 }, 1669 },
1605 on_visibility_change => sub {
1606 my ($self, $visible) = @_;
1607 return unless $visible;
1608 return if $self->{value};
1609 $self->set_value ("intro");
1610 0
1611 },
1612 ); 1670 );
1613 1671
1614 $win 1672 $dialog->show;
1615} 1673}
1616 1674
1617sub sdl_init { 1675sub sdl_init {
1618 CFClient::SDL_Init 1676 CFPlus::SDL_Init
1619 and die "SDL::Init failed!\n"; 1677 and die "SDL::Init failed!\n";
1620} 1678}
1621 1679
1622sub video_init { 1680sub video_init {
1623 sdl_init; 1681 sdl_init;
… …
1628 1686
1629 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1687 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1630 $FULLSCREEN = $CFG->{fullscreen}; 1688 $FULLSCREEN = $CFG->{fullscreen};
1631 $FAST = $CFG->{fast}; 1689 $FAST = $CFG->{fast};
1632 1690
1633 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1691 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1634 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1692 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1635 1693
1636 $SDL_ACTIVE = 1; 1694 $SDL_ACTIVE = 1;
1637 $LAST_REFRESH = time - 0.01; 1695 $LAST_REFRESH = time - 0.01;
1638 1696
1639 CFClient::OpenGL::init; 1697 CFPlus::OpenGL::init;
1640 1698
1641 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1699 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1642 1700
1643 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1701 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1644 1702
1645 ############################################################################# 1703 #############################################################################
1646 1704
1647 if ($DEBUG_STATUS) { 1705 if ($DEBUG_STATUS) {
1648 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1706 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1649 } else { 1707 } else {
1650 # create the widgets 1708 # create the widgets
1651 1709
1652 $DEBUG_STATUS = new CFClient::UI::Label 1710 $DEBUG_STATUS = new CFPlus::UI::Label
1653 padding => 0, 1711 padding => 0,
1654 z => 100, 1712 z => 100,
1655 force_x => "max", 1713 force_x => "max",
1656 force_y => 0; 1714 force_y => 0;
1657 $DEBUG_STATUS->show; 1715 $DEBUG_STATUS->show;
1658 1716
1659 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1717 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1660 1718
1661 $STATUSBOX = new CFClient::UI::Statusbox; 1719 $STATUSBOX = new CFPlus::UI::Statusbox;
1662 $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]);
1663 1721
1664 (new CFClient::UI::Frame 1722 (new CFPlus::UI::Frame
1665 bg => [0, 0, 0, 0.4], 1723 bg => [0, 0, 0, 0.4],
1666 force_x => 0, 1724 force_x => 0,
1667 force_y => "max", 1725 force_y => "max",
1668 child => $STATUSBOX, 1726 child => $STATUSBOX,
1669 )->show; 1727 )->show;
1670 1728
1671 CFClient::UI::FancyFrame->new ( 1729 CFPlus::UI::Toplevel->new (
1672 title => "Map", 1730 title => "Map",
1673 name => "mapmap", 1731 name => "mapmap",
1674 x => 0, 1732 x => 0,
1675 y => $FONTSIZE + 8, 1733 y => $FONTSIZE + 8,
1676 border_bg => [1, 1, 1, 192/255], 1734 border_bg => [1, 1, 1, 192/255],
1677 bg => [1, 1, 1, 0], 1735 bg => [1, 1, 1, 0],
1678 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1736 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1679 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.",
1680 ), 1738 ),
1681 )->show; 1739 )->show;
1682 1740
1683 $MAPWIDGET = new CFClient::MapWidget; 1741 $MAPWIDGET = new CFPlus::MapWidget;
1684 $MAPWIDGET->connect (activate_console => sub { 1742 $MAPWIDGET->connect (activate_console => sub {
1685 my ($mapwidget, $preset) = @_; 1743 my ($mapwidget, $preset) = @_;
1686 1744
1687 if ($CONSOLE) { 1745 if ($CONSOLE) {
1688 $CONSOLE->{input}->{auto_activated} = 1; 1746 $CONSOLE->{input}->{auto_activated} = 1;
… …
1694 } 1752 }
1695 }); 1753 });
1696 $MAPWIDGET->show; 1754 $MAPWIDGET->show;
1697 $MAPWIDGET->grab_focus; 1755 $MAPWIDGET->grab_focus;
1698 1756
1699 $LOGVIEW = new CFClient::UI::TextScroller 1757 $LOGVIEW = new CFPlus::UI::TextScroller
1700 expand => 1, 1758 expand => 1,
1701 font => $FONT_FIXED, 1759 font => $FONT_FIXED,
1702 fontsize => $::CFG->{log_fontsize}, 1760 fontsize => $::CFG->{log_fontsize},
1703 indent => -4, 1761 indent => -4,
1704 can_hover => 1, 1762 can_hover => 1,
1705 can_events => 1, 1763 can_events => 1,
1706 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.",
1707 ; 1765 ;
1708 1766
1709 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1767 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1710 title => "Setup", 1768 title => "Setup",
1711 name => "setup_dialog", 1769 name => "setup_dialog",
1712 x => 'center', 1770 x => 'center',
1713 y => 'center', 1771 y => 'center',
1714 z => 2, 1772 z => 2,
… …
1717 has_close_button => 1, 1775 has_close_button => 1,
1718 ; 1776 ;
1719 1777
1720 $METASERVER = metaserver_dialog; 1778 $METASERVER = metaserver_dialog;
1721 1779
1722 $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,
1723 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1781 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1724 1782
1725 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1783 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1726 "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.");
1727 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1785 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1728 "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.");
… …
1738 . "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 "
1739 . "binding editor closes"); 1797 . "binding editor closes");
1740 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1798 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1741 "Some debuggin' options. Do not ask."); 1799 "Some debuggin' options. Do not ask.");
1742 1800
1743 $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
1744 1802
1745 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1803 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1746 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.");
1747 1805
1748 $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,
1749 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.");
1750 1808
1751 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
1752 1810
1753 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1811 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1754 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.");
1755 1813
1756 $BUTTONBAR->add (new CFClient::UI::Button 1814 $BUTTONBAR->add (new CFPlus::UI::Button
1757 text => "Save Config", 1815 text => "Save Config",
1758 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.",
1759 on_activate => sub { 1817 on_activate => sub {
1760 $::CFG->{layout} = CFClient::UI::get_layout; 1818 $::CFG->{layout} = CFPlus::UI::get_layout;
1761 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1819 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1762 status "Configuration Saved"; 1820 status "Configuration Saved";
1763 0 1821 0
1764 }, 1822 },
1765 ); 1823 );
1766 1824
1767 $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,
1768 tooltip => "View Documentation"); 1826 tooltip => "View Documentation");
1769 1827
1770 $BUTTONBAR->add (new CFClient::UI::Button 1828 $BUTTONBAR->add (new CFPlus::UI::Button
1771 text => "Quit", 1829 text => "Quit",
1772 tooltip => "Terminates the program", 1830 tooltip => "Terminates the program",
1773 on_activate => sub { 1831 on_activate => sub {
1774 if ($CONN) { 1832 if ($CONN) {
1775 open_quit_dialog; 1833 open_quit_dialog;
… …
1786 1844
1787 $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]);
1788} 1846}
1789 1847
1790sub video_shutdown { 1848sub video_shutdown {
1791 CFClient::OpenGL::shutdown; 1849 CFPlus::OpenGL::shutdown;
1792 1850
1793 undef $SDL_ACTIVE; 1851 undef $SDL_ACTIVE;
1794} 1852}
1795 1853
1796my @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#
… …
1804 1862
1805sub audio_music_finished { 1863sub audio_music_finished {
1806 return unless $CFG->{bgm_enable}; 1864 return unless $CFG->{bgm_enable};
1807 1865
1808 # TODO: hack, do play loop and mood music 1866 # TODO: hack, do play loop and mood music
1809 $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]";
1810 $bgmusic->play (0); 1868 $bgmusic->play (0);
1811 1869
1812 push @bgmusic, shift @bgmusic; 1870 push @bgmusic, shift @bgmusic;
1813} 1871}
1814 1872
1815sub audio_init { 1873sub audio_init {
1816 if ($CFG->{audio_enable}) { 1874 if ($CFG->{audio_enable}) {
1817 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1875 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1818 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1876 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1819 1877
1820 unless ($SDL_MIXER) { 1878 unless ($SDL_MIXER) {
1821 status "Unable to open sound device: there will be no sound"; 1879 status "Unable to open sound device: there will be no sound";
1822 return; 1880 return;
1823 } 1881 }
1824 1882
1825 CFClient::Mix_AllocateChannels 8; 1883 CFPlus::Mix_AllocateChannels 8;
1826 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1884 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1827 1885
1828 audio_music_finished; 1886 audio_music_finished;
1829 1887
1830 while (<$fh>) { 1888 while (<$fh>) {
1831 next if /^\s*#/; 1889 next if /^\s*#/;
… …
1834 my ($file, $volume, $event) = split /\s+/, $_, 3; 1892 my ($file, $volume, $event) = split /\s+/, $_, 3;
1835 1893
1836 push @SOUNDS, "$volume,$file"; 1894 push @SOUNDS, "$volume,$file";
1837 1895
1838 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1896 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1839 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";
1840 $chunk->volume ($volume * 128 / 100); 1898 $chunk->volume ($volume * 128 / 100);
1841 $chunk 1899 $chunk
1842 }; 1900 };
1843 } 1901 }
1844 } else { 1902 } else {
… …
1846 } 1904 }
1847 } 1905 }
1848} 1906}
1849 1907
1850sub audio_shutdown { 1908sub audio_shutdown {
1851 CFClient::Mix_CloseAudio if $SDL_MIXER; 1909 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1852 undef $SDL_MIXER; 1910 undef $SDL_MIXER;
1853 @SOUNDS = (); 1911 @SOUNDS = ();
1854 %AUDIO_CHUNKS = (); 1912 %AUDIO_CHUNKS = ();
1855} 1913}
1856 1914
… …
1863 1921
1864sub force_refresh { 1922sub force_refresh {
1865 $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;
1866 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1924 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1867 1925
1868 $CFClient::UI::ROOT->draw; 1926 $CFPlus::UI::ROOT->draw;
1869 1927
1870 $WANT_REFRESH = 0; 1928 $WANT_REFRESH = 0;
1871 $CAN_REFRESH = 0; 1929 $CAN_REFRESH = 0;
1872 $LAST_REFRESH = $NOW; 1930 $LAST_REFRESH = $NOW;
1873 1931
18740 && do {
1875 # some weird model-drawing code, just a joke right now
1876 use CFClient::OpenGL;
1877
1878 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1879 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1880 $demo{r} ||= do {
1881 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1882 $mod->{v} = pack "f*", @{$mod->{v}};
1883 $_ = [scalar @$_, pack "S!*", @$_]
1884 for values %{$mod->{g}};
1885 $mod
1886 };
1887
1888 my $r = $demo{r} or die;
1889
1890 glDepthMask 1;
1891 glClear GL_DEPTH_BUFFER_BIT;
1892 glEnable GL_TEXTURE_2D;
1893 glEnable GL_DEPTH_TEST;
1894 glEnable GL_CULL_FACE;
1895 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1896
1897 glMatrixMode GL_PROJECTION;
1898 glLoadIdentity;
1899 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1900 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1901 glMatrixMode GL_MODELVIEW;
1902 glLoadIdentity;
1903
1904 glPushMatrix;
1905 glTranslate 0, 0, -800;
1906 glScale 1, -1, 1;
1907 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1908 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1909 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1910 glScale 50, 50, 50;
1911
1912 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1913 while (my ($k, $v) = each %{$r->{g}}) {
1914 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1915 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1916 }
1917
1918 glPopMatrix;
1919
1920 glShadeModel GL_FLAT;
1921 glDisable GL_DEPTH_TEST;
1922 glDisable GL_TEXTURE_2D;
1923 glDepthMask 0;
1924
1925 $WANT_REFRESH++;
1926};
1927
1928 CFClient::SDL_GL_SwapBuffers; 1932 CFPlus::SDL_GL_SwapBuffers;
1929} 1933}
1930 1934
1931my $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 {
1932 $NOW = time; 1936 $NOW = time;
1933 1937
1934 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1938 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1935 for CFClient::SDL_PollEvent; 1939 for CFPlus::SDL_PollEvent;
1936 1940
1937 if (%animate_object) { 1941 if (%animate_object) {
1938 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1942 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1939 $WANT_REFRESH++; 1943 $WANT_REFRESH++;
1940 } 1944 }
… …
1964 $CONN->face_prefetch 1968 $CONN->face_prefetch
1965 if $CONN; 1969 if $CONN;
1966}); 1970});
1967 1971
1968%SDL_CB = ( 1972%SDL_CB = (
1969 CFClient::SDL_QUIT => sub { 1973 CFPlus::SDL_QUIT => sub {
1970 Event::unloop -1; 1974 Event::unloop -1;
1971 }, 1975 },
1972 CFClient::SDL_VIDEORESIZE => sub { 1976 CFPlus::SDL_VIDEORESIZE => sub {
1973 }, 1977 },
1974 CFClient::SDL_VIDEOEXPOSE => sub { 1978 CFPlus::SDL_VIDEOEXPOSE => sub {
1975 CFClient::UI::full_refresh; 1979 CFPlus::UI::full_refresh;
1976 }, 1980 },
1977 CFClient::SDL_ACTIVEEVENT => sub { 1981 CFPlus::SDL_ACTIVEEVENT => sub {
1978# 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#
1979 }, 1983 },
1980 CFClient::SDL_KEYDOWN => sub { 1984 CFPlus::SDL_KEYDOWN => sub {
1981 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1985 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1982 # alt-enter 1986 # alt-enter
1983 $FULLSCREEN_ENABLE->toggle; 1987 $FULLSCREEN_ENABLE->toggle;
1984 video_shutdown; 1988 video_shutdown;
1985 video_init; 1989 video_init;
1986 } else { 1990 } else {
1987 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1991 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1988 } 1992 }
1989 }, 1993 },
1990 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1994 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1991 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1995 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1992 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1996 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1993 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1997 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1994 CFClient::SDL_USEREVENT => sub { 1998 CFPlus::SDL_USEREVENT => sub {
1995 if ($_[0]{code} == 1) { 1999 if ($_[0]{code} == 1) {
1996 audio_channel_finished $_[0]{data1}; 2000 audio_channel_finished $_[0]{data1};
1997 } elsif ($_[0]{code} == 0) { 2001 } elsif ($_[0]{code} == 0) {
1998 audio_music_finished; 2002 audio_music_finished;
1999 } 2003 }
… …
2003############################################################################# 2007#############################################################################
2004 2008
2005$SIG{INT} = $SIG{TERM} = sub { exit }; 2009$SIG{INT} = $SIG{TERM} = sub { exit };
2006 2010
2007{ 2011{
2008 local $SIG{__DIE__} = sub {
2009 return unless defined $^S && !$^S;
2010 Carp::confess $_[0];#d#TODO: remove when stable
2011 CFClient::fatal $_[0];
2012 };
2013
2014 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2012 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2015 CFClient::UI::set_layout ($::CFG->{layout}); 2013 CFPlus::UI::set_layout ($::CFG->{layout});
2016 2014
2017 my %DEF_CFG = ( 2015 my %DEF_CFG = (
2018 sdl_mode => 0, 2016 sdl_mode => 0,
2019 width => 640, 2017 width => 640,
2020 height => 480, 2018 height => 480,
… …
2036 bgm_volume => 0.25, 2034 bgm_volume => 0.25,
2037 face_prefetch => 0, 2035 face_prefetch => 0,
2038 output_sync => 1, 2036 output_sync => 1,
2039 output_count => 1, 2037 output_count => 1,
2040 pickup => 0, 2038 pickup => 0,
2039 inv_sort => "mtime",
2041 default => "profile", # default profile 2040 default => "profile", # default profile
2041 show_tips => 1,
2042 ); 2042 );
2043 2043
2044 while (my ($k, $v) = each %DEF_CFG) { 2044 while (my ($k, $v) = each %DEF_CFG) {
2045 $CFG->{$k} = $v unless exists $CFG->{$k}; 2045 $CFG->{$k} = $v unless exists $CFG->{$k};
2046 } 2046 }
… …
2049 2049
2050 sdl_init; 2050 sdl_init;
2051 2051
2052 @SDL_MODES = reverse 2052 @SDL_MODES = reverse
2053 grep $_->[0] >= 640 && $_->[1] >= 480, 2053 grep $_->[0] >= 640 && $_->[1] >= 480,
2054 CFClient::SDL_ListModes; 2054 CFPlus::SDL_ListModes;
2055 2055
2056 @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)";
2057 2057
2058 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2058 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2059 2059
2060 { 2060 {
2061 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2061 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2062 DejaVuSans.ttf 2062 DejaVuSans.ttf
2063 DejaVuSansMono.ttf 2063 DejaVuSansMono.ttf
2064 DejaVuSans-Bold.ttf 2064 DejaVuSans-Bold.ttf
2065 DejaVuSansMono-Bold.ttf 2065 DejaVuSansMono-Bold.ttf
2066 DejaVuSans-Oblique.ttf 2066 DejaVuSans-Oblique.ttf
2067 DejaVuSansMono-Oblique.ttf 2067 DejaVuSansMono-Oblique.ttf
2068 DejaVuSans-BoldOblique.ttf 2068 DejaVuSans-BoldOblique.ttf
2069 DejaVuSansMono-BoldOblique.ttf 2069 DejaVuSansMono-BoldOblique.ttf
2070 ); 2070 );
2071 2071
2072 CFClient::add_font $_ for @fonts; 2072 CFPlus::add_font $_ for @fonts;
2073 2073
2074 CFClient::pango_init; 2074 CFPlus::pango_init;
2075 2075
2076 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2076 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2077 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2077 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2078 2078
2079 $FONT_PROP->make_default; 2079 $FONT_PROP->make_default;
2080 } 2080 }
2081 2081
2082# compare mono (ft) vs. rgba (cairo) 2082# compare mono (ft) vs. rgba (cairo)
2083# ft - 1.8s, cairo 3s, even in alpha-only mode 2083# ft - 1.8s, cairo 3s, even in alpha-only mode
2084# for my $rgba (0..1) { 2084# for my $rgba (0..1) {
2085# my $t1 = Time::HiRes::time; 2085# my $t1 = Time::HiRes::time;
2086# for (1..1000) { 2086# for (1..1000) {
2087# my $layout = CFClient::Layout->new ($rgba); 2087# my $layout = CFPlus::Layout->new ($rgba);
2088# $layout->set_text ("hallo" x 100); 2088# $layout->set_text ("hallo" x 100);
2089# $layout->render; 2089# $layout->render;
2090# } 2090# }
2091# my $t2 = Time::HiRes::time; 2091# my $t2 = Time::HiRes::time;
2092# warn $t2-$t1; 2092# warn $t2-$t1;
… …
2094 2094
2095 video_init; 2095 video_init;
2096 audio_init; 2096 audio_init;
2097} 2097}
2098 2098
2099show_tip_of_the_day if $CFG->{show_tips};
2100
2101use Data::Dumper; warn Dumper [CFPlus::win32_proxy_info()];#d#
2102
2099Event::loop; 2103Event::loop;
2100#CFClient::SDL_Quit; 2104#CFPlus::SDL_Quit;
2101#CFClient::_exit 0; 2105#CFPlus::_exit 0;
2102 2106
2103END { CFClient::SDL_Quit } 2107END { CFPlus::SDL_Quit }
2104 2108
2105=head1 NAME 2109=head1 NAME
2106 2110
2107cfplus - A Crossfire+ and Crossfire game client 2111cfplus - A Crossfire+ and Crossfire game client
2108 2112

Diff Legend

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