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

Diff Legend

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