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.102 by root, Mon Jul 24 04:24:43 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 CFClient::Pod; 41use CFPlus::Pod;
42use CFClient::BindingEditor; 42use CFPlus::BindingEditor;
43use CFClient::MapWidget; 43use CFPlus::MapWidget;
44 44
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
47 47
48$Event::Eval = 0;
48$Event::DIED = sub { 49$Event::DIED = sub {
49 # TODO: display dialog box or so 50 # TODO: display dialog box or so
50 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
51 CFClient::error $_[1]; 52 return;#d#
53 CFPlus::fatal ($_[1]);
52}; 54};
53
54#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
55
56our $VERSION = '0.1';
57 55
58my $MAX_FPS = 60; 56my $MAX_FPS = 60;
59my $MIN_FPS = 5; # unused as of yet 57my $MIN_FPS = 5; # unused as of yet
60 58
61our $META_SERVER = "crossfire.real-time.com:13326"; 59our $META_SERVER = "crossfire.real-time.com:13326";
… …
63our $LAST_REFRESH; 61our $LAST_REFRESH;
64our $NOW; 62our $NOW;
65 63
66our $CFG; 64our $CFG;
67our $CONN; 65our $CONN;
66our $PROFILE; # current profile
68our $FAST; # fast, low-quality mode, possibly useful for software-rendering 67our $FAST; # fast, low-quality mode, possibly useful for software-rendering
69 68
70our $WANT_REFRESH; 69our $WANT_REFRESH;
71our $CAN_REFRESH; 70our $CAN_REFRESH;
72 71
… …
131our $BIND_UPD_CB; 130our $BIND_UPD_CB;
132 131
133our $PICKUP_CFG; 132our $PICKUP_CFG;
134 133
135sub status { 134sub status {
136 $STATUSBOX->add (CFClient::asxml $_[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]);
137} 136}
138 137
139sub debug { 138sub debug {
140 $DEBUG_STATUS->set_text ($_[0]); 139 $DEBUG_STATUS->set_text ($_[0]);
141} 140}
… …
147 146
148# server query dialog 147# server query dialog
149sub server_query { 148sub server_query {
150 my ($conn, $flags, $prompt) = @_; 149 my ($conn, $flags, $prompt) = @_;
151 150
152 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153 x => "center", 152 x => "center",
154 y => "center", 153 y => "center",
155 title => "Server Query", 154 title => "Server Query",
156 child => my $vbox = new CFClient::UI::VBox, 155 child => my $vbox = new CFPlus::UI::VBox,
157 ; 156 ;
158 157
159 my @dialog = my $label = new CFClient::UI::Label 158 my @dialog = my $label = new CFPlus::UI::Label
160 max_w => $::WIDTH * 0.4, 159 max_w => $::WIDTH * 0.4,
161 ellipsise => 0, 160 ellipsise => 0,
162 text => $prompt; 161 text => $prompt;
163 162
164 if ($flags & CS_QUERY_YESNO) { 163 if ($flags & CS_QUERY_YESNO) {
165 push @dialog, my $hbox = new CFClient::UI::HBox; 164 push @dialog, my $hbox = new CFPlus::UI::HBox;
166 165
167 $hbox->add (new CFClient::UI::Button 166 $hbox->add (new CFPlus::UI::Button
168 text => "No", 167 text => "No",
169 on_activate => sub { 168 on_activate => sub {
170 $conn->send ("reply n"); 169 $conn->send ("reply n");
171 $dialog->destroy; 170 $dialog->destroy;
172 0 171 0
173 } 172 }
174 ); 173 );
175 $hbox->add (new CFClient::UI::Button 174 $hbox->add (new CFPlus::UI::Button
176 text => "Yes", 175 text => "Yes",
177 on_activate => sub { 176 on_activate => sub {
178 $conn->send ("reply y"); 177 $conn->send ("reply y");
179 destroy_query_dialog $conn; 178 destroy_query_dialog $conn;
180 0 179 0
… …
182 ); 181 );
183 182
184 $dialog->grab_focus; 183 $dialog->grab_focus;
185 184
186 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
187 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "#charcreation_focus";
188 187
189 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) {
190 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
191 190
192 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
194 ellipsise => 0, 193 ellipsise => 0,
195 markup => "\nOr use your keyboard and the text entry below:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
196 195
197 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFPlus::UI::Table;
198 197
199 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFPlus::UI::Button
200 text => "Next Race", 199 text => "Next Race",
201 on_activate => sub { 200 on_activate => sub {
202 $conn->send ("reply n"); 201 $conn->send ("reply n");
203 destroy_query_dialog $conn; 202 destroy_query_dialog $conn;
204 0 203 0
205 }, 204 },
206 ); 205 );
207 $table->add (2, 0, new CFClient::UI::Button 206 $table->add (2, 0, new CFPlus::UI::Button
208 text => "Accept", 207 text => "Accept",
209 on_activate => sub { 208 on_activate => sub {
210 $conn->send ("reply d"); 209 $conn->send ("reply d");
211 destroy_query_dialog $conn; 210 destroy_query_dialog $conn;
212 0 211 0
213 }, 212 },
214 ); 213 );
215 214
216 unshift @dialog, new CFClient::UI::Label 215 unshift @dialog, new CFPlus::UI::Label
217 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
218 ellipsise => 0, 217 ellipsise => 0,
219 markup => 218 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
220 "<big><b>Character Creation: Race</b></big>\n\n"
221 . "Look at the <b>Messages</b> window to see a description of this race "
222 . "and the center of the screen to see how this race looks like "
223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "click into the display area to make it visible</small>).\n\n"
225 . "You can look at another race, or accept this race (you will cycle back to "
226 . "this race eventually, so you can take your time making this important choice."
227 ; 219 ;
228 220
229 } elsif ($prompt =~ /roll new stats/) { 221 } elsif ($prompt =~ /roll new stats/) {
230 if (my $stat = delete $conn->{stat_change_with}) { 222 if (my $stat = delete $conn->{stat_change_with}) {
231 $conn->send ("reply $stat"); 223 $conn->send ("reply $stat");
… …
234 } 226 }
235 227
236 $STATS_PAGE->show; 228 $STATS_PAGE->show;
237 $MESSAGE_WINDOW->hide; 229 $MESSAGE_WINDOW->hide;
238 230
239 unshift @dialog, new CFClient::UI::Label 231 unshift @dialog, new CFPlus::UI::Label
240 max_w => $::WIDTH * 0.4, 232 max_w => $::WIDTH * 0.4,
241 ellipsise => 0, 233 ellipsise => 0,
242 markup => "\nOr use your keyboard and the text entry below:\n"; 234 markup => "\nOr use your keyboard and the text entry below:\n";
243 235
244 unshift @dialog, my $table = new CFClient::UI::Table; 236 unshift @dialog, my $table = new CFPlus::UI::Table;
245 237
246 # left: re-roll 238 # left: re-roll
247 $table->add (0, 0, new CFClient::UI::Button 239 $table->add (0, 0, new CFPlus::UI::Button
248 text => "Roll Again", 240 text => "Roll Again",
249 on_activate => sub { 241 on_activate => sub {
250 $conn->send ("reply y"); 242 $conn->send ("reply y");
251 destroy_query_dialog $conn; 243 destroy_query_dialog $conn;
252 0 244 0
253 }, 245 },
254 ); 246 );
255 247
256 # center: swap stats 248 # center: swap stats
257 my ($sw1, $sw2) = map +(new CFClient::UI::Selector 249 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258 expand => 1, 250 expand => 1,
259 value => $_, 251 value => $_,
260 options => [ 252 options => [
261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 253 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 254 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
266 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 258 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 259 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268 ], 260 ],
269 ), 1 .. 2; 261 ), 1 .. 2;
270 262
271 $table->add (2, 0, new CFClient::UI::Button 263 $table->add (2, 0, new CFPlus::UI::Button
272 text => "Swap Stats", 264 text => "Swap Stats",
273 on_activate => sub { 265 on_activate => sub {
274 $conn->{stat_change_with} = $sw2->{value}; 266 $conn->{stat_change_with} = $sw2->{value};
275 $conn->send ("reply $sw1->{value}"); 267 $conn->send ("reply $sw1->{value}");
276 destroy_query_dialog $conn; 268 destroy_query_dialog $conn;
277 0 269 0
278 }, 270 },
279 ); 271 );
280 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 272 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281 273
282 # right: accept 274 # right: accept
283 $table->add (4, 0, new CFClient::UI::Button 275 $table->add (4, 0, new CFPlus::UI::Button
284 text => "Accept", 276 text => "Accept",
285 on_activate => sub { 277 on_activate => sub {
286 $conn->send ("reply n"); 278 $conn->send ("reply n");
287 $STATS_PAGE->hide; 279 $STATS_PAGE->hide;
288 destroy_query_dialog $conn; 280 destroy_query_dialog $conn;
289 0 281 0
290 }, 282 },
291 ); 283 );
292 284
293 unshift @dialog, my $hbox = new CFClient::UI::HBox; 285 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294 for ( 286 for (
295 [Str => CS_STAT_STR], 287 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX], 288 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON], 289 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT], 290 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS], 291 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW], 292 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA], 293 [Cha => CS_STAT_CHA],
302 ) { 294 ) {
303 my ($name, $id) = @$_; 295 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label 296 $hbox->add (new CFPlus::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 297 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0, 298 align => 0,
307 expand => 1, 299 expand => 1,
308 can_events => 1, 300 can_events => 1,
309 can_hover => 1, 301 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name}, 302 tooltip => "#stat_$name",
311 ); 303 );
312 } 304 }
313 305
314 unshift @dialog, new CFClient::UI::Label 306 unshift @dialog, new CFPlus::UI::Label
315 max_w => $::WIDTH * 0.4, 307 max_w => $::WIDTH * 0.4,
316 ellipsise => 0, 308 ellipsise => 0,
317 markup => 309 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
318 "<big><b>Character Creation: Stats</b></big>\n\n"
319 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "They will be modified later by both the race and the class you choose.\n\n"
322 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323 ; 310 ;
324 } 311 }
325 312
326 push @dialog, my $entry = new CFClient::UI::Entry 313 push @dialog, my $entry = new CFPlus::UI::Entry
327 on_changed => sub { 314 on_changed => sub {
328 $conn->send ("reply $_[1]"); 315 $conn->send ("reply $_[1]");
329 destroy_query_dialog $conn; 316 destroy_query_dialog $conn;
330 0 317 0
331 }, 318 },
… …
334 $entry->grab_focus; 321 $entry->grab_focus;
335 322
336 } else { 323 } else {
337 $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)";
338 325
339 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFPlus::UI::Entry
340 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 327 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341 on_activate => sub { 328 on_activate => sub {
342 $conn->send ("reply $_[1]"); 329 $conn->send ("reply $_[1]");
343 destroy_query_dialog $conn; 330 destroy_query_dialog $conn;
344 0 331 0
… …
356 status "logging in..."; 343 status "logging in...";
357 344
358 $LOGIN_BUTTON->set_text ("Logout"); 345 $LOGIN_BUTTON->set_text ("Logout");
359 $SETUP_DIALOG->hide; 346 $SETUP_DIALOG->hide;
360 347
348 $PROFILE = $CFG->{profile}{default};
349
361 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;
362 351
363 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 352 my ($host, $port) = split /:/, $PROFILE->{host};
364 353
365 $MAP = new CFClient::Map $mapsize, $mapsize; 354 $MAP = new CFPlus::Map $mapsize, $mapsize;
366 355
367 $CONN = eval { 356 $CONN = eval {
368 new CFClient::Protocol 357 new CFPlus::Protocol
369 host => $host, 358 host => $host,
370 port => $port || 13327, 359 port => $port || 13327,
371 user => $CFG->{profile}{default}{user}, 360 user => $PROFILE->{user},
372 pass => $CFG->{profile}{default}{password}, 361 pass => $PROFILE->{password},
373 mapw => $mapsize, 362 mapw => $mapsize,
374 maph => $mapsize, 363 maph => $mapsize,
364
365 client => "cfplus $CFPlus::VERSION $] $^O",
375 366
376 map_widget => $MAPWIDGET, 367 map_widget => $MAPWIDGET,
377 logview => $LOGVIEW, 368 logview => $LOGVIEW,
378 statusbox => $STATUSBOX, 369 statusbox => $STATUSBOX,
379 map => $MAP, 370 map => $MAP,
… …
392 $chunk->play; 383 $chunk->play;
393 }, 384 },
394 }; 385 };
395 386
396 if ($CONN) { 387 if ($CONN) {
397 CFClient::lowdelay fileno $CONN->{fh}; 388 CFPlus::lowdelay fileno $CONN->{fh};
398 389
399 status "login successful"; 390 status "login successful";
400 } else { 391 } else {
401 status "unable to connect"; 392 status "unable to connect";
402 stop_game(); 393 stop_game();
… …
420 411
421 undef $MAP; 412 undef $MAP;
422} 413}
423 414
424sub graphics_setup { 415sub graphics_setup {
425 my $vbox = new CFClient::UI::VBox; 416 my $vbox = new CFPlus::UI::VBox;
426 417
427 $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]);
428 419
429 $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");
430 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 421 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431 422
432 $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]);
433 $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");
434 425
435 $mode_slider->connect (changed => sub { 426 $mode_slider->connect (changed => sub {
436 my ($self, $value) = @_; 427 my ($self, $value) = @_;
437 428
438 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 429 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
440 }); 431 });
441 $mode_slider->emit (changed => $mode_slider->{range}[0]); 432 $mode_slider->emit (changed => $mode_slider->{range}[0]);
442 433
443 my $row = 1; 434 my $row = 1;
444 435
445 $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");
446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox 437 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447 state => $CFG->{fullscreen}, 438 state => $CFG->{fullscreen},
448 tooltip => "Bring the client into fullscreen mode.", 439 tooltip => "Bring the client into fullscreen mode.",
449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450 ); 441 );
451 442
452 $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");
453 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFPlus::UI::CheckBox
454 state => $CFG->{fast}, 445 state => $CFG->{fast},
455 tooltip => "Lower the visual quality considerably to speed up rendering.", 446 tooltip => "Lower the visual quality considerably to speed up rendering.",
456 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457 ); 448 );
458 449
459 $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");
460 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFPlus::UI::Slider
461 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 452 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 453 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463 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 }
464 ); 455 );
465 456
466 $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");
467 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFPlus::UI::CheckBox
468 state => $CFG->{fow_enable}, 459 state => $CFG->{fow_enable},
469 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.",
470 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 461 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471 ); 462 );
472 463
473 $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");
474 $table->add (1, $row++, new CFClient::UI::Slider 465 $table->add (1, $row++, new CFPlus::UI::Slider
475 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 466 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476 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.",
477 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 468 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478 ); 469 );
479 470
480 $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");
481 $table->add (1, $row++, new CFClient::UI::CheckBox 472 $table->add (1, $row++, new CFPlus::UI::CheckBox
482 state => $CFG->{fow_smooth}, 473 state => $CFG->{fow_smooth},
483 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.",
484 on_changed => sub { 475 on_changed => sub {
485 my ($self, $value) = @_; 476 my ($self, $value) = @_;
486 $CFG->{fow_smooth} = $value; 477 $CFG->{fow_smooth} = $value;
487 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;
488 0 479 0
489 } 480 }
490 ); 481 );
491 482
492 $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");
493 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFPlus::UI::Slider
494 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495 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.",
496 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 487 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497 ); 488 );
498 489
499 $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");
500 $table->add (1, $row++, new CFClient::UI::Slider 491 $table->add (1, $row++, new CFPlus::UI::Slider
501 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 492 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502 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.",
503 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 494 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504 ); 495 );
505 496
506 $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");
507 $table->add (1, $row++, new CFClient::UI::Slider 498 $table->add (1, $row++, new CFPlus::UI::Slider
508 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 499 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509 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.",
510 on_changed => sub { 501 on_changed => sub {
511 $CFG->{gauge_fontsize} = $_[1]; 502 $CFG->{gauge_fontsize} = $_[1];
512 &set_gauge_window_fontsize; 503 &set_gauge_window_fontsize;
513 0 504 0
514 } 505 }
515 ); 506 );
516 507
517 $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");
518 $table->add (1, $row++, new CFClient::UI::Slider 509 $table->add (1, $row++, new CFPlus::UI::Slider
519 range => [$CFG->{gauge_size}, 0.2, 0.8], 510 range => [$CFG->{gauge_size}, 0.2, 0.8],
520 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.",
521 on_changed => sub { 512 on_changed => sub {
522 $CFG->{gauge_size} = $_[1]; 513 $CFG->{gauge_size} = $_[1];
523 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 514 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524 0 515 0
525 } 516 }
526 ); 517 );
527 518
528 $table->add (1, $row++, new CFClient::UI::Button 519 $table->add (1, $row++, new CFPlus::UI::Button
529 expand => 1, align => 0, text => "Apply", 520 expand => 1, align => 0, text => "Apply",
530 tooltip => "Apply the video settings", 521 tooltip => "Apply the video settings",
531 on_activate => sub { 522 on_activate => sub {
532 video_shutdown (); 523 video_shutdown ();
533 video_init (); 524 video_init ();
… …
537 528
538 $vbox 529 $vbox
539} 530}
540 531
541sub audio_setup { 532sub audio_setup {
542 my $vbox = new CFClient::UI::VBox; 533 my $vbox = new CFPlus::UI::VBox;
543 534
544 $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]);
545 536
546 my $row = 0; 537 my $row = 0;
547 538
548 $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");
549 $table->add (1, $row++, new CFClient::UI::CheckBox 540 $table->add (1, $row++, new CFPlus::UI::CheckBox
550 state => $CFG->{audio_enable}, 541 state => $CFG->{audio_enable},
551 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.",
552 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 543 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553 ); 544 );
554# $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");
555# $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 {
556# $CFG->{effects_volume} = $_[1]; 547# $CFG->{effects_volume} = $_[1];
557# }); 548# });
558 $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");
559 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 550 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560 $hbox->add (new CFClient::UI::CheckBox 551 $hbox->add (new CFPlus::UI::CheckBox
561 expand => 1, state => $CFG->{bgm_enable}, 552 expand => 1, state => $CFG->{bgm_enable},
562 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.",
563 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 554 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564 ); 555 );
565 $hbox->add (new CFClient::UI::Slider 556 $hbox->add (new CFPlus::UI::Slider
566 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 557 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567 tooltip => "The volume of the background music. Changes are instant.", 558 tooltip => "The volume of the background music. Changes are instant.",
568 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 }
569 ); 560 );
570 561
571 $table->add (1, $row++, new CFClient::UI::Button 562 $table->add (1, $row++, new CFPlus::UI::Button
572 expand => 1, align => 0, text => "Apply", 563 expand => 1, align => 0, text => "Apply",
573 tooltip => "Apply the audio settings", 564 tooltip => "Apply the audio settings",
574 on_activate => sub { 565 on_activate => sub {
575 audio_shutdown (); 566 audio_shutdown ();
576 audio_init (); 567 audio_init ();
… …
588} 579}
589 580
590sub make_gauge_window { 581sub make_gauge_window {
591 my $gh = int $HEIGHT * $CFG->{gauge_size}; 582 my $gh = int $HEIGHT * $CFG->{gauge_size};
592 583
593 my $win = new CFClient::UI::Frame ( 584 my $win = new CFPlus::UI::Frame (
594 force_x => 0, 585 force_x => 0,
595 force_y => "max", 586 force_y => "max",
596 force_w => $WIDTH, 587 force_w => $WIDTH,
597 force_h => $gh, 588 force_h => $gh,
598 ); 589 );
599 590
600 $win->add (my $hbox = new CFClient::UI::HBox 591 $win->add (my $hbox = new CFPlus::UI::HBox
601 children => [ 592 children => [
602 (new CFClient::UI::HBox expand => 1), 593 (new CFPlus::UI::HBox expand => 1),
603 (new CFClient::UI::VBox children => [ 594 (new CFPlus::UI::VBox children => [
604 (new CFClient::UI::Empty expand => 1), 595 (new CFPlus::UI::Empty expand => 1),
605 (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)),
606 ]), 597 ]),
607 (my $vbox = new CFClient::UI::VBox), 598 (my $vbox = new CFPlus::UI::VBox),
608 ], 599 ],
609 ); 600 );
610 601
611 $vbox->add (new CFClient::UI::HBox 602 $vbox->add (new CFPlus::UI::HBox
612 expand => 1, 603 expand => 1,
613 children => [ 604 children => [
614 (new CFClient::UI::Empty expand => 1), 605 (new CFPlus::UI::Empty expand => 1),
615 (my $hb = new CFClient::UI::HBox), 606 (my $hb = new CFPlus::UI::HBox),
616 ], 607 ],
617 ); 608 );
618 609
619 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 610 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
620 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.");
621 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 611 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
622 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.");
623 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 612 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
624 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.");
625 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 613 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
626 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.");
627 614
628 $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");
629 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.");
630 $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");
631 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632 617
633 $GAUGES = { 618 $GAUGES = {
634 exp => $exp, win => $win, range => $rng, 619 exp => $exp, win => $win, range => $rng,
635 food => $fg, mana => $mg, hp => $hg, grace => $gg 620 food => $fg, mana => $mg, hp => $hg, grace => $gg
636 }; 621 };
… …
639 624
640 $win 625 $win
641} 626}
642 627
643sub debug_setup { 628sub debug_setup {
644 my $table = new CFClient::UI::Table; 629 my $table = new CFPlus::UI::Table;
645 630
646 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 631 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647 $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 });
648 $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");
649 $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 });
650 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651 $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 });
652 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653 $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 });
654 639
655 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);
656 641
657 for my $x (0..2) { 642 for my $x (0..2) {
658 for my $y (0 .. 2) { 643 for my $y (0 .. 2) {
659 $table->add ($x + 3, $y, 644 $table->add ($x + 3, $y,
660 new CFClient::UI::Entry 645 new CFPlus::UI::Entry
661 text => $default_smooth[$x * 3 + $y], 646 text => $default_smooth[$x * 3 + $y],
662 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 },
663 ); 648 );
664 } 649 }
665 } 650 }
… …
667 652
668 $table 653 $table
669} 654}
670 655
671sub stats_window { 656sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow ( 657 my $r = new CFPlus::UI::ScrolledWindow (
673 expand => 1, 658 expand => 1,
674 scroll_y => 1 659 scroll_y => 1
675 ); 660 );
676 $r->add (my $vb = new CFClient::UI::VBox); 661 $r->add (my $vb = new CFPlus::UI::VBox);
677 662
663 $vb->add (new CFPlus::UI::FancyFrame
664 label => "Player",
665 child => (my $pi = new CFPlus::UI::VBox),
666 );
667
678 $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,
679 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
680 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.");
681 $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,
682 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
683 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).");
684 674
685 $vb->add (my $hb0 = new CFClient::UI::HBox); 675 $pi->add (my $hb0 = new CFPlus::UI::HBox);
686 $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,
687 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
688 tooltip => "The weight of the player including all inventory items."); 678 tooltip => "The weight of the player including all inventory items.");
689 $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,
690 can_hover => 1, can_events => 1, 680 can_hover => 1, can_events => 1,
691 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
692 682
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 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1141 ;
1142
1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1144
1145 $vb->add (new CFClient::UI::Label
1146 text => "You should find a savebed and apply it first!",
1147 max_w => $WIDTH * 0.25,
1148 ellipsize => 0,
1149 );
1150 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1151 $hb->add (new CFClient::UI::Button
1152 text => "Ok",
1153 expand => 1,
1154 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1155 );
1156 $hb->add (new CFClient::UI::Button
1157 text => "Quit anyway",
1158 expand => 1,
1159 on_activate => sub { exit },
1160 );
1161 }
1162
1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1165}
1166
1167sub autopickup_setup { 1136sub autopickup_setup {
1168 my $table = new CFClient::UI::Table; 1137 my $table = new CFPlus::UI::Table;
1169 1138
1170 for ( 1139 for (
1171 ["General", 0, 0, 1140 ["General", 0, 0,
1172 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1141 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173 ["Inhibit autopickup" => PICKUP_INHIBIT], 1142 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1207 ], 1176 ],
1208 ["Weight/Value ratio", 2, 17] 1177 ["Weight/Value ratio", 2, 17]
1209 ) 1178 )
1210 { 1179 {
1211 my ($title, $x, $y, @bits) = @$_; 1180 my ($title, $x, $y, @bits) = @$_;
1212 $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]);
1213 1182
1214 for (@bits) { 1183 for (@bits) {
1215 ++$y; 1184 ++$y;
1216 1185
1217 my $mask = $_->[1]; 1186 my $mask = $_->[1];
1218 $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);
1219 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1188 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220 state => $::CFG->{pickup} & $mask, 1189 state => $::CFG->{pickup} & $mask,
1221 on_changed => sub { 1190 on_changed => sub {
1222 my ($box, $value) = @_; 1191 my ($box, $value) = @_;
1223 1192
1224 if ($value) { 1193 if ($value) {
… …
1235 1204
1236 ${$_->[2]} = $checkbox if $_->[2]; 1205 ${$_->[2]} = $checkbox if $_->[2];
1237 } 1206 }
1238 } 1207 }
1239 1208
1240 $table->add (2, 18, new CFClient::UI::ValSlider 1209 $table->add (2, 18, new CFPlus::UI::ValSlider
1241 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1210 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242 template => ">= 99", 1211 template => ">= 99",
1243 to_value => sub { ">= " . 5 * $_[0] }, 1212 to_value => sub { ">= " . 5 * $_[0] },
1244 on_changed => sub { 1213 on_changed => sub {
1245 my ($slider, $value) = @_; 1214 my ($slider, $value) = @_;
… …
1248 $::CFG->{pickup} |= int $value 1217 $::CFG->{pickup} |= int $value
1249 if $value; 1218 if $value;
1250 1; 1219 1;
1251 }); 1220 });
1252 1221
1253 $table->add (3, 18, new CFClient::UI::Button 1222 $table->add (3, 18, new CFPlus::UI::Button
1254 text => "set", 1223 text => "set",
1255 on_activate => sub { 1224 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN; 1226 if defined $::CONN;
1258 0 1227 0
… …
1273 or $a->{type} <=> $b->{type} 1242 or $a->{type} <=> $b->{type}
1274 } @_ }, 1243 } @_ },
1275); 1244);
1276 1245
1277sub inventory_widget { 1246sub inventory_widget {
1278 my $hb = new CFClient::UI::HBox homogeneous => 1; 1247 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279 1248
1280 $hb->add (my $vb1 = new CFClient::UI::VBox); 1249 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1250 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282 1251
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox); 1252 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284 1253
1285 use sort 'stable'; 1254 use sort 'stable';
1286 1255
1287 $hb1->add (new CFClient::UI::Selector 1256 $hb1->add (new CFPlus::UI::Selector
1288 value => $::CFG->{inv_sort}, 1257 value => $::CFG->{inv_sort},
1289 options => [ 1258 options => [
1290 [type => "Type/Name"], 1259 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"], 1260 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"], 1261 [weight => "Weight/Type"],
… …
1294 on_changed => sub { 1263 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1]; 1264 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1265 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 }, 1266 },
1298 ); 1267 );
1299 $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);
1300 #TODO# update to weigh/maxweight 1269 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); 1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302 1271
1303 $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);
1304 $sw1->add ($INV = new CFClient::UI::Inventory); 1273 $sw1->add ($INV = new CFPlus::UI::Inventory);
1305 1274
1306 $hb->add (my $vb2 = new CFClient::UI::VBox); 1275 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1307 1276
1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1309 1278
1310 $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);
1311 $sw2->add ($INVR = new CFClient::UI::Inventory); 1280 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1312 1281
1313 # XXX: Call after $INVR = ... because set_opencont sets the items 1282 # XXX: Call after $INVR = ... because set_opencont sets the items
1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1283 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315 1284
1316 $hb 1285 $hb
1317} 1286}
1318 1287
1319sub toggle_player_page { 1288sub toggle_player_page {
… …
1326 $PL_WINDOW->show; 1295 $PL_WINDOW->show;
1327 } 1296 }
1328} 1297}
1329 1298
1330sub player_window { 1299sub player_window {
1331 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1300 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1332 x => "center", 1301 x => "center",
1333 y => "center", 1302 y => "center",
1334 force_w => $WIDTH * 9/10, 1303 force_w => $WIDTH * 9/10,
1335 force_h => $HEIGHT * 9/10, 1304 force_h => $HEIGHT * 9/10,
1336 title => "Player", 1305 title => "Player",
… …
1338 has_close_button => 1 1307 has_close_button => 1
1339 ; 1308 ;
1340 1309
1341 my $ntb = 1310 my $ntb =
1342 $PL_NOTEBOOK = 1311 $PL_NOTEBOOK =
1343 new CFClient::UI::Notebook expand => 1, debug => 1; 1312 new CFPlus::UI::Notebook expand => 1, debug => 1;
1344 1313
1345 $ntb->add ( 1314 $ntb->add (
1346 "Statistics (F2)" => $STATS_PAGE = stats_window, 1315 "Statistics (F2)" => $STATS_PAGE = stats_window,
1347 "Shows statistics, where all your Stats and Resistances are shown." 1316 "Shows statistics, where all your Stats and Resistances are shown."
1348 ); 1317 );
1349 $ntb->add ( 1318 $ntb->add (
1350 "Skills (F3)" => $SKILL_PAGE = skill_window, 1319 "Skills (F3)" => $SKILL_PAGE = skill_window,
1351 "Shows all your Skills." 1320 "Shows all your Skills."
1352 ); 1321 );
1353 1322
1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1323 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList); 1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1356 $ntb->add ( 1325 $ntb->add (
1357 "Spellbook (F4)" => $spellsw, 1326 "Spellbook (F4)" => $spellsw,
1358 "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."
1359 ); 1328 );
1360 $ntb->add ( 1329 $ntb->add (
… …
1372sub update_bindings { 1341sub update_bindings {
1373 $BIND_UPD_CB->() if $BIND_UPD_CB; 1342 $BIND_UPD_CB->() if $BIND_UPD_CB;
1374} 1343}
1375 1344
1376sub keyboard_setup { 1345sub keyboard_setup {
1377 my $binding_list = new CFClient::UI::VBox; 1346 my $binding_list = new CFPlus::UI::VBox;
1378 1347
1379 my $refresh; 1348 my $refresh;
1380 $refresh = $BIND_UPD_CB = sub { 1349 $refresh = $BIND_UPD_CB = sub {
1381 $binding_list->clear (); 1350 $binding_list->clear ();
1382 1351
1352 return unless $PROFILE;
1353
1383 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1384 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1385 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1386 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1387 1358
1388 my $lbl = join "; ", @$cmds; 1359 my $lbl = join "; ", @$cmds;
1389 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1390 $binding_list->add (my $hb = new CFClient::UI::HBox); 1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1391 $hb->add (new CFClient::UI::Button 1362 $hb->add (new CFPlus::UI::Button
1392 text => "delete", 1363 text => "delete",
1393 tooltip => "Deletes the binding", 1364 tooltip => "Deletes the binding",
1394 on_activate => sub { 1365 on_activate => sub {
1395 $binding_list->remove ($hb); 1366 $binding_list->remove ($hb);
1396 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1367 delete $PROFILE->{bindings}{$mod}{$sym};
1397 0 1368 0
1398 }); 1369 });
1399 1370
1400 $hb->add (new CFClient::UI::Button 1371 $hb->add (new CFPlus::UI::Button
1401 text => "edit", 1372 text => "edit",
1402 tooltip => "Edits the binding", 1373 tooltip => "Edits the binding",
1403 on_activate => sub { 1374 on_activate => sub {
1404 $::BIND_EDITOR->set_binding ( 1375 $::BIND_EDITOR->set_binding (
1405 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1406 sub { 1377 sub {
1407 my ($nmod, $nsym, $ncmds) = @_; 1378 my ($nmod, $nsym, $ncmds) = @_;
1408 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1409 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1410 $refresh->(); 1381 $refresh->();
… …
1418 $::BIND_EDITOR->show; 1389 $::BIND_EDITOR->show;
1419 $SETUP_DIALOG->hide; 1390 $SETUP_DIALOG->hide;
1420 0 1391 0
1421 }); 1392 });
1422 1393
1423 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1394 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1424 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1395 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1425 } 1396 }
1426 } 1397 }
1427 }; 1398 };
1428 1399
1429 my $vb = new CFClient::UI::VBox; 1400 my $vb = new CFPlus::UI::VBox;
1430 $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 );
1431 $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");
1432 $hb->add (new CFClient::UI::CheckBox 1406 $hb->add (new CFPlus::UI::CheckBox
1433 expand => 1, 1407 expand => 1,
1434 state => $CFG->{shift_fire_stop}, 1408 state => $CFG->{shift_fire_stop},
1435 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",
1436 on_changed => sub { 1410 on_changed => sub {
1437 my ($cbox, $value) = @_; 1411 my ($cbox, $value) = @_;
1438 $CFG->{shift_fire_stop} = $value; 1412 $CFG->{shift_fire_stop} = $value;
1439 0 1413 0
1440 }); 1414 });
1441 1415
1442 $vb->add ($binding_list); 1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1443 $vb->add (my $hb = new CFClient::UI::HBox); 1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1444 1420
1445 $hb->add (new CFClient::UI::Button 1421 $hb->add (new CFPlus::UI::Button
1446 text => "record new", 1422 text => "record new",
1447 expand => 1, 1423 expand => 1,
1448 tooltip => "This button opens the binding editor with an empty binding.", 1424 tooltip => "This button opens the binding editor with an empty binding.",
1449 on_activate => sub { 1425 on_activate => sub {
1450 $::BIND_EDITOR->set_binding (undef, undef, [], 1426 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1464 $::BIND_EDITOR->show; 1440 $::BIND_EDITOR->show;
1465 0 1441 0
1466 }, 1442 },
1467 ); 1443 );
1468 1444
1469 $hb->add (new CFClient::UI::Button 1445 $hb->add (new CFPlus::UI::Button
1470 text => "close", 1446 text => "close",
1471 tooltip => "Closes the binding window", 1447 tooltip => "Closes the binding window",
1472 expand => 1, 1448 expand => 1,
1473 on_activate => sub { 1449 on_activate => sub {
1474 $SETUP_DIALOG->hide; 1450 $SETUP_DIALOG->hide;
… …
1479 $refresh->(); 1455 $refresh->();
1480 1456
1481 $vb 1457 $vb
1482} 1458}
1483 1459
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1559}
1560
1561sub help_window { 1460sub help_window {
1562 my $win = new CFClient::UI::FancyFrame 1461 my $win = new CFPlus::UI::Toplevel
1563 x => 'center', 1462 x => 'center',
1564 y => 'center', 1463 y => 'center',
1565 z => 2, 1464 z => 4,
1566 name => 'doc_browser', 1465 name => 'doc_browser',
1567 force_w => int $WIDTH * 7/8, 1466 force_w => int $WIDTH * 7/8,
1568 force_h => int $HEIGHT * 7/8, 1467 force_h => int $HEIGHT * 7/8,
1569 title => "Help Browser", 1468 title => "Help Browser",
1570 has_close_button => 1; 1469 has_close_button => 1;
1571 1470
1572 $win->add (my $vbox = new CFClient::UI::VBox); 1471 $win->add (my $vbox = new CFPlus::UI::VBox);
1573 1472
1574 $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 );
1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1477 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576 expand => 1, fontsize => 0.8, padding_x => 4); 1478 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1577 1479
1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1480 my @history;
1579 $buttons->add (my $combo = new CFClient::UI::Selector 1481 my @future;
1580 value => undef, 1482 my $curnode;
1581 options => [ 1483
1582 [intro => "Introduction"], 1484 my $load_node; $load_node = sub {
1583 [manual => "Main Manual"], 1485 my ($node, $para) = @_;
1584 [skill_help => "Skill Reference"], 1486
1585 [command_help => "Command Reference"], 1487 $buttons->clear;
1586 [dmcommand_help => "DM Commands"], 1488
1587 [COPYING => "License Terms"], 1489 $buttons->add (new CFPlus::UI::Button
1588 [test => "test (do not select)"], #d#TODO 1490 text => "⇤",
1589 ], 1491 tooltip => "back to the starting page",
1590 on_changed => sub { 1492 on_activate => sub {
1591 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 );
1592 1499
1593 if ($pod eq "test") {#d#TODO 1500 if (@history) {
1594 eval { 1501 $buttons->add (new CFPlus::UI::Button
1595 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});
1596 }; 1507 },
1597 warn "$@" if $@; 1508 );
1598 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;
1599 } 1593 }
1600
1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603
1604 #use Data::Dumper; warn Dumper $pom;#d#
1605
1606 $viewer->clear;
1607
1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1611# ]);#d#
1612 1594 ;
1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614 for @$pom;
1615 1595
1616 $viewer->set_offset (0); 1596 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1617 1597
1618 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;
1619 }, 1666 },
1620 on_visibility_change => sub {
1621 my ($self, $visible) = @_;
1622 return unless $visible;
1623 return if $self->{value};
1624 $self->set_value ("intro");
1625 0
1626 },
1627 ); 1667 );
1628 1668
1629 $win 1669 $dialog->show;
1630} 1670}
1631 1671
1632sub sdl_init { 1672sub sdl_init {
1633 CFClient::SDL_Init 1673 CFPlus::SDL_Init
1634 and die "SDL::Init failed!\n"; 1674 and die "SDL::Init failed!\n";
1635} 1675}
1636 1676
1637sub video_init { 1677sub video_init {
1638 sdl_init; 1678 sdl_init;
… …
1643 1683
1644 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1684 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645 $FULLSCREEN = $CFG->{fullscreen}; 1685 $FULLSCREEN = $CFG->{fullscreen};
1646 $FAST = $CFG->{fast}; 1686 $FAST = $CFG->{fast};
1647 1687
1648 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1688 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1649 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1689 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650 1690
1651 $SDL_ACTIVE = 1; 1691 $SDL_ACTIVE = 1;
1652 $LAST_REFRESH = time - 0.01; 1692 $LAST_REFRESH = time - 0.01;
1653 1693
1654 CFClient::OpenGL::init; 1694 CFPlus::OpenGL::init;
1655 1695
1656 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1696 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657 1697
1658 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1698 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659 1699
1660 ############################################################################# 1700 #############################################################################
1661 1701
1662 if ($DEBUG_STATUS) { 1702 if ($DEBUG_STATUS) {
1663 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1703 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664 } else { 1704 } else {
1665 # create the widgets 1705 # create the widgets
1666 1706
1667 $DEBUG_STATUS = new CFClient::UI::Label 1707 $DEBUG_STATUS = new CFPlus::UI::Label
1668 padding => 0, 1708 padding => 0,
1669 z => 100, 1709 z => 100,
1670 force_x => "max", 1710 force_x => "max",
1671 force_y => 0; 1711 force_y => 0;
1672 $DEBUG_STATUS->show; 1712 $DEBUG_STATUS->show;
1673 1713
1674 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1714 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1675 1715
1676 $STATUSBOX = new CFClient::UI::Statusbox; 1716 $STATUSBOX = new CFPlus::UI::Statusbox;
1677 $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]);
1678 1718
1679 (new CFClient::UI::Frame 1719 (new CFPlus::UI::Frame
1680 bg => [0, 0, 0, 0.4], 1720 bg => [0, 0, 0, 0.4],
1681 force_x => 0, 1721 force_x => 0,
1682 force_y => "max", 1722 force_y => "max",
1683 child => $STATUSBOX, 1723 child => $STATUSBOX,
1684 )->show; 1724 )->show;
1685 1725
1686 CFClient::UI::FancyFrame->new ( 1726 CFPlus::UI::Toplevel->new (
1687 title => "Map", 1727 title => "Map",
1688 name => "mapmap", 1728 name => "mapmap",
1689 x => 0, 1729 x => 0,
1690 y => $FONTSIZE + 8, 1730 y => $FONTSIZE + 8,
1691 border_bg => [1, 1, 1, 192/255], 1731 border_bg => [1, 1, 1, 192/255],
1692 bg => [1, 1, 1, 0], 1732 bg => [1, 1, 1, 0],
1693 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1733 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1694 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.",
1695 ), 1735 ),
1696 )->show; 1736 )->show;
1697 1737
1698 $MAPWIDGET = new CFClient::MapWidget; 1738 $MAPWIDGET = new CFPlus::MapWidget;
1699 $MAPWIDGET->connect (activate_console => sub { 1739 $MAPWIDGET->connect (activate_console => sub {
1700 my ($mapwidget, $preset) = @_; 1740 my ($mapwidget, $preset) = @_;
1701 1741
1702 if ($CONSOLE) { 1742 if ($CONSOLE) {
1703 $CONSOLE->{input}->{auto_activated} = 1; 1743 $CONSOLE->{input}->{auto_activated} = 1;
… …
1709 } 1749 }
1710 }); 1750 });
1711 $MAPWIDGET->show; 1751 $MAPWIDGET->show;
1712 $MAPWIDGET->grab_focus; 1752 $MAPWIDGET->grab_focus;
1713 1753
1714 $LOGVIEW = new CFClient::UI::TextScroller 1754 $LOGVIEW = new CFPlus::UI::TextScroller
1715 expand => 1, 1755 expand => 1,
1716 font => $FONT_FIXED, 1756 font => $FONT_FIXED,
1717 fontsize => $::CFG->{log_fontsize}, 1757 fontsize => $::CFG->{log_fontsize},
1718 indent => -4, 1758 indent => -4,
1719 can_hover => 1, 1759 can_hover => 1,
1720 can_events => 1, 1760 can_events => 1,
1721 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.",
1722 ; 1762 ;
1723 1763
1724 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1725 title => "Setup", 1765 title => "Setup",
1726 name => "setup_dialog", 1766 name => "setup_dialog",
1727 x => 'center', 1767 x => 'center',
1728 y => 'center', 1768 y => 'center',
1729 z => 2, 1769 z => 2,
… …
1732 has_close_button => 1, 1772 has_close_button => 1,
1733 ; 1773 ;
1734 1774
1735 $METASERVER = metaserver_dialog; 1775 $METASERVER = metaserver_dialog;
1736 1776
1737 $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,
1738 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1778 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739 1779
1740 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1780 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1741 "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.");
1742 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1782 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1743 "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.");
… …
1753 . "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 "
1754 . "binding editor closes"); 1794 . "binding editor closes");
1755 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1795 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1756 "Some debuggin' options. Do not ask."); 1796 "Some debuggin' options. Do not ask.");
1757 1797
1758 $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
1759 1799
1760 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1761 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.");
1762 1802
1763 $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,
1764 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.");
1765 1805
1766 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
1767 1807
1768 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1808 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1769 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.");
1770 1810
1771 $BUTTONBAR->add (new CFClient::UI::Button 1811 $BUTTONBAR->add (new CFPlus::UI::Button
1772 text => "Save Config", 1812 text => "Save Config",
1773 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.",
1774 on_activate => sub { 1814 on_activate => sub {
1775 $::CFG->{layout} = CFClient::UI::get_layout; 1815 $::CFG->{layout} = CFPlus::UI::get_layout;
1776 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1816 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777 status "Configuration Saved"; 1817 status "Configuration Saved";
1778 0 1818 0
1779 }, 1819 },
1780 ); 1820 );
1781 1821
1782 $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,
1783 tooltip => "View Documentation"); 1823 tooltip => "View Documentation");
1784 1824
1785 $BUTTONBAR->add (new CFClient::UI::Button 1825 $BUTTONBAR->add (new CFPlus::UI::Button
1786 text => "Quit", 1826 text => "Quit",
1787 tooltip => "Terminates the program", 1827 tooltip => "Terminates the program",
1788 on_activate => sub { 1828 on_activate => sub {
1789 if ($CONN) { 1829 if ($CONN) {
1790 open_quit_dialog; 1830 open_quit_dialog;
… …
1801 1841
1802 $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]);
1803} 1843}
1804 1844
1805sub video_shutdown { 1845sub video_shutdown {
1806 CFClient::OpenGL::shutdown; 1846 CFPlus::OpenGL::shutdown;
1807 1847
1808 undef $SDL_ACTIVE; 1848 undef $SDL_ACTIVE;
1809} 1849}
1810 1850
1811my @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#
… …
1819 1859
1820sub audio_music_finished { 1860sub audio_music_finished {
1821 return unless $CFG->{bgm_enable}; 1861 return unless $CFG->{bgm_enable};
1822 1862
1823 # TODO: hack, do play loop and mood music 1863 # TODO: hack, do play loop and mood music
1824 $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]";
1825 $bgmusic->play (0); 1865 $bgmusic->play (0);
1826 1866
1827 push @bgmusic, shift @bgmusic; 1867 push @bgmusic, shift @bgmusic;
1828} 1868}
1829 1869
1830sub audio_init { 1870sub audio_init {
1831 if ($CFG->{audio_enable}) { 1871 if ($CFG->{audio_enable}) {
1832 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1872 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1833 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1873 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1834 1874
1835 unless ($SDL_MIXER) { 1875 unless ($SDL_MIXER) {
1836 status "Unable to open sound device: there will be no sound"; 1876 status "Unable to open sound device: there will be no sound";
1837 return; 1877 return;
1838 } 1878 }
1839 1879
1840 CFClient::Mix_AllocateChannels 8; 1880 CFPlus::Mix_AllocateChannels 8;
1841 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1842 1882
1843 audio_music_finished; 1883 audio_music_finished;
1844 1884
1845 while (<$fh>) { 1885 while (<$fh>) {
1846 next if /^\s*#/; 1886 next if /^\s*#/;
… …
1849 my ($file, $volume, $event) = split /\s+/, $_, 3; 1889 my ($file, $volume, $event) = split /\s+/, $_, 3;
1850 1890
1851 push @SOUNDS, "$volume,$file"; 1891 push @SOUNDS, "$volume,$file";
1852 1892
1853 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1893 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854 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";
1855 $chunk->volume ($volume * 128 / 100); 1895 $chunk->volume ($volume * 128 / 100);
1856 $chunk 1896 $chunk
1857 }; 1897 };
1858 } 1898 }
1859 } else { 1899 } else {
… …
1861 } 1901 }
1862 } 1902 }
1863} 1903}
1864 1904
1865sub audio_shutdown { 1905sub audio_shutdown {
1866 CFClient::Mix_CloseAudio if $SDL_MIXER; 1906 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1867 undef $SDL_MIXER; 1907 undef $SDL_MIXER;
1868 @SOUNDS = (); 1908 @SOUNDS = ();
1869 %AUDIO_CHUNKS = (); 1909 %AUDIO_CHUNKS = ();
1870} 1910}
1871 1911
… …
1878 1918
1879sub force_refresh { 1919sub force_refresh {
1880 $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;
1881 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1921 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1882 1922
1883 $CFClient::UI::ROOT->draw; 1923 $CFPlus::UI::ROOT->draw;
1884 1924
1885 $WANT_REFRESH = 0; 1925 $WANT_REFRESH = 0;
1886 $CAN_REFRESH = 0; 1926 $CAN_REFRESH = 0;
1887 $LAST_REFRESH = $NOW; 1927 $LAST_REFRESH = $NOW;
1888 1928
1889 CFClient::SDL_GL_SwapBuffers; 1929 CFPlus::SDL_GL_SwapBuffers;
1890} 1930}
1891 1931
1892my $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 {
1893 $NOW = time; 1933 $NOW = time;
1894 1934
1895 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896 for CFClient::SDL_PollEvent; 1936 for CFPlus::SDL_PollEvent;
1897 1937
1898 if (%animate_object) { 1938 if (%animate_object) {
1899 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900 $WANT_REFRESH++; 1940 $WANT_REFRESH++;
1901 } 1941 }
… …
1925 $CONN->face_prefetch 1965 $CONN->face_prefetch
1926 if $CONN; 1966 if $CONN;
1927}); 1967});
1928 1968
1929%SDL_CB = ( 1969%SDL_CB = (
1930 CFClient::SDL_QUIT => sub { 1970 CFPlus::SDL_QUIT => sub {
1931 Event::unloop -1; 1971 Event::unloop -1;
1932 }, 1972 },
1933 CFClient::SDL_VIDEORESIZE => sub { 1973 CFPlus::SDL_VIDEORESIZE => sub {
1934 }, 1974 },
1935 CFClient::SDL_VIDEOEXPOSE => sub { 1975 CFPlus::SDL_VIDEOEXPOSE => sub {
1936 CFClient::UI::full_refresh; 1976 CFPlus::UI::full_refresh;
1937 }, 1977 },
1938 CFClient::SDL_ACTIVEEVENT => sub { 1978 CFPlus::SDL_ACTIVEEVENT => sub {
1939# 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#
1940 }, 1980 },
1941 CFClient::SDL_KEYDOWN => sub { 1981 CFPlus::SDL_KEYDOWN => sub {
1942 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1982 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943 # alt-enter 1983 # alt-enter
1944 $FULLSCREEN_ENABLE->toggle; 1984 $FULLSCREEN_ENABLE->toggle;
1945 video_shutdown; 1985 video_shutdown;
1946 video_init; 1986 video_init;
1947 } else { 1987 } else {
1948 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1988 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949 } 1989 }
1950 }, 1990 },
1951 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1991 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1992 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1993 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1994 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955 CFClient::SDL_USEREVENT => sub { 1995 CFPlus::SDL_USEREVENT => sub {
1956 if ($_[0]{code} == 1) { 1996 if ($_[0]{code} == 1) {
1957 audio_channel_finished $_[0]{data1}; 1997 audio_channel_finished $_[0]{data1};
1958 } elsif ($_[0]{code} == 0) { 1998 } elsif ($_[0]{code} == 0) {
1959 audio_music_finished; 1999 audio_music_finished;
1960 } 2000 }
… …
1964############################################################################# 2004#############################################################################
1965 2005
1966$SIG{INT} = $SIG{TERM} = sub { exit }; 2006$SIG{INT} = $SIG{TERM} = sub { exit };
1967 2007
1968{ 2008{
1969 local $SIG{__DIE__} = sub {
1970 return unless defined $^S && !$^S;
1971 Carp::confess $_[0];#d#TODO: remove when stable
1972 CFClient::fatal $_[0];
1973 };
1974
1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2009 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1976 CFClient::UI::set_layout ($::CFG->{layout}); 2010 CFPlus::UI::set_layout ($::CFG->{layout});
1977 2011
1978 my %DEF_CFG = ( 2012 my %DEF_CFG = (
1979 sdl_mode => 0, 2013 sdl_mode => 0,
1980 width => 640, 2014 width => 640,
1981 height => 480, 2015 height => 480,
… …
1999 output_sync => 1, 2033 output_sync => 1,
2000 output_count => 1, 2034 output_count => 1,
2001 pickup => 0, 2035 pickup => 0,
2002 inv_sort => "mtime", 2036 inv_sort => "mtime",
2003 default => "profile", # default profile 2037 default => "profile", # default profile
2038 show_tips => 1,
2004 ); 2039 );
2005 2040
2006 while (my ($k, $v) = each %DEF_CFG) { 2041 while (my ($k, $v) = each %DEF_CFG) {
2007 $CFG->{$k} = $v unless exists $CFG->{$k}; 2042 $CFG->{$k} = $v unless exists $CFG->{$k};
2008 } 2043 }
… …
2011 2046
2012 sdl_init; 2047 sdl_init;
2013 2048
2014 @SDL_MODES = reverse 2049 @SDL_MODES = reverse
2015 grep $_->[0] >= 640 && $_->[1] >= 480, 2050 grep $_->[0] >= 640 && $_->[1] >= 480,
2016 CFClient::SDL_ListModes; 2051 CFPlus::SDL_ListModes;
2017 2052
2018 @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)";
2019 2054
2020 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2055 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021 2056
2022 { 2057 {
2023 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2058 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024 DejaVuSans.ttf 2059 DejaVuSans.ttf
2025 DejaVuSansMono.ttf 2060 DejaVuSansMono.ttf
2026 DejaVuSans-Bold.ttf 2061 DejaVuSans-Bold.ttf
2027 DejaVuSansMono-Bold.ttf 2062 DejaVuSansMono-Bold.ttf
2028 DejaVuSans-Oblique.ttf 2063 DejaVuSans-Oblique.ttf
2029 DejaVuSansMono-Oblique.ttf 2064 DejaVuSansMono-Oblique.ttf
2030 DejaVuSans-BoldOblique.ttf 2065 DejaVuSans-BoldOblique.ttf
2031 DejaVuSansMono-BoldOblique.ttf 2066 DejaVuSansMono-BoldOblique.ttf
2032 ); 2067 );
2033 2068
2034 CFClient::add_font $_ for @fonts; 2069 CFPlus::add_font $_ for @fonts;
2035 2070
2036 CFClient::pango_init; 2071 CFPlus::pango_init;
2037 2072
2038 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2073 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2074 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040 2075
2041 $FONT_PROP->make_default; 2076 $FONT_PROP->make_default;
2042 } 2077 }
2043 2078
2044# compare mono (ft) vs. rgba (cairo) 2079# compare mono (ft) vs. rgba (cairo)
2045# ft - 1.8s, cairo 3s, even in alpha-only mode 2080# ft - 1.8s, cairo 3s, even in alpha-only mode
2046# for my $rgba (0..1) { 2081# for my $rgba (0..1) {
2047# my $t1 = Time::HiRes::time; 2082# my $t1 = Time::HiRes::time;
2048# for (1..1000) { 2083# for (1..1000) {
2049# my $layout = CFClient::Layout->new ($rgba); 2084# my $layout = CFPlus::Layout->new ($rgba);
2050# $layout->set_text ("hallo" x 100); 2085# $layout->set_text ("hallo" x 100);
2051# $layout->render; 2086# $layout->render;
2052# } 2087# }
2053# my $t2 = Time::HiRes::time; 2088# my $t2 = Time::HiRes::time;
2054# warn $t2-$t1; 2089# warn $t2-$t1;
… …
2056 2091
2057 video_init; 2092 video_init;
2058 audio_init; 2093 audio_init;
2059} 2094}
2060 2095
2096show_tip_of_the_day if $CFG->{show_tips};
2097
2061Event::loop; 2098Event::loop;
2062#CFClient::SDL_Quit; 2099#CFPlus::SDL_Quit;
2063#CFClient::_exit 0; 2100#CFPlus::_exit 0;
2064 2101
2065END { CFClient::SDL_Quit } 2102END { CFPlus::SDL_Quit }
2066 2103
2067=head1 NAME 2104=head1 NAME
2068 2105
2069cfplus - A Crossfire+ and Crossfire game client 2106cfplus - A Crossfire+ and Crossfire game client
2070 2107

Diff Legend

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