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.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.119 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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