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.91 by root, Tue Jul 11 13:51:38 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 $hb->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 = (
725 slow => ["Slow",
700 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 726 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
727 holyw => ["Holy Word",
701 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 728 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
729 conf => ["Confusion",
702 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 730 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
731 fire => ["Fire",
703 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 732 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
733 depl => ["Depletion",
704 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 734 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
735 magic => ["Magic",
705 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 736 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
737 drain => ["Draining",
706 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 738 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
739 acid => ["Acid",
707 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 740 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
741 pois => ["Poison",
708 pois => "<b>Poison</b> (resistance to getting poisoned)", 742 "<b>Poison</b> (resistance to getting poisoned)"],
743 para => ["Paralysation",
709 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 744 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
745 deat => ["Death",
710 deat => "<b>Death</b> (resistance against death spells)", 746 "<b>Death</b> (resistance against death spells)"],
747 phys => ["Physical",
711 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)", 748 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
749 blind => ["Blind",
712 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 750 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
751 fear => ["Fear",
713 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 752 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
753 tund => ["Turn undead",
714 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 754 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
755 elec => ["Electricity",
715 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 756 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
757 cold => ["Cold",
716 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 758 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
759 ghit => ["Ghost hit",
717 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 760 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
718 ); 761 );
719 for (qw/slow holyw conf fire depl magic 762 for (qw/slow holyw conf fire depl magic
720 drain acid pois para deat phys 763 drain acid pois para deat phys
721 blind fear tund elec cold ghit/) 764 blind fear tund elec cold ghit/)
722 { 765 {
723 $tbl2->add ($col, $row, 766 $tbl2->add ($col, $row,
724 $STATWIDS->{"res_$_"} = 767 $STATWIDS->{"res_$_"} =
725 new CFClient::UI::Label 768 new CFPlus::UI::Label
726 font => $FONT_FIXED, 769 font => $FONT_FIXED,
727 template => "-100%", 770 template => "-100%",
728 align => +1, 771 align => +1,
729 valign => 0, 772 valign => 0,
730 can_events => 1, 773 can_events => 1,
731 can_hover => 1, 774 can_hover => 1,
732 tooltip => $resist_names{$_}, 775 tooltip => $resist_names{$_}->[1],
733 ); 776 );
734 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 777 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
735 font => $FONT_FIXED, 778 font => $FONT_FIXED,
736 can_hover => 1, 779 can_hover => 1,
737 can_events => 1, 780 can_events => 1,
738 path => "ui/resist/resist_$_.png", 781 path => "ui/resist/resist_$_.png",
739 tooltip => $resist_names{$_}, 782 tooltip => $resist_names{$_}->[1],
783 );
784 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
785 text => $resist_names{$_}->[0],
786 font => $FONT_FIXED,
787 can_hover => 1,
788 can_events => 1,
789 tooltip => $resist_names{$_}->[1],
740 ); 790 );
741 791
742 $row++; 792 $row++;
743 if ($row % 6 == 0) { 793 if ($row % 6 == 0) {
744 $col += 2; 794 $col += 3;
745 $row = 0; 795 $row = 0;
746 } 796 }
747 } 797 }
748 798
749 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
750 $STATWIDS->{"_skill_tbl"} = $tbl3;
751
752 update_stats_window ({}); 799 #update_stats_window ({});
753 800
754 $vb 801 $r
802}
803
804sub skill_window {
805 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
806 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
807 $sw
755} 808}
756 809
757sub formsep($) { 810sub formsep($) {
758 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 811 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
759} 812}
760 813
761sub update_stats_window {
762 my ($stats) = @_;
763
764 # I love text protocols...
765
766 my $hp = $stats->{+CS_STAT_HP} * 1;
767 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
768 my $sp = $stats->{+CS_STAT_SP} * 1;
769 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
770 my $fo = $stats->{+CS_STAT_FOOD} * 1;
771 my $fo_m = 999;
772 my $gr = $stats->{+CS_STAT_GRACE} * 1;
773 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
774
775 $GAUGES->{hp} ->set_value ($hp, $hp_m);
776 $GAUGES->{mana} ->set_value ($sp, $sp_m);
777 $GAUGES->{food} ->set_value ($fo, $fo_m);
778 $GAUGES->{grace} ->set_value ($gr, $gr_m);
779 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
780 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
781 my $rng = $stats->{+CS_STAT_RANGE};
782 $rng =~ s/^Range: //; # thank you so much dear server
783 $GAUGES->{range} ->set_text ("Rng: " . $rng);
784 my $title = $stats->{+CS_STAT_TITLE};
785 $title =~ s/^Player: //;
786 $STATWIDS->{title} ->set_text ("Title: " . $title);
787
788 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
789 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
790 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
791 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
792 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
793 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
794 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
795 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
796 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
797 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
798 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
799 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
800 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
801
802 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
803
804 my %tbl = (
805 phys => CS_STAT_RES_PHYS,
806 magic => CS_STAT_RES_MAG,
807 fire => CS_STAT_RES_FIRE,
808 elec => CS_STAT_RES_ELEC,
809 cold => CS_STAT_RES_COLD,
810 conf => CS_STAT_RES_CONF,
811 acid => CS_STAT_RES_ACID,
812 drain => CS_STAT_RES_DRAIN,
813 ghit => CS_STAT_RES_GHOSTHIT,
814 pois => CS_STAT_RES_POISON,
815 slow => CS_STAT_RES_SLOW,
816 para => CS_STAT_RES_PARA,
817 tund => CS_STAT_TURN_UNDEAD,
818 fear => CS_STAT_RES_FEAR,
819 depl => CS_STAT_RES_DEPLETE,
820 deat => CS_STAT_RES_DEATH,
821 holyw => CS_STAT_RES_HOLYWORD,
822 blind => CS_STAT_RES_BLIND,
823 );
824
825 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
826 my $sktbl = $STATWIDS->{_skill_tbl};
827 $sktbl->clear;
828
829 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
830 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
831 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
832
833 my @skills;
834
835 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
836 push @skills, [$i, $::CONN->{skill_info}{$i}];
837 }
838
839 my $y = 1;
840 for (sort { $a->[1] cmp $b->[1] } @skills) {
841 my ($idx, $name) = @$_;
842
843 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
844 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
846 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
847 }
848 }
849
850 $STATWIDS->{_skill_tbl_init} = 1;
851 }
852
853 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
854 if (exists $stats->{$i}) {
855 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
856 if $STATWIDS->{"sk_xp_$i"};
857 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
858 if $STATWIDS->{"sk_lvl_$i"};
859 }
860 }
861
862 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
863 for keys %tbl;
864}
865
866my $METASERVER_ATIME; 814my $METASERVER_ATIME;
867 815
868sub update_metaserver { 816sub update_metaserver {
869 my ($metaserver_dialog) = @_; 817 my ($metaserver_dialog) = @_;
870 818
… …
874 return if $METASERVER_ATIME > time; 822 return if $METASERVER_ATIME > time;
875 $METASERVER_ATIME = time + 60; 823 $METASERVER_ATIME = time + 60;
876 824
877 my $table = $METASERVER->{table}; 825 my $table = $METASERVER->{table};
878 $table->clear; 826 $table->clear;
879 $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...");
880 828
881 my $buf; 829 my $buf;
882 830
883 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 831 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
884 832
… …
907 "The time this server has been running without being restarted.", 855 "The time this server has been running without being restarted.",
908 "The server software version - a '+' indicates a Crossfire+ server.", 856 "The server software version - a '+' indicates a Crossfire+ server.",
909 "Short information about this server provided by its admins.", 857 "Short information about this server provided by its admins.",
910 ); 858 );
911 my @col = qw(#Users Host Uptime Version Description); 859 my @col = qw(#Users Host Uptime Version Description);
912 $table->add ($_, 0, new CFClient::UI::Label 860 $table->add ($_, 0, new CFPlus::UI::Label
913 can_hover => 1, can_events => 1, 861 can_hover => 1, can_events => 1,
914 align => 0, fg => [1, 1, 0], 862 align => 0, fg => [1, 1, 0],
915 text => $col[$_], tooltip => $tip[$_]) 863 text => $col[$_], tooltip => $tip[$_])
916 for 0 .. $#col; 864 for 0 .. $#col;
917 865
… …
938 886
939 $m = [$users, $host, $uptime, $version, $desc]; 887 $m = [$users, $host, $uptime, $version, $desc];
940 888
941 $y++; 889 $y++;
942 890
943 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 891 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
944 (new CFClient::UI::Button 892 (new CFPlus::UI::Button
945 text => "Use", 893 text => "Use",
946 tooltip => "Put this server into the <b>Host:Port</b> field", 894 tooltip => "Put this server into the <b>Host:Port</b> field",
947 on_activate => sub { 895 on_activate => sub {
948 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 896 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
949 $METASERVER->hide; 897 $METASERVER->hide;
950 0 898 0
951 }, 899 },
952 ), 900 ),
953 (new CFClient::UI::Empty expand => 1), 901 (new CFPlus::UI::Empty expand => 1),
954 ]); 902 ]);
955 903
956 $table->add ($_, $y, new CFClient::UI::Label 904 $table->add ($_, $y, new CFPlus::UI::Label
957 ellipsise => 0, 905 ellipsise => 0,
958 align => $align[$_], 906 align => $align[$_],
959 text => $m->[$_], 907 text => $m->[$_],
960 tooltip => $tip[$_], 908 tooltip => $tip[$_],
961 can_hover => 1, 909 can_hover => 1,
… …
966 } 914 }
967 }); 915 });
968} 916}
969 917
970sub metaserver_dialog { 918sub metaserver_dialog {
971 my $vbox = new CFClient::UI::VBox; 919 my $vbox = new CFPlus::UI::VBox;
972 my $table = new CFClient::UI::Table; 920 my $table = new CFPlus::UI::Table;
973 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 921 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
974 922
975 my $dialog = new CFClient::UI::FancyFrame 923 my $dialog = new CFPlus::UI::Toplevel
976 title => "Server List", 924 title => "Server List",
977 name => 'metaserver_dialog', 925 name => 'metaserver_dialog',
978 x => 'center', 926 x => 'center',
979 y => 'center', 927 y => 'center',
980 z => 3, 928 z => 3,
… …
990 938
991 $dialog 939 $dialog
992} 940}
993 941
994sub server_setup { 942sub server_setup {
995 my $vbox = new CFClient::UI::VBox; 943 my $vbox = new CFPlus::UI::VBox;
996 944
945 $vbox->add (new CFPlus::UI::FancyFrame
946 label => "Connection Settings",
997 $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 );
998 $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");
999 950
1000 { 951 {
1001 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 952 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
1002 953
1003 $vbox->add ( 954 $vbox->add (
1004 $HOST_ENTRY = new CFClient::UI::Entry 955 $HOST_ENTRY = new CFPlus::UI::Entry
1005 expand => 1, 956 expand => 1,
1006 text => $CFG->{profile}{default}{host}, 957 text => $CFG->{profile}{default}{host},
1007 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",
1008 on_changed => sub { 959 on_changed => sub {
1009 my ($self, $value) = @_; 960 my ($self, $value) = @_;
1010 $CFG->{profile}{default}{host} = $value; 961 $CFG->{profile}{default}{host} = $value;
1011 0 962 0
1012 } 963 }
1013 ); 964 );
1014 965
1015 $vbox->add (new CFClient::UI::Button 966 $vbox->add (new CFPlus::UI::Button
1016 expand => 1, 967 expand => 1,
1017 text => "Server List", 968 text => "Server List",
1018 other => $METASERVER, 969 other => $METASERVER,
1019 tooltip => "Show a list of available crossfire servers", 970 tooltip => "Show a list of available crossfire servers",
1020 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 971 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1021 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 972 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1022 ); 973 );
1023 } 974 }
1024 975
1025 $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");
1026 $table->add (1, 4, new CFClient::UI::Entry 977 $table->add (1, 4, new CFPlus::UI::Entry
1027 text => $CFG->{profile}{default}{user}, 978 text => $CFG->{profile}{default}{user},
1028 tooltip => "The name of your character on the server", 979 tooltip => "The name of your character on the server",
1029 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1030 ); 981 );
1031 982
1032 $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");
1033 $table->add (1, 5, new CFClient::UI::Entry 984 $table->add (1, 5, new CFPlus::UI::Entry
1034 text => $CFG->{profile}{default}{password}, 985 text => $CFG->{profile}{default}{password},
1035 hidden => 1, 986 hidden => 1,
1036 tooltip => "The password for your character", 987 tooltip => "The password for your character",
1037 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 988 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1038 ); 989 );
1039 990
1040 $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");
1041 $table->add (1, 7, new CFClient::UI::Slider 992 $table->add (1, 7, new CFPlus::UI::Slider
1042 force_w => 100, 993 force_w => 100,
1043 range => [$CFG->{mapsize}, 10, 100, 0, 1], 994 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1044 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. "
1045 . "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, "
1046 . "but you also increase bandwidth requirements and latency. " 997 . "but you also increase bandwidth requirements and latency. "
1047 . "This option is only used once at log-in.", 998 . "This option is only used once at log-in.",
1048 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 },
1049 ); 1000 );
1050 1001
1051 $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");
1052 $table->add (1, 8, new CFClient::UI::CheckBox 1003 $table->add (1, 8, new CFPlus::UI::CheckBox
1053 state => $CFG->{face_prefetch}, 1004 state => $CFG->{face_prefetch},
1054 tooltip => "<b>Background Image Prefetch</b>\n\n" 1005 tooltip => "<b>Background Image Prefetch</b>\n\n"
1055 . "If enabled, the client automatically pre-fetches images from the server. " 1006 . "If enabled, the client automatically pre-fetches images from the server. "
1056 . "This might increase or create lag, but increases the chances " 1007 . "This might increase or create lag, but increases the chances "
1057 . "of faces being ready for display when you encounter them. " 1008 . "of faces being ready for display when you encounter them. "
… …
1059 . "so only set it if you really need to prefetch images. " 1010 . "so only set it if you really need to prefetch images. "
1060 . "This option can be set and unset any time.", 1011 . "This option can be set and unset any time.",
1061 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1012 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1062 ); 1013 );
1063 1014
1064 $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");
1065 $table->add (1, 9, new CFClient::UI::Entry 1016 $table->add (1, 9, new CFPlus::UI::Entry
1066 text => $CFG->{output_count}, 1017 text => $CFG->{output_count},
1067 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.",
1068 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1019 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1069 ); 1020 );
1070 1021
1071 $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");
1072 $table->add (1, 10, new CFClient::UI::Entry 1023 $table->add (1, 10, new CFPlus::UI::Entry
1073 text => $CFG->{output_sync}, 1024 text => $CFG->{output_sync},
1074 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.",
1075 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1026 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1076 ); 1027 );
1077 1028
1078 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1029 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1079 expand => 1, 1030 expand => 1,
1080 align => 0, 1031 align => 0,
1081 text => "Login", 1032 text => "Login",
1082 on_activate => sub { 1033 on_activate => sub {
1083 $CONN ? stop_game 1034 $CONN ? stop_game
1084 : start_game; 1035 : start_game;
1085 0 1036 0
1086 }, 1037 },
1087 ); 1038 );
1088 1039
1089 $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");
1090 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1041 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1091 text => $CFG->{say_command}, 1042 text => $CFG->{say_command},
1092 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. "
1093 . "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. "
1094 . "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.",
1095 on_changed => sub { 1046 on_changed => sub {
1096 my ($self, $value) = @_; 1047 my ($self, $value) = @_;
1097 $CFG->{say_command} = $value; 1048 $CFG->{say_command} = $value;
1098 0 1049 0
1099 } 1050 }
1100 ); 1051 );
1101 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
1102 $vbox->add (new CFClient::UI::Label 1064 $vbox->add (new CFPlus::UI::FancyFrame
1103 text => "Server Info", 1065 label => "Server Info",
1104 fontsize => 1.2,
1105 padding_y => 8,
1106 fg => [1, 1, 0, 1],
1107 );
1108
1109 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1066 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1067 );
1110 1068
1111 $vbox 1069 $vbox
1112} 1070}
1113 1071
1114sub message_window { 1072sub message_window {
1115 my $window = new CFClient::UI::FancyFrame 1073 my $window = new CFPlus::UI::Toplevel
1116 name => "message_window", 1074 name => "message_window",
1117 title => "Messages", 1075 title => "Messages",
1118 border_bg => [1, 1, 1, 1], 1076 border_bg => [1, 1, 1, 1],
1119 bg => [0, 0, 0, 0.75],
1120 x => "max", 1077 x => "max",
1121 y => 0, 1078 y => 0,
1122 force_w => $::WIDTH * 0.4, 1079 force_w => $::WIDTH * 0.4,
1123 force_h => $::HEIGHT * 0.5, 1080 force_h => $::HEIGHT * 0.5,
1124 child => (my $vbox = new CFClient::UI::VBox), 1081 child => (my $vbox = new CFPlus::UI::VBox),
1125 has_close_button => 1; 1082 has_close_button => 1;
1126 1083
1127 $vbox->add ($LOGVIEW); 1084 $vbox->add ($LOGVIEW);
1128 1085
1129 $vbox->add (my $input = new CFClient::UI::Entry 1086 $vbox->add (my $input = new CFPlus::UI::Entry
1130 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> "
1131 . "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>...). "
1132 . "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). "
1133 . "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.",
1134 on_focus_in => sub { 1091 on_focus_in => sub {
… …
1173 }; 1130 };
1174 1131
1175 $window 1132 $window
1176} 1133}
1177 1134
1178sub open_quit_dialog {
1179 unless ($QUIT_DIALOG) {
1180 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1181 x => "center",
1182 y => "center",
1183 z => 50,
1184 title => "Really Quit?",
1185 ;
1186
1187 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1188
1189 $vb->add (new CFClient::UI::Label
1190 text => "You should find a savebed and apply it first!",
1191 max_w => $WIDTH * 0.25,
1192 ellipsize => 0,
1193 );
1194 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1195 $hb->add (new CFClient::UI::Button
1196 text => "Ok",
1197 expand => 1,
1198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1199 );
1200 $hb->add (new CFClient::UI::Button
1201 text => "Quit anyway",
1202 expand => 1,
1203 on_activate => sub { exit },
1204 );
1205 }
1206
1207 $QUIT_DIALOG->show;
1208}
1209
1210sub autopickup_setup { 1135sub autopickup_setup {
1211 my $table = new CFClient::UI::Table; 1136 my $table = new CFPlus::UI::Table;
1212 1137
1213 for ( 1138 for (
1214 ["General", 0, 0, 1139 ["General", 0, 0,
1215 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1140 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1216 ["Inhibit autopickup" => PICKUP_INHIBIT], 1141 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1250 ], 1175 ],
1251 ["Weight/Value ratio", 2, 17] 1176 ["Weight/Value ratio", 2, 17]
1252 ) 1177 )
1253 { 1178 {
1254 my ($title, $x, $y, @bits) = @$_; 1179 my ($title, $x, $y, @bits) = @$_;
1255 $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]);
1256 1181
1257 for (@bits) { 1182 for (@bits) {
1258 ++$y; 1183 ++$y;
1259 1184
1260 my $mask = $_->[1]; 1185 my $mask = $_->[1];
1261 $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);
1262 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1187 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1263 state => $::CFG->{pickup} & $mask, 1188 state => $::CFG->{pickup} & $mask,
1264 on_changed => sub { 1189 on_changed => sub {
1265 my ($box, $value) = @_; 1190 my ($box, $value) = @_;
1266 1191
1267 if ($value) { 1192 if ($value) {
… …
1278 1203
1279 ${$_->[2]} = $checkbox if $_->[2]; 1204 ${$_->[2]} = $checkbox if $_->[2];
1280 } 1205 }
1281 } 1206 }
1282 1207
1283 $table->add (2, 18, new CFClient::UI::ValSlider 1208 $table->add (2, 18, new CFPlus::UI::ValSlider
1284 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1209 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1285 template => ">= 99", 1210 template => ">= 99",
1286 to_value => sub { ">= " . 5 * $_[0] }, 1211 to_value => sub { ">= " . 5 * $_[0] },
1287 on_changed => sub { 1212 on_changed => sub {
1288 my ($slider, $value) = @_; 1213 my ($slider, $value) = @_;
… …
1291 $::CFG->{pickup} |= int $value 1216 $::CFG->{pickup} |= int $value
1292 if $value; 1217 if $value;
1293 1; 1218 1;
1294 }); 1219 });
1295 1220
1296 $table->add (3, 18, new CFClient::UI::Button 1221 $table->add (3, 18, new CFPlus::UI::Button
1297 text => "set", 1222 text => "set",
1298 on_activate => sub { 1223 on_activate => sub {
1299 $::CONN->send_command ("pickup $::CFG->{pickup}") 1224 $::CONN->send_command ("pickup $::CFG->{pickup}")
1300 if defined $::CONN; 1225 if defined $::CONN;
1301 0 1226 0
1302 }); 1227 });
1303 1228
1304 $table 1229 $table
1305} 1230}
1306 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
1307sub inventory_widget { 1245sub inventory_widget {
1308 my $hb = new CFClient::UI::HBox homogeneous => 1; 1246 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1309 1247
1310 $hb->add (my $vb1 = new CFClient::UI::VBox); 1248 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1311 $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);
1312 $vb1->add ($INV = new CFClient::UI::Inventory); 1272 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 1273
1314 $hb->add (my $vb2 = new CFClient::UI::VBox); 1274 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1315 1275
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1276 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317 1277
1278 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1318 $vb2->add ($INVR = new CFClient::UI::Inventory); 1279 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1319 1280
1320 # XXX: Call after $INVR = ... because set_opencont sets the items 1281 # XXX: Call after $INVR = ... because set_opencont sets the items
1321 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1282 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1322 1283
1323 $hb 1284 $hb
1324} 1285}
1325 1286
1326sub toggle_player_page { 1287sub toggle_player_page {
… …
1333 $PL_WINDOW->show; 1294 $PL_WINDOW->show;
1334 } 1295 }
1335} 1296}
1336 1297
1337sub player_window { 1298sub player_window {
1338 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1299 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1339 x => "center", 1300 x => "center",
1340 y => "center", 1301 y => "center",
1341 force_w => $WIDTH * 9/10, 1302 force_w => $WIDTH * 9/10,
1342 force_h => $HEIGHT * 9/10, 1303 force_h => $HEIGHT * 9/10,
1343 title => "Player", 1304 title => "Player",
… …
1345 has_close_button => 1 1306 has_close_button => 1
1346 ; 1307 ;
1347 1308
1348 my $ntb = 1309 my $ntb =
1349 $PL_NOTEBOOK = 1310 $PL_NOTEBOOK =
1350 new CFClient::UI::Notebook 1311 new CFPlus::UI::Notebook expand => 1, debug => 1;
1351 expand => 1,
1352 debug => 1,
1353 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1354 ;
1355 1312
1356 $ntb->add ( 1313 $ntb->add (
1357 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1314 "Statistics (F2)" => $STATS_PAGE = stats_window,
1358 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1315 "Shows statistics, where all your Stats and Resistances are shown."
1359 ); 1316 );
1360 $ntb->add ( 1317 $ntb->add (
1361 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1318 "Skills (F3)" => $SKILL_PAGE = skill_window,
1319 "Shows all your Skills."
1320 );
1321
1322 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1323 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1324 $ntb->add (
1325 "Spellbook (F4)" => $spellsw,
1362 "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."
1363 ); 1327 );
1364 $ntb->add ( 1328 $ntb->add (
1365 Inventory => $INVENTORY_PAGE = inventory_widget, 1329 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1366 "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 :). "
1367 . "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."
1368 ); 1332 );
1369 1333
1370 $ntb->set_current_page ($INVENTORY_PAGE); 1334 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1376sub update_bindings { 1340sub update_bindings {
1377 $BIND_UPD_CB->() if $BIND_UPD_CB; 1341 $BIND_UPD_CB->() if $BIND_UPD_CB;
1378} 1342}
1379 1343
1380sub keyboard_setup { 1344sub keyboard_setup {
1381 my $binding_list = new CFClient::UI::VBox; 1345 my $binding_list = new CFPlus::UI::VBox;
1382 1346
1383 my $refresh; 1347 my $refresh;
1384 $refresh = $BIND_UPD_CB = sub { 1348 $refresh = $BIND_UPD_CB = sub {
1385 $binding_list->clear (); 1349 $binding_list->clear ();
1386 1350
… …
1388 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1352 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1389 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1353 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1354 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1391 1355
1392 my $lbl = join "; ", @$cmds; 1356 my $lbl = join "; ", @$cmds;
1393 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1357 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1394 $binding_list->add (my $hb = new CFClient::UI::HBox); 1358 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1395 $hb->add (new CFClient::UI::Button 1359 $hb->add (new CFPlus::UI::Button
1396 text => "delete", 1360 text => "delete",
1397 tooltip => "Deletes the binding", 1361 tooltip => "Deletes the binding",
1398 on_activate => sub { 1362 on_activate => sub {
1399 $binding_list->remove ($hb); 1363 $binding_list->remove ($hb);
1400 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1364 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1401 0 1365 0
1402 }); 1366 });
1403 1367
1404 $hb->add (new CFClient::UI::Button 1368 $hb->add (new CFPlus::UI::Button
1405 text => "edit", 1369 text => "edit",
1406 tooltip => "Edits the binding", 1370 tooltip => "Edits the binding",
1407 on_activate => sub { 1371 on_activate => sub {
1408 $::BIND_EDITOR->set_binding ( 1372 $::BIND_EDITOR->set_binding (
1409 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1373 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1422 $::BIND_EDITOR->show; 1386 $::BIND_EDITOR->show;
1423 $SETUP_DIALOG->hide; 1387 $SETUP_DIALOG->hide;
1424 0 1388 0
1425 }); 1389 });
1426 1390
1427 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1391 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1428 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1392 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1429 } 1393 }
1430 } 1394 }
1431 }; 1395 };
1432 1396
1433 my $vb = new CFClient::UI::VBox; 1397 my $vb = new CFPlus::UI::VBox;
1434 $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 );
1435 $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");
1436 $hb->add (new CFClient::UI::CheckBox 1403 $hb->add (new CFPlus::UI::CheckBox
1437 expand => 1, 1404 expand => 1,
1438 state => $CFG->{shift_fire_stop}, 1405 state => $CFG->{shift_fire_stop},
1439 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",
1440 on_changed => sub { 1407 on_changed => sub {
1441 my ($cbox, $value) = @_; 1408 my ($cbox, $value) = @_;
1442 $CFG->{shift_fire_stop} = $value; 1409 $CFG->{shift_fire_stop} = $value;
1443 0 1410 0
1444 }); 1411 });
1445 1412
1446 $vb->add ($binding_list); 1413 $vb->add (new CFPlus::UI::FancyFrame
1414 label => "Bindings",
1415 child => $binding_list);
1447 $vb->add (my $hb = new CFClient::UI::HBox); 1416 $vb->add (my $hb = new CFPlus::UI::HBox);
1448 1417
1449 $hb->add (new CFClient::UI::Button 1418 $hb->add (new CFPlus::UI::Button
1450 text => "record new", 1419 text => "record new",
1451 expand => 1, 1420 expand => 1,
1452 tooltip => "This button opens the binding editor with an empty binding.", 1421 tooltip => "This button opens the binding editor with an empty binding.",
1453 on_activate => sub { 1422 on_activate => sub {
1454 $::BIND_EDITOR->set_binding (undef, undef, [], 1423 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1468 $::BIND_EDITOR->show; 1437 $::BIND_EDITOR->show;
1469 0 1438 0
1470 }, 1439 },
1471 ); 1440 );
1472 1441
1473 $hb->add (new CFClient::UI::Button 1442 $hb->add (new CFPlus::UI::Button
1474 text => "close", 1443 text => "close",
1475 tooltip => "Closes the binding window", 1444 tooltip => "Closes the binding window",
1476 expand => 1, 1445 expand => 1,
1477 on_activate => sub { 1446 on_activate => sub {
1478 $SETUP_DIALOG->hide; 1447 $SETUP_DIALOG->hide;
… …
1484 1453
1485 $vb 1454 $vb
1486} 1455}
1487 1456
1488sub help_window { 1457sub help_window {
1489 my $win = new CFClient::UI::FancyFrame 1458 my $win = new CFPlus::UI::Toplevel
1490 x => 'center', 1459 x => 'center',
1491 y => 'center', 1460 y => 'center',
1492 z => 2, 1461 z => 4,
1493 name => 'doc_browser', 1462 name => 'doc_browser',
1494 force_w => int $WIDTH * 7/8, 1463 force_w => int $WIDTH * 7/8,
1495 force_h => int $HEIGHT * 7/8, 1464 force_h => int $HEIGHT * 7/8,
1496 title => "Help Browser", 1465 title => "Help Browser",
1497 has_close_button => 1; 1466 has_close_button => 1;
1498 1467
1499 $win->add (my $vbox = new CFClient::UI::VBox); 1468 $win->add (my $vbox = new CFPlus::UI::VBox);
1500 1469
1501 $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 );
1502 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1474 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1503 expand => 1, fontsize => 0.8, padding_x => 4); 1475 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1504 1476
1505 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1477 my @history;
1506 $buttons->add (my $combo = new CFClient::UI::Combobox 1478 my @future;
1507 value => undef, 1479 my $curnode;
1508 options => [ 1480
1509 [intro => "Introduction"], 1481 my $load_node; $load_node = sub {
1510 [manual => "Main Manual"], 1482 my ($node, $para) = @_;
1511 [skill_help => "Skill Reference"], 1483
1512 [command_help => "Command Reference"], 1484 $buttons->clear;
1513 [dmcommand_help => "DM Commands"], 1485
1514 [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 );
1515 ], 1506 }
1516 on_changed => sub {
1517 my ($self, $pod) = @_;
1518 1507
1519 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1508 if (@future) {
1520 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 }
1521 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
1522 $viewer->clear; 1540 $viewer->clear;
1541 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1542 $viewer->scroll_to ($para);
1543 };
1523 1544
1524# $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");
1525# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1546
1526# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1547 $CFPlus::Pod::goto_document = sub {
1527# ]);#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;
1528 1590 }
1529 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1591 ;
1530 for @$pom;
1531 1592
1532 $viewer->set_offset (0); 1593 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1533 1594
1534 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;
1535 }, 1663 },
1536 on_visibility_change => sub {
1537 my ($self, $visible) = @_;
1538 return unless $visible;
1539 return if $self->{value};
1540 $self->set_value ("intro");
1541 0
1542 },
1543 ); 1664 );
1544 1665
1545 $win 1666 $dialog->show;
1546} 1667}
1547 1668
1548sub sdl_init { 1669sub sdl_init {
1549 CFClient::SDL_Init 1670 CFPlus::SDL_Init
1550 and die "SDL::Init failed!\n"; 1671 and die "SDL::Init failed!\n";
1551} 1672}
1552 1673
1553sub video_init { 1674sub video_init {
1554 sdl_init; 1675 sdl_init;
… …
1559 1680
1560 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1681 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1561 $FULLSCREEN = $CFG->{fullscreen}; 1682 $FULLSCREEN = $CFG->{fullscreen};
1562 $FAST = $CFG->{fast}; 1683 $FAST = $CFG->{fast};
1563 1684
1564 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1685 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1565 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1686 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1566 1687
1567 $SDL_ACTIVE = 1; 1688 $SDL_ACTIVE = 1;
1568 $LAST_REFRESH = time - 0.01; 1689 $LAST_REFRESH = time - 0.01;
1569 1690
1570 CFClient::OpenGL::init; 1691 CFPlus::OpenGL::init;
1571 1692
1572 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1693 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1573 1694
1574 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1695 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1575 1696
1576 ############################################################################# 1697 #############################################################################
1577 1698
1578 if ($DEBUG_STATUS) { 1699 if ($DEBUG_STATUS) {
1579 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1700 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1580 } else { 1701 } else {
1581 # create the widgets 1702 # create the widgets
1582 1703
1583 $DEBUG_STATUS = new CFClient::UI::Label 1704 $DEBUG_STATUS = new CFPlus::UI::Label
1584 padding => 0, 1705 padding => 0,
1585 z => 100, 1706 z => 100,
1586 force_x => "max", 1707 force_x => "max",
1587 force_y => 0; 1708 force_y => 0;
1588 $DEBUG_STATUS->show; 1709 $DEBUG_STATUS->show;
1589 1710
1590 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1711 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1591 1712
1592 $STATUSBOX = new CFClient::UI::Statusbox; 1713 $STATUSBOX = new CFPlus::UI::Statusbox;
1593 $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]);
1594 1715
1595 (new CFClient::UI::Frame 1716 (new CFPlus::UI::Frame
1596 bg => [0, 0, 0, 0.4], 1717 bg => [0, 0, 0, 0.4],
1597 force_x => 0, 1718 force_x => 0,
1598 force_y => "max", 1719 force_y => "max",
1599 child => $STATUSBOX, 1720 child => $STATUSBOX,
1600 )->show; 1721 )->show;
1601 1722
1602 CFClient::UI::FancyFrame->new ( 1723 CFPlus::UI::Toplevel->new (
1603 title => "Map", 1724 title => "Map",
1604 name => "mapmap", 1725 name => "mapmap",
1605 x => 0, 1726 x => 0,
1606 y => $FONTSIZE + 8, 1727 y => $FONTSIZE + 8,
1607 border_bg => [1, 1, 1, 192/255], 1728 border_bg => [1, 1, 1, 192/255],
1608 bg => [1, 1, 1, 0], 1729 bg => [1, 1, 1, 0],
1609 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1730 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1610 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.",
1611 ), 1732 ),
1612 )->show; 1733 )->show;
1613 1734
1614 $MAPWIDGET = new CFClient::MapWidget; 1735 $MAPWIDGET = new CFPlus::MapWidget;
1615 $MAPWIDGET->connect (activate_console => sub { 1736 $MAPWIDGET->connect (activate_console => sub {
1616 my ($mapwidget, $preset) = @_; 1737 my ($mapwidget, $preset) = @_;
1617 1738
1618 if ($CONSOLE) { 1739 if ($CONSOLE) {
1619 $CONSOLE->{input}->{auto_activated} = 1; 1740 $CONSOLE->{input}->{auto_activated} = 1;
… …
1625 } 1746 }
1626 }); 1747 });
1627 $MAPWIDGET->show; 1748 $MAPWIDGET->show;
1628 $MAPWIDGET->grab_focus; 1749 $MAPWIDGET->grab_focus;
1629 1750
1630 $LOGVIEW = new CFClient::UI::TextScroller 1751 $LOGVIEW = new CFPlus::UI::TextScroller
1631 expand => 1, 1752 expand => 1,
1632 font => $FONT_FIXED, 1753 font => $FONT_FIXED,
1633 fontsize => $::CFG->{log_fontsize}, 1754 fontsize => $::CFG->{log_fontsize},
1634 indent => -4, 1755 indent => -4,
1635 can_hover => 1, 1756 can_hover => 1,
1636 can_events => 1, 1757 can_events => 1,
1637 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.",
1638 ; 1759 ;
1639 1760
1640 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1761 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1641 title => "Setup", 1762 title => "Setup",
1642 name => "setup_dialog", 1763 name => "setup_dialog",
1643 x => 'center', 1764 x => 'center',
1644 y => 'center', 1765 y => 'center',
1645 z => 2, 1766 z => 2,
… …
1648 has_close_button => 1, 1769 has_close_button => 1,
1649 ; 1770 ;
1650 1771
1651 $METASERVER = metaserver_dialog; 1772 $METASERVER = metaserver_dialog;
1652 1773
1653 $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,
1654 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1775 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1655 1776
1656 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1777 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1657 "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.");
1658 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1779 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1659 "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.");
… …
1669 . "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 "
1670 . "binding editor closes"); 1791 . "binding editor closes");
1671 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1792 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1672 "Some debuggin' options. Do not ask."); 1793 "Some debuggin' options. Do not ask.");
1673 1794
1674 $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
1675 1796
1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1797 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1677 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.");
1678 1799
1679 $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,
1680 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.");
1681 1802
1682 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
1683 1804
1684 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1805 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1685 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.");
1686 1807
1687 $BUTTONBAR->add (new CFClient::UI::Button 1808 $BUTTONBAR->add (new CFPlus::UI::Button
1688 text => "Save Config", 1809 text => "Save Config",
1689 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.",
1690 on_activate => sub { 1811 on_activate => sub {
1691 $::CFG->{layout} = CFClient::UI::get_layout; 1812 $::CFG->{layout} = CFPlus::UI::get_layout;
1692 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1813 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1693 status "Configuration Saved"; 1814 status "Configuration Saved";
1694 0 1815 0
1695 }, 1816 },
1696 ); 1817 );
1697 1818
1698 $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,
1699 tooltip => "View Documentation"); 1820 tooltip => "View Documentation");
1700 1821
1701 $BUTTONBAR->add (new CFClient::UI::Button 1822 $BUTTONBAR->add (new CFPlus::UI::Button
1702 text => "Quit", 1823 text => "Quit",
1703 tooltip => "Terminates the program", 1824 tooltip => "Terminates the program",
1704 on_activate => sub { 1825 on_activate => sub {
1705 if ($CONN) { 1826 if ($CONN) {
1706 open_quit_dialog; 1827 open_quit_dialog;
… …
1717 1838
1718 $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]);
1719} 1840}
1720 1841
1721sub video_shutdown { 1842sub video_shutdown {
1722 CFClient::OpenGL::shutdown; 1843 CFPlus::OpenGL::shutdown;
1723 1844
1724 undef $SDL_ACTIVE; 1845 undef $SDL_ACTIVE;
1725} 1846}
1726 1847
1727my @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#
… …
1735 1856
1736sub audio_music_finished { 1857sub audio_music_finished {
1737 return unless $CFG->{bgm_enable}; 1858 return unless $CFG->{bgm_enable};
1738 1859
1739 # TODO: hack, do play loop and mood music 1860 # TODO: hack, do play loop and mood music
1740 $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]";
1741 $bgmusic->play (0); 1862 $bgmusic->play (0);
1742 1863
1743 push @bgmusic, shift @bgmusic; 1864 push @bgmusic, shift @bgmusic;
1744} 1865}
1745 1866
1746sub audio_init { 1867sub audio_init {
1747 if ($CFG->{audio_enable}) { 1868 if ($CFG->{audio_enable}) {
1748 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1869 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1749 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1870 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1750 1871
1751 unless ($SDL_MIXER) { 1872 unless ($SDL_MIXER) {
1752 status "Unable to open sound device: there will be no sound"; 1873 status "Unable to open sound device: there will be no sound";
1753 return; 1874 return;
1754 } 1875 }
1755 1876
1756 CFClient::Mix_AllocateChannels 8; 1877 CFPlus::Mix_AllocateChannels 8;
1757 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1878 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1758 1879
1759 audio_music_finished; 1880 audio_music_finished;
1760 1881
1761 while (<$fh>) { 1882 while (<$fh>) {
1762 next if /^\s*#/; 1883 next if /^\s*#/;
… …
1765 my ($file, $volume, $event) = split /\s+/, $_, 3; 1886 my ($file, $volume, $event) = split /\s+/, $_, 3;
1766 1887
1767 push @SOUNDS, "$volume,$file"; 1888 push @SOUNDS, "$volume,$file";
1768 1889
1769 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1890 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1770 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";
1771 $chunk->volume ($volume * 128 / 100); 1892 $chunk->volume ($volume * 128 / 100);
1772 $chunk 1893 $chunk
1773 }; 1894 };
1774 } 1895 }
1775 } else { 1896 } else {
… …
1777 } 1898 }
1778 } 1899 }
1779} 1900}
1780 1901
1781sub audio_shutdown { 1902sub audio_shutdown {
1782 CFClient::Mix_CloseAudio if $SDL_MIXER; 1903 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1783 undef $SDL_MIXER; 1904 undef $SDL_MIXER;
1784 @SOUNDS = (); 1905 @SOUNDS = ();
1785 %AUDIO_CHUNKS = (); 1906 %AUDIO_CHUNKS = ();
1786} 1907}
1787 1908
… …
1794 1915
1795sub force_refresh { 1916sub force_refresh {
1796 $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;
1797 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1918 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1798 1919
1799 $CFClient::UI::ROOT->draw; 1920 $CFPlus::UI::ROOT->draw;
1800 1921
1801 $WANT_REFRESH = 0; 1922 $WANT_REFRESH = 0;
1802 $CAN_REFRESH = 0; 1923 $CAN_REFRESH = 0;
1803 $LAST_REFRESH = $NOW; 1924 $LAST_REFRESH = $NOW;
1804 1925
18050 && do {
1806 # some weird model-drawing code, just a joke right now
1807 use CFClient::OpenGL;
1808
1809 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1810 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1811 $demo{r} ||= do {
1812 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1813 $mod->{v} = pack "f*", @{$mod->{v}};
1814 $_ = [scalar @$_, pack "S!*", @$_]
1815 for values %{$mod->{g}};
1816 $mod
1817 };
1818
1819 my $r = $demo{r} or die;
1820
1821 glDepthMask 1;
1822 glClear GL_DEPTH_BUFFER_BIT;
1823 glEnable GL_TEXTURE_2D;
1824 glEnable GL_DEPTH_TEST;
1825 glEnable GL_CULL_FACE;
1826 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1827
1828 glMatrixMode GL_PROJECTION;
1829 glLoadIdentity;
1830 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1831 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1832 glMatrixMode GL_MODELVIEW;
1833 glLoadIdentity;
1834
1835 glPushMatrix;
1836 glTranslate 0, 0, -800;
1837 glScale 1, -1, 1;
1838 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1839 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1840 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1841 glScale 50, 50, 50;
1842
1843 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1844 while (my ($k, $v) = each %{$r->{g}}) {
1845 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1846 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1847 }
1848
1849 glPopMatrix;
1850
1851 glShadeModel GL_FLAT;
1852 glDisable GL_DEPTH_TEST;
1853 glDisable GL_TEXTURE_2D;
1854 glDepthMask 0;
1855
1856 $WANT_REFRESH++;
1857};
1858
1859 CFClient::SDL_GL_SwapBuffers; 1926 CFPlus::SDL_GL_SwapBuffers;
1860} 1927}
1861 1928
1862my $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 {
1863 $NOW = time; 1930 $NOW = time;
1864 1931
1865 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1932 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1866 for CFClient::SDL_PollEvent; 1933 for CFPlus::SDL_PollEvent;
1867 1934
1868 if (%animate_object) { 1935 if (%animate_object) {
1869 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1936 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1870 $WANT_REFRESH++; 1937 $WANT_REFRESH++;
1871 } 1938 }
… …
1895 $CONN->face_prefetch 1962 $CONN->face_prefetch
1896 if $CONN; 1963 if $CONN;
1897}); 1964});
1898 1965
1899%SDL_CB = ( 1966%SDL_CB = (
1900 CFClient::SDL_QUIT => sub { 1967 CFPlus::SDL_QUIT => sub {
1901 Event::unloop -1; 1968 Event::unloop -1;
1902 }, 1969 },
1903 CFClient::SDL_VIDEORESIZE => sub { 1970 CFPlus::SDL_VIDEORESIZE => sub {
1904 }, 1971 },
1905 CFClient::SDL_VIDEOEXPOSE => sub { 1972 CFPlus::SDL_VIDEOEXPOSE => sub {
1906 CFClient::UI::full_refresh; 1973 CFPlus::UI::full_refresh;
1907 }, 1974 },
1908 CFClient::SDL_ACTIVEEVENT => sub { 1975 CFPlus::SDL_ACTIVEEVENT => sub {
1909# 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#
1910 }, 1977 },
1911 CFClient::SDL_KEYDOWN => sub { 1978 CFPlus::SDL_KEYDOWN => sub {
1912 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1979 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1913 # alt-enter 1980 # alt-enter
1981 $FULLSCREEN_ENABLE->toggle;
1914 video_shutdown; 1982 video_shutdown;
1915 $CFG->{fullscreen} = !$CFG->{fullscreen};
1916 video_init; 1983 video_init;
1917 } else { 1984 } else {
1918 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1985 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1919 } 1986 }
1920 }, 1987 },
1921 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1988 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1922 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1989 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1923 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1990 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1924 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1991 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1925 CFClient::SDL_USEREVENT => sub { 1992 CFPlus::SDL_USEREVENT => sub {
1926 if ($_[0]{code} == 1) { 1993 if ($_[0]{code} == 1) {
1927 audio_channel_finished $_[0]{data1}; 1994 audio_channel_finished $_[0]{data1};
1928 } elsif ($_[0]{code} == 0) { 1995 } elsif ($_[0]{code} == 0) {
1929 audio_music_finished; 1996 audio_music_finished;
1930 } 1997 }
… …
1934############################################################################# 2001#############################################################################
1935 2002
1936$SIG{INT} = $SIG{TERM} = sub { exit }; 2003$SIG{INT} = $SIG{TERM} = sub { exit };
1937 2004
1938{ 2005{
1939 local $SIG{__DIE__} = sub {
1940 return unless defined $^S && !$^S;
1941 Carp::confess $_[1];#d#TODO: remove when stable
1942 CFClient::fatal $_[0];
1943 };
1944
1945 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2006 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1946 CFClient::UI::set_layout ($::CFG->{layout}); 2007 CFPlus::UI::set_layout ($::CFG->{layout});
1947 2008
1948 my %DEF_CFG = ( 2009 my %DEF_CFG = (
1949 sdl_mode => 0, 2010 sdl_mode => 0,
1950 width => 640, 2011 width => 640,
1951 height => 480, 2012 height => 480,
… …
1967 bgm_volume => 0.25, 2028 bgm_volume => 0.25,
1968 face_prefetch => 0, 2029 face_prefetch => 0,
1969 output_sync => 1, 2030 output_sync => 1,
1970 output_count => 1, 2031 output_count => 1,
1971 pickup => 0, 2032 pickup => 0,
2033 inv_sort => "mtime",
1972 default => "profile", # default profile 2034 default => "profile", # default profile
2035 show_tips => 1,
1973 ); 2036 );
1974 2037
1975 while (my ($k, $v) = each %DEF_CFG) { 2038 while (my ($k, $v) = each %DEF_CFG) {
1976 $CFG->{$k} = $v unless exists $CFG->{$k}; 2039 $CFG->{$k} = $v unless exists $CFG->{$k};
1977 } 2040 }
… …
1980 2043
1981 sdl_init; 2044 sdl_init;
1982 2045
1983 @SDL_MODES = reverse 2046 @SDL_MODES = reverse
1984 grep $_->[0] >= 640 && $_->[1] >= 480, 2047 grep $_->[0] >= 640 && $_->[1] >= 480,
1985 CFClient::SDL_ListModes; 2048 CFPlus::SDL_ListModes;
1986 2049
1987 @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)";
1988 2051
1989 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2052 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1990 2053
1991 { 2054 {
1992 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2055 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1993 DejaVuSans.ttf 2056 DejaVuSans.ttf
1994 DejaVuSansMono.ttf 2057 DejaVuSansMono.ttf
1995 DejaVuSans-Bold.ttf 2058 DejaVuSans-Bold.ttf
1996 DejaVuSansMono-Bold.ttf 2059 DejaVuSansMono-Bold.ttf
1997 DejaVuSans-Oblique.ttf 2060 DejaVuSans-Oblique.ttf
1998 DejaVuSansMono-Oblique.ttf 2061 DejaVuSansMono-Oblique.ttf
1999 DejaVuSans-BoldOblique.ttf 2062 DejaVuSans-BoldOblique.ttf
2000 DejaVuSansMono-BoldOblique.ttf 2063 DejaVuSansMono-BoldOblique.ttf
2001 ); 2064 );
2002 2065
2003 CFClient::add_font $_ for @fonts; 2066 CFPlus::add_font $_ for @fonts;
2004 2067
2005 CFClient::pango_init; 2068 CFPlus::pango_init;
2006 2069
2007 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2070 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2008 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2071 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2009 2072
2010 $FONT_PROP->make_default; 2073 $FONT_PROP->make_default;
2011 } 2074 }
2012 2075
2013# compare mono (ft) vs. rgba (cairo) 2076# compare mono (ft) vs. rgba (cairo)
2014# ft - 1.8s, cairo 3s, even in alpha-only mode 2077# ft - 1.8s, cairo 3s, even in alpha-only mode
2015# for my $rgba (0..1) { 2078# for my $rgba (0..1) {
2016# my $t1 = Time::HiRes::time; 2079# my $t1 = Time::HiRes::time;
2017# for (1..1000) { 2080# for (1..1000) {
2018# my $layout = CFClient::Layout->new ($rgba); 2081# my $layout = CFPlus::Layout->new ($rgba);
2019# $layout->set_text ("hallo" x 100); 2082# $layout->set_text ("hallo" x 100);
2020# $layout->render; 2083# $layout->render;
2021# } 2084# }
2022# my $t2 = Time::HiRes::time; 2085# my $t2 = Time::HiRes::time;
2023# warn $t2-$t1; 2086# warn $t2-$t1;
… …
2025 2088
2026 video_init; 2089 video_init;
2027 audio_init; 2090 audio_init;
2028} 2091}
2029 2092
2093show_tip_of_the_day if $CFG->{show_tips};
2094
2030Event::loop; 2095Event::loop;
2031#CFClient::SDL_Quit; 2096#CFPlus::SDL_Quit;
2032#CFClient::_exit 0; 2097#CFPlus::_exit 0;
2033 2098
2034END { CFClient::SDL_Quit } 2099END { CFPlus::SDL_Quit }
2035 2100
2036=head1 NAME 2101=head1 NAME
2037 2102
2038cfplus - A Crossfire+ and Crossfire game client 2103cfplus - A Crossfire+ and Crossfire game client
2039 2104

Diff Legend

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