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

Diff Legend

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