ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.91 by root, Tue Jul 11 13:51:38 2006 UTC vs.
Revision 1.110 by root, Sun Aug 13 18:48:57 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.1';
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
… …
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::FancyFrame
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,
… …
367 $chunk->play; 388 $chunk->play;
368 }, 389 },
369 }; 390 };
370 391
371 if ($CONN) { 392 if ($CONN) {
372 CFClient::lowdelay fileno $CONN->{fh}; 393 CFPlus::lowdelay fileno $CONN->{fh};
373 394
374 status "login successful"; 395 status "login successful";
375 } else { 396 } else {
376 status "unable to connect"; 397 status "unable to connect";
377 stop_game(); 398 stop_game();
… …
395 416
396 undef $MAP; 417 undef $MAP;
397} 418}
398 419
399sub graphics_setup { 420sub graphics_setup {
400 my $vbox = new CFClient::UI::VBox; 421 my $vbox = new CFPlus::UI::VBox;
401 422
402 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
403 424
404 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 425 $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); 426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
406 427
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]); 428 $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"); 429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
409 430
410 $mode_slider->connect (changed => sub { 431 $mode_slider->connect (changed => sub {
411 my ($self, $value) = @_; 432 my ($self, $value) = @_;
412 433
413 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
… …
415 }); 436 });
416 $mode_slider->emit (changed => $mode_slider->{range}[0]); 437 $mode_slider->emit (changed => $mode_slider->{range}[0]);
417 438
418 my $row = 1; 439 my $row = 1;
419 440
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
421 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
422 state => $CFG->{fullscreen}, 443 state => $CFG->{fullscreen},
423 tooltip => "Bring the client into fullscreen mode.", 444 tooltip => "Bring the client into fullscreen mode.",
424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
425 ); 446 );
426 447
427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
428 $table->add (1, $row++, new CFClient::UI::CheckBox 449 $table->add (1, $row++, new CFPlus::UI::CheckBox
429 state => $CFG->{fast}, 450 state => $CFG->{fast},
430 tooltip => "Lower the visual quality considerably to speed up rendering.", 451 tooltip => "Lower the visual quality considerably to speed up rendering.",
431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
432 ); 453 );
433 454
434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
435 $table->add (1, $row++, new CFClient::UI::Slider 456 $table->add (1, $row++, new CFPlus::UI::Slider
436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
439 ); 460 );
440 461
441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 462 $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 463 $table->add (1, $row++, new CFPlus::UI::CheckBox
443 state => $CFG->{fow_enable}, 464 state => $CFG->{fow_enable},
444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 465 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 } 466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
446 ); 467 );
447 468
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
449 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFPlus::UI::Slider
450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 471 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.", 472 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 } 473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
453 ); 474 );
454 475
455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
456 $table->add (1, $row++, new CFClient::UI::CheckBox 477 $table->add (1, $row++, new CFPlus::UI::CheckBox
457 state => $CFG->{fow_smooth}, 478 state => $CFG->{fow_smooth},
458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
459 on_changed => sub { 480 on_changed => sub {
460 my ($self, $value) = @_; 481 my ($self, $value) = @_;
461 $CFG->{fow_smooth} = $value; 482 $CFG->{fow_smooth} = $value;
462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
463 0 484 0
464 } 485 }
465 ); 486 );
466 487
467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
468 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFPlus::UI::Slider
469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 490 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.", 491 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 }, 492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
472 ); 493 );
473 494
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
475 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFPlus::UI::Slider
476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 497 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.", 498 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 }, 499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
479 ); 500 );
480 501
481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
482 $table->add (1, $row++, new CFClient::UI::Slider 503 $table->add (1, $row++, new CFPlus::UI::Slider
483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 504 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.", 505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
485 on_changed => sub { 506 on_changed => sub {
486 $CFG->{gauge_fontsize} = $_[1]; 507 $CFG->{gauge_fontsize} = $_[1];
487 &set_gauge_window_fontsize; 508 &set_gauge_window_fontsize;
488 0 509 0
489 } 510 }
490 ); 511 );
491 512
492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
493 $table->add (1, $row++, new CFClient::UI::Slider 514 $table->add (1, $row++, new CFPlus::UI::Slider
494 range => [$CFG->{gauge_size}, 0.2, 0.8], 515 range => [$CFG->{gauge_size}, 0.2, 0.8],
495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
496 on_changed => sub { 517 on_changed => sub {
497 $CFG->{gauge_size} = $_[1]; 518 $CFG->{gauge_size} = $_[1];
498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0 520 0
500 } 521 }
501 ); 522 );
502 523
503 $table->add (1, $row++, new CFClient::UI::Button 524 $table->add (1, $row++, new CFPlus::UI::Button
504 expand => 1, align => 0, text => "Apply", 525 expand => 1, align => 0, text => "Apply",
505 tooltip => "Apply the video settings", 526 tooltip => "Apply the video settings",
506 on_activate => sub { 527 on_activate => sub {
507 video_shutdown (); 528 video_shutdown ();
508 video_init (); 529 video_init ();
… …
512 533
513 $vbox 534 $vbox
514} 535}
515 536
516sub audio_setup { 537sub audio_setup {
517 my $vbox = new CFClient::UI::VBox; 538 my $vbox = new CFPlus::UI::VBox;
518 539
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
520 541
521 my $row = 0; 542 my $row = 0;
522 543
523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
524 $table->add (1, $row++, new CFClient::UI::CheckBox 545 $table->add (1, $row++, new CFPlus::UI::CheckBox
525 state => $CFG->{audio_enable}, 546 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.", 547 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 } 548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528 ); 549 );
529# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 550# $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 { 551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
531# $CFG->{effects_volume} = $_[1]; 552# $CFG->{effects_volume} = $_[1];
532# }); 553# });
533 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 554 $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); 555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
535 $hbox->add (new CFClient::UI::CheckBox 556 $hbox->add (new CFPlus::UI::CheckBox
536 expand => 1, state => $CFG->{bgm_enable}, 557 expand => 1, state => $CFG->{bgm_enable},
537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 558 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 } 559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
539 ); 560 );
540 $hbox->add (new CFClient::UI::Slider 561 $hbox->add (new CFPlus::UI::Slider
541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
542 tooltip => "The volume of the background music. Changes are instant.", 563 tooltip => "The volume of the background music. Changes are instant.",
543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
544 ); 565 );
545 566
546 $table->add (1, $row++, new CFClient::UI::Button 567 $table->add (1, $row++, new CFPlus::UI::Button
547 expand => 1, align => 0, text => "Apply", 568 expand => 1, align => 0, text => "Apply",
548 tooltip => "Apply the audio settings", 569 tooltip => "Apply the audio settings",
549 on_activate => sub { 570 on_activate => sub {
550 audio_shutdown (); 571 audio_shutdown ();
551 audio_init (); 572 audio_init ();
… …
563} 584}
564 585
565sub make_gauge_window { 586sub make_gauge_window {
566 my $gh = int $HEIGHT * $CFG->{gauge_size}; 587 my $gh = int $HEIGHT * $CFG->{gauge_size};
567 588
568 my $win = new CFClient::UI::Frame ( 589 my $win = new CFPlus::UI::Frame (
569 force_x => 0, 590 force_x => 0,
570 force_y => "max", 591 force_y => "max",
571 force_w => $WIDTH, 592 force_w => $WIDTH,
572 force_h => $gh, 593 force_h => $gh,
573 ); 594 );
574 595
575 $win->add (my $hbox = new CFClient::UI::HBox 596 $win->add (my $hbox = new CFPlus::UI::HBox
576 children => [ 597 children => [
577 (new CFClient::UI::HBox expand => 1), 598 (new CFPlus::UI::HBox expand => 1),
578 (new CFClient::UI::VBox children => [ 599 (new CFPlus::UI::VBox children => [
579 (new CFClient::UI::Empty expand => 1), 600 (new CFPlus::UI::Empty expand => 1),
580 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 601 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
581 ]), 602 ]),
582 (my $vbox = new CFClient::UI::VBox), 603 (my $vbox = new CFPlus::UI::VBox),
583 ], 604 ],
584 ); 605 );
585 606
586 $vbox->add (new CFClient::UI::HBox 607 $vbox->add (new CFPlus::UI::HBox
587 expand => 1, 608 expand => 1,
588 children => [ 609 children => [
589 (new CFClient::UI::Empty expand => 1), 610 (new CFPlus::UI::Empty expand => 1),
590 (my $hb = new CFClient::UI::HBox), 611 (my $hb = new CFPlus::UI::HBox),
591 ], 612 ],
592 ); 613 );
593 614
594 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 615 $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', 616 $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', 617 $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', 618 $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 619
603 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 620 $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, 621 $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 622
608 $GAUGES = { 623 $GAUGES = {
609 exp => $exp, win => $win, range => $rng, 624 exp => $exp, win => $win, range => $rng,
610 food => $fg, mana => $mg, hp => $hg, grace => $gg 625 food => $fg, mana => $mg, hp => $hg, grace => $gg
611 }; 626 };
… …
614 629
615 $win 630 $win
616} 631}
617 632
618sub debug_setup { 633sub debug_setup {
619 my $table = new CFClient::UI::Table; 634 my $table = new CFPlus::UI::Table;
620 635
621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 636 $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 }); 637 $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"); 638 $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 }); 639 $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"); 640 $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 }); 641 $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"); 642 $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 }); 643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
629 644
630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
631 646
632 for my $x (0..2) { 647 for my $x (0..2) {
633 for my $y (0 .. 2) { 648 for my $y (0 .. 2) {
634 $table->add ($x + 3, $y, 649 $table->add ($x + 3, $y,
635 new CFClient::UI::Entry 650 new CFPlus::UI::Entry
636 text => $default_smooth[$x * 3 + $y], 651 text => $default_smooth[$x * 3 + $y],
637 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
638 ); 653 );
639 } 654 }
640 } 655 }
… …
642 657
643 $table 658 $table
644} 659}
645 660
646sub stats_window { 661sub stats_window {
662 my $r = new CFPlus::UI::ScrolledWindow (
663 expand => 1,
664 scroll_y => 1
665 );
647 my $vb = new CFClient::UI::VBox; 666 $r->add (my $vb = new CFPlus::UI::VBox);
648 667
649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
650 can_hover => 1, can_events => 1, 669 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."); 670 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, 671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
653 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
654 tooltip => "The map you are currently on (if supported by the server)."); 673 tooltip => "The map you are currently on (if supported by the server).");
655 674
656 $vb->add (my $hb0 = new CFClient::UI::HBox); 675 $vb->add (my $hb0 = new CFPlus::UI::HBox);
657 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
658 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
659 tooltip => "The weight of the player including all inventory items."); 678 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, 679 $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, 680 can_hover => 1, can_events => 1,
662 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
663 682
664
665 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
666 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
667 685
668 my $color2 = [1, 1, 0]; 686 my $color2 = [1, 1, 0];
669 687
670 for ( 688 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"], 689 [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"], 690 [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"], 691 [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"], 692 [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"], 693 [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"], 694 [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."], 695 [0, 6, st_cha => "Cha", 30],
678 696
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."], 697 [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."], 698 [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."], 699 [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."], 700 [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."], 701 [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."], 702 [2, 5, st_wspd => "WSp", 10.54],
685 ) { 703 ) {
686 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 704 my ($col, $row, $id, $label, $template) = @$_;
687 705
688 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 706 $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); 707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label");
690 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 709 $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); 710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label");
692 } 712 }
693 713
694 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
695 715
696 my $row = 0; 716 my $row = 0;
697 my $col = 0; 717 my $col = 0;
698 718
699 my %resist_names = ( 719 my %resist_names = (
720 slow => ["Slow",
700 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 721 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
722 holyw => ["Holy Word",
701 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 723 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
724 conf => ["Confusion",
702 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 725 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
726 fire => ["Fire",
703 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 727 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
728 depl => ["Depletion",
704 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 729 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
730 magic => ["Magic",
705 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 731 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
732 drain => ["Draining",
706 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 733 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
734 acid => ["Acid",
707 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 735 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
736 pois => ["Poison",
708 pois => "<b>Poison</b> (resistance to getting poisoned)", 737 "<b>Poison</b> (resistance to getting poisoned)"],
738 para => ["Paralysation",
709 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 739 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
740 deat => ["Death",
710 deat => "<b>Death</b> (resistance against death spells)", 741 "<b>Death</b> (resistance against death spells)"],
742 phys => ["Physical",
711 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)", 743 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
744 blind => ["Blind",
712 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 745 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
746 fear => ["Fear",
713 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 747 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
748 tund => ["Turn undead",
714 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 749 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
750 elec => ["Electricity",
715 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 751 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
752 cold => ["Cold",
716 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit",
717 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
718 ); 756 );
719 for (qw/slow holyw conf fire depl magic 757 for (qw/slow holyw conf fire depl magic
720 drain acid pois para deat phys 758 drain acid pois para deat phys
721 blind fear tund elec cold ghit/) 759 blind fear tund elec cold ghit/)
722 { 760 {
723 $tbl2->add ($col, $row, 761 $tbl2->add ($col, $row,
724 $STATWIDS->{"res_$_"} = 762 $STATWIDS->{"res_$_"} =
725 new CFClient::UI::Label 763 new CFPlus::UI::Label
726 font => $FONT_FIXED, 764 font => $FONT_FIXED,
727 template => "-100%", 765 template => "-100%",
728 align => +1, 766 align => +1,
729 valign => 0, 767 valign => 0,
730 can_events => 1, 768 can_events => 1,
731 can_hover => 1, 769 can_hover => 1,
732 tooltip => $resist_names{$_}, 770 tooltip => $resist_names{$_}->[1],
733 ); 771 );
734 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
735 font => $FONT_FIXED, 773 font => $FONT_FIXED,
736 can_hover => 1, 774 can_hover => 1,
737 can_events => 1, 775 can_events => 1,
738 path => "ui/resist/resist_$_.png", 776 path => "ui/resist/resist_$_.png",
739 tooltip => $resist_names{$_}, 777 tooltip => $resist_names{$_}->[1],
778 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED,
782 can_hover => 1,
783 can_events => 1,
784 tooltip => $resist_names{$_}->[1],
740 ); 785 );
741 786
742 $row++; 787 $row++;
743 if ($row % 6 == 0) { 788 if ($row % 6 == 0) {
744 $col += 2; 789 $col += 3;
745 $row = 0; 790 $row = 0;
746 } 791 }
747 } 792 }
748 793
749 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
750 $STATWIDS->{"_skill_tbl"} = $tbl3;
751
752 update_stats_window ({}); 794 #update_stats_window ({});
753 795
754 $vb 796 $r
797}
798
799sub skill_window {
800 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
801 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
802 $sw
755} 803}
756 804
757sub formsep($) { 805sub formsep($) {
758 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 806 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
759} 807}
760 808
761sub update_stats_window {
762 my ($stats) = @_;
763
764 # I love text protocols...
765
766 my $hp = $stats->{+CS_STAT_HP} * 1;
767 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
768 my $sp = $stats->{+CS_STAT_SP} * 1;
769 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
770 my $fo = $stats->{+CS_STAT_FOOD} * 1;
771 my $fo_m = 999;
772 my $gr = $stats->{+CS_STAT_GRACE} * 1;
773 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
774
775 $GAUGES->{hp} ->set_value ($hp, $hp_m);
776 $GAUGES->{mana} ->set_value ($sp, $sp_m);
777 $GAUGES->{food} ->set_value ($fo, $fo_m);
778 $GAUGES->{grace} ->set_value ($gr, $gr_m);
779 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
780 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
781 my $rng = $stats->{+CS_STAT_RANGE};
782 $rng =~ s/^Range: //; # thank you so much dear server
783 $GAUGES->{range} ->set_text ("Rng: " . $rng);
784 my $title = $stats->{+CS_STAT_TITLE};
785 $title =~ s/^Player: //;
786 $STATWIDS->{title} ->set_text ("Title: " . $title);
787
788 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
789 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
790 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
791 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
792 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
793 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
794 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
795 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
796 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
797 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
798 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
799 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
800 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
801
802 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
803
804 my %tbl = (
805 phys => CS_STAT_RES_PHYS,
806 magic => CS_STAT_RES_MAG,
807 fire => CS_STAT_RES_FIRE,
808 elec => CS_STAT_RES_ELEC,
809 cold => CS_STAT_RES_COLD,
810 conf => CS_STAT_RES_CONF,
811 acid => CS_STAT_RES_ACID,
812 drain => CS_STAT_RES_DRAIN,
813 ghit => CS_STAT_RES_GHOSTHIT,
814 pois => CS_STAT_RES_POISON,
815 slow => CS_STAT_RES_SLOW,
816 para => CS_STAT_RES_PARA,
817 tund => CS_STAT_TURN_UNDEAD,
818 fear => CS_STAT_RES_FEAR,
819 depl => CS_STAT_RES_DEPLETE,
820 deat => CS_STAT_RES_DEATH,
821 holyw => CS_STAT_RES_HOLYWORD,
822 blind => CS_STAT_RES_BLIND,
823 );
824
825 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
826 my $sktbl = $STATWIDS->{_skill_tbl};
827 $sktbl->clear;
828
829 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
830 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
831 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
832
833 my @skills;
834
835 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
836 push @skills, [$i, $::CONN->{skill_info}{$i}];
837 }
838
839 my $y = 1;
840 for (sort { $a->[1] cmp $b->[1] } @skills) {
841 my ($idx, $name) = @$_;
842
843 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
844 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
846 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
847 }
848 }
849
850 $STATWIDS->{_skill_tbl_init} = 1;
851 }
852
853 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
854 if (exists $stats->{$i}) {
855 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
856 if $STATWIDS->{"sk_xp_$i"};
857 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
858 if $STATWIDS->{"sk_lvl_$i"};
859 }
860 }
861
862 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
863 for keys %tbl;
864}
865
866my $METASERVER_ATIME; 809my $METASERVER_ATIME;
867 810
868sub update_metaserver { 811sub update_metaserver {
869 my ($metaserver_dialog) = @_; 812 my ($metaserver_dialog) = @_;
870 813
… …
874 return if $METASERVER_ATIME > time; 817 return if $METASERVER_ATIME > time;
875 $METASERVER_ATIME = time + 60; 818 $METASERVER_ATIME = time + 60;
876 819
877 my $table = $METASERVER->{table}; 820 my $table = $METASERVER->{table};
878 $table->clear; 821 $table->clear;
879 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
880 823
881 my $buf; 824 my $buf;
882 825
883 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
884 827
… …
907 "The time this server has been running without being restarted.", 850 "The time this server has been running without being restarted.",
908 "The server software version - a '+' indicates a Crossfire+ server.", 851 "The server software version - a '+' indicates a Crossfire+ server.",
909 "Short information about this server provided by its admins.", 852 "Short information about this server provided by its admins.",
910 ); 853 );
911 my @col = qw(#Users Host Uptime Version Description); 854 my @col = qw(#Users Host Uptime Version Description);
912 $table->add ($_, 0, new CFClient::UI::Label 855 $table->add ($_, 0, new CFPlus::UI::Label
913 can_hover => 1, can_events => 1, 856 can_hover => 1, can_events => 1,
914 align => 0, fg => [1, 1, 0], 857 align => 0, fg => [1, 1, 0],
915 text => $col[$_], tooltip => $tip[$_]) 858 text => $col[$_], tooltip => $tip[$_])
916 for 0 .. $#col; 859 for 0 .. $#col;
917 860
… …
938 881
939 $m = [$users, $host, $uptime, $version, $desc]; 882 $m = [$users, $host, $uptime, $version, $desc];
940 883
941 $y++; 884 $y++;
942 885
943 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
944 (new CFClient::UI::Button 887 (new CFPlus::UI::Button
945 text => "Use", 888 text => "Use",
946 tooltip => "Put this server into the <b>Host:Port</b> field", 889 tooltip => "Put this server into the <b>Host:Port</b> field",
947 on_activate => sub { 890 on_activate => sub {
948 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
949 $METASERVER->hide; 892 $METASERVER->hide;
950 0 893 0
951 }, 894 },
952 ), 895 ),
953 (new CFClient::UI::Empty expand => 1), 896 (new CFPlus::UI::Empty expand => 1),
954 ]); 897 ]);
955 898
956 $table->add ($_, $y, new CFClient::UI::Label 899 $table->add ($_, $y, new CFPlus::UI::Label
957 ellipsise => 0, 900 ellipsise => 0,
958 align => $align[$_], 901 align => $align[$_],
959 text => $m->[$_], 902 text => $m->[$_],
960 tooltip => $tip[$_], 903 tooltip => $tip[$_],
961 can_hover => 1, 904 can_hover => 1,
… …
966 } 909 }
967 }); 910 });
968} 911}
969 912
970sub metaserver_dialog { 913sub metaserver_dialog {
971 my $vbox = new CFClient::UI::VBox; 914 my $vbox = new CFPlus::UI::VBox;
972 my $table = new CFClient::UI::Table; 915 my $table = new CFPlus::UI::Table;
973 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
974 917
975 my $dialog = new CFClient::UI::FancyFrame 918 my $dialog = new CFPlus::UI::FancyFrame
976 title => "Server List", 919 title => "Server List",
977 name => 'metaserver_dialog', 920 name => 'metaserver_dialog',
978 x => 'center', 921 x => 'center',
979 y => 'center', 922 y => 'center',
980 z => 3, 923 z => 3,
… …
990 933
991 $dialog 934 $dialog
992} 935}
993 936
994sub server_setup { 937sub server_setup {
995 my $vbox = new CFClient::UI::VBox; 938 my $vbox = new CFPlus::UI::VBox;
996 939
997 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
998 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
999 942
1000 { 943 {
1001 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
1002 945
1003 $vbox->add ( 946 $vbox->add (
1004 $HOST_ENTRY = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFPlus::UI::Entry
1005 expand => 1, 948 expand => 1,
1006 text => $CFG->{profile}{default}{host}, 949 text => $CFG->{profile}{default}{host},
1007 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1008 on_changed => sub { 951 on_changed => sub {
1009 my ($self, $value) = @_; 952 my ($self, $value) = @_;
1010 $CFG->{profile}{default}{host} = $value; 953 $CFG->{profile}{default}{host} = $value;
1011 0 954 0
1012 } 955 }
1013 ); 956 );
1014 957
1015 $vbox->add (new CFClient::UI::Button 958 $vbox->add (new CFPlus::UI::Button
1016 expand => 1, 959 expand => 1,
1017 text => "Server List", 960 text => "Server List",
1018 other => $METASERVER, 961 other => $METASERVER,
1019 tooltip => "Show a list of available crossfire servers", 962 tooltip => "Show a list of available crossfire servers",
1020 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 963 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1021 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1022 ); 965 );
1023 } 966 }
1024 967
1025 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1026 $table->add (1, 4, new CFClient::UI::Entry 969 $table->add (1, 4, new CFPlus::UI::Entry
1027 text => $CFG->{profile}{default}{user}, 970 text => $CFG->{profile}{default}{user},
1028 tooltip => "The name of your character on the server", 971 tooltip => "The name of your character on the server",
1029 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1030 ); 973 );
1031 974
1032 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1033 $table->add (1, 5, new CFClient::UI::Entry 976 $table->add (1, 5, new CFPlus::UI::Entry
1034 text => $CFG->{profile}{default}{password}, 977 text => $CFG->{profile}{default}{password},
1035 hidden => 1, 978 hidden => 1,
1036 tooltip => "The password for your character", 979 tooltip => "The password for your character",
1037 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1038 ); 981 );
1039 982
1040 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1041 $table->add (1, 7, new CFClient::UI::Slider 984 $table->add (1, 7, new CFPlus::UI::Slider
1042 force_w => 100, 985 force_w => 100,
1043 range => [$CFG->{mapsize}, 10, 100, 0, 1], 986 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1044 tooltip => "This is the size of the portion of the map update the server sends you. " 987 tooltip => "This is the size of the portion of the map update the server sends you. "
1045 . "If you set this to a high value you will be able to see further, " 988 . "If you set this to a high value you will be able to see further, "
1046 . "but you also increase bandwidth requirements and latency. " 989 . "but you also increase bandwidth requirements and latency. "
1047 . "This option is only used once at log-in.", 990 . "This option is only used once at log-in.",
1048 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1049 ); 992 );
1050 993
1051 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1052 $table->add (1, 8, new CFClient::UI::CheckBox 995 $table->add (1, 8, new CFPlus::UI::CheckBox
1053 state => $CFG->{face_prefetch}, 996 state => $CFG->{face_prefetch},
1054 tooltip => "<b>Background Image Prefetch</b>\n\n" 997 tooltip => "<b>Background Image Prefetch</b>\n\n"
1055 . "If enabled, the client automatically pre-fetches images from the server. " 998 . "If enabled, the client automatically pre-fetches images from the server. "
1056 . "This might increase or create lag, but increases the chances " 999 . "This might increase or create lag, but increases the chances "
1057 . "of faces being ready for display when you encounter them. " 1000 . "of faces being ready for display when you encounter them. "
… …
1059 . "so only set it if you really need to prefetch images. " 1002 . "so only set it if you really need to prefetch images. "
1060 . "This option can be set and unset any time.", 1003 . "This option can be set and unset any time.",
1061 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1062 ); 1005 );
1063 1006
1064 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1065 $table->add (1, 9, new CFClient::UI::Entry 1008 $table->add (1, 9, new CFPlus::UI::Entry
1066 text => $CFG->{output_count}, 1009 text => $CFG->{output_count},
1067 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1068 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1069 ); 1012 );
1070 1013
1071 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1072 $table->add (1, 10, new CFClient::UI::Entry 1015 $table->add (1, 10, new CFPlus::UI::Entry
1073 text => $CFG->{output_sync}, 1016 text => $CFG->{output_sync},
1074 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1075 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1076 ); 1019 );
1077 1020
1078 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1079 expand => 1, 1022 expand => 1,
1080 align => 0, 1023 align => 0,
1081 text => "Login", 1024 text => "Login",
1082 on_activate => sub { 1025 on_activate => sub {
1083 $CONN ? stop_game 1026 $CONN ? stop_game
1084 : start_game; 1027 : start_game;
1085 0 1028 0
1086 }, 1029 },
1087 ); 1030 );
1088 1031
1089 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1090 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1091 text => $CFG->{say_command}, 1034 text => $CFG->{say_command},
1092 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1035 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1093 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1094 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1095 on_changed => sub { 1038 on_changed => sub {
… …
1097 $CFG->{say_command} = $value; 1040 $CFG->{say_command} = $value;
1098 0 1041 0
1099 } 1042 }
1100 ); 1043 );
1101 1044
1102 $vbox->add (new CFClient::UI::Label 1045 $vbox->add (new CFPlus::UI::Label
1103 text => "Server Info", 1046 text => "Server Info",
1104 fontsize => 1.2, 1047 fontsize => 1.2,
1105 padding_y => 8, 1048 padding_y => 8,
1106 fg => [1, 1, 0, 1], 1049 fg => [1, 1, 0, 1],
1107 ); 1050 );
1108 1051
1109 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1110 1053
1111 $vbox 1054 $vbox
1112} 1055}
1113 1056
1114sub message_window { 1057sub message_window {
1115 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFPlus::UI::FancyFrame
1116 name => "message_window", 1059 name => "message_window",
1117 title => "Messages", 1060 title => "Messages",
1118 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
1119 bg => [0, 0, 0, 0.75],
1120 x => "max", 1062 x => "max",
1121 y => 0, 1063 y => 0,
1122 force_w => $::WIDTH * 0.4, 1064 force_w => $::WIDTH * 0.4,
1123 force_h => $::HEIGHT * 0.5, 1065 force_h => $::HEIGHT * 0.5,
1124 child => (my $vbox = new CFClient::UI::VBox), 1066 child => (my $vbox = new CFPlus::UI::VBox),
1125 has_close_button => 1; 1067 has_close_button => 1;
1126 1068
1127 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
1128 1070
1129 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFPlus::UI::Entry
1130 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1131 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1073 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1132 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1074 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1133 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1134 on_focus_in => sub { 1076 on_focus_in => sub {
… …
1173 }; 1115 };
1174 1116
1175 $window 1117 $window
1176} 1118}
1177 1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1178sub open_quit_dialog { 1139sub open_quit_dialog {
1179 unless ($QUIT_DIALOG) { 1140 unless ($QUIT_DIALOG) {
1180 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1181 x => "center", 1142 x => "center",
1182 y => "center", 1143 y => "center",
1183 z => 50, 1144 z => 50,
1184 title => "Really Quit?", 1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1185 ; 1150 ;
1186 1151
1187 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1188 1153
1189 $vb->add (new CFClient::UI::Label 1154 $vb->add (new CFPlus::UI::Label
1190 text => "You should find a savebed and apply it first!", 1155 text => "You should find a savebed and apply it first!",
1191 max_w => $WIDTH * 0.25, 1156 max_w => $WIDTH * 0.25,
1192 ellipsize => 0, 1157 ellipsize => 0,
1193 ); 1158 );
1194 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1195 $hb->add (new CFClient::UI::Button 1160 $hb->add (new CFPlus::UI::Button
1196 text => "Ok", 1161 text => "Ok",
1197 expand => 1, 1162 expand => 1,
1198 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1199 ); 1164 );
1200 $hb->add (new CFClient::UI::Button 1165 $hb->add (new CFPlus::UI::Button
1201 text => "Quit anyway", 1166 text => "Quit anyway",
1202 expand => 1, 1167 expand => 1,
1203 on_activate => sub { exit }, 1168 on_activate => sub { exit },
1204 ); 1169 );
1205 } 1170 }
1206 1171
1207 $QUIT_DIALOG->show; 1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1208} 1174}
1209 1175
1210sub autopickup_setup { 1176sub autopickup_setup {
1211 my $table = new CFClient::UI::Table; 1177 my $table = new CFPlus::UI::Table;
1212 1178
1213 for ( 1179 for (
1214 ["General", 0, 0, 1180 ["General", 0, 0,
1215 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1216 ["Inhibit autopickup" => PICKUP_INHIBIT], 1182 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1250 ], 1216 ],
1251 ["Weight/Value ratio", 2, 17] 1217 ["Weight/Value ratio", 2, 17]
1252 ) 1218 )
1253 { 1219 {
1254 my ($title, $x, $y, @bits) = @$_; 1220 my ($title, $x, $y, @bits) = @$_;
1255 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1256 1222
1257 for (@bits) { 1223 for (@bits) {
1258 ++$y; 1224 ++$y;
1259 1225
1260 my $mask = $_->[1]; 1226 my $mask = $_->[1];
1261 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1262 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox 1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1263 state => $::CFG->{pickup} & $mask, 1229 state => $::CFG->{pickup} & $mask,
1264 on_changed => sub { 1230 on_changed => sub {
1265 my ($box, $value) = @_; 1231 my ($box, $value) = @_;
1266 1232
1267 if ($value) { 1233 if ($value) {
… …
1278 1244
1279 ${$_->[2]} = $checkbox if $_->[2]; 1245 ${$_->[2]} = $checkbox if $_->[2];
1280 } 1246 }
1281 } 1247 }
1282 1248
1283 $table->add (2, 18, new CFClient::UI::ValSlider 1249 $table->add (2, 18, new CFPlus::UI::ValSlider
1284 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1285 template => ">= 99", 1251 template => ">= 99",
1286 to_value => sub { ">= " . 5 * $_[0] }, 1252 to_value => sub { ">= " . 5 * $_[0] },
1287 on_changed => sub { 1253 on_changed => sub {
1288 my ($slider, $value) = @_; 1254 my ($slider, $value) = @_;
… …
1291 $::CFG->{pickup} |= int $value 1257 $::CFG->{pickup} |= int $value
1292 if $value; 1258 if $value;
1293 1; 1259 1;
1294 }); 1260 });
1295 1261
1296 $table->add (3, 18, new CFClient::UI::Button 1262 $table->add (3, 18, new CFPlus::UI::Button
1297 text => "set", 1263 text => "set",
1298 on_activate => sub { 1264 on_activate => sub {
1299 $::CONN->send_command ("pickup $::CFG->{pickup}") 1265 $::CONN->send_command ("pickup $::CFG->{pickup}")
1300 if defined $::CONN; 1266 if defined $::CONN;
1301 0 1267 0
1302 }); 1268 });
1303 1269
1304 $table 1270 $table
1305} 1271}
1306 1272
1273my %SORT_ORDER = (
1274 type => undef,
1275 mtime => sub { sort {
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime}
1278 or $a->{type} <=> $b->{type}
1279 } @_ },
1280 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type}
1283 } @_ },
1284);
1285
1307sub inventory_widget { 1286sub inventory_widget {
1308 my $hb = new CFClient::UI::HBox homogeneous => 1; 1287 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1309 1288
1310 $hb->add (my $vb1 = new CFClient::UI::VBox); 1289 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1311 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1290 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1291
1292 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1293
1294 use sort 'stable';
1295
1296 $hb1->add (new CFPlus::UI::Selector
1297 value => $::CFG->{inv_sort},
1298 options => [
1299 [type => "Type/Name"],
1300 [mtime => "Recent/Normal/Locked"],
1301 [weight => "Weight/Type"],
1302 ],
1303 on_changed => sub {
1304 $::CFG->{inv_sort} = $_[1];
1305 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1306 },
1307 );
1308 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1309 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312 $vb1->add ($INV = new CFClient::UI::Inventory); 1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 1314
1314 $hb->add (my $vb2 = new CFClient::UI::VBox); 1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1315 1316
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317 1318
1319 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1318 $vb2->add ($INVR = new CFClient::UI::Inventory); 1320 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1319 1321
1320 # XXX: Call after $INVR = ... because set_opencont sets the items 1322 # XXX: Call after $INVR = ... because set_opencont sets the items
1321 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1322 1324
1323 $hb 1325 $hb
1324} 1326}
1325 1327
1326sub toggle_player_page { 1328sub toggle_player_page {
… …
1333 $PL_WINDOW->show; 1335 $PL_WINDOW->show;
1334 } 1336 }
1335} 1337}
1336 1338
1337sub player_window { 1339sub player_window {
1338 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1339 x => "center", 1341 x => "center",
1340 y => "center", 1342 y => "center",
1341 force_w => $WIDTH * 9/10, 1343 force_w => $WIDTH * 9/10,
1342 force_h => $HEIGHT * 9/10, 1344 force_h => $HEIGHT * 9/10,
1343 title => "Player", 1345 title => "Player",
… …
1345 has_close_button => 1 1347 has_close_button => 1
1346 ; 1348 ;
1347 1349
1348 my $ntb = 1350 my $ntb =
1349 $PL_NOTEBOOK = 1351 $PL_NOTEBOOK =
1350 new CFClient::UI::Notebook 1352 new CFPlus::UI::Notebook expand => 1, debug => 1;
1351 expand => 1,
1352 debug => 1,
1353 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1354 ;
1355 1353
1356 $ntb->add ( 1354 $ntb->add (
1357 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1355 "Statistics (F2)" => $STATS_PAGE = stats_window,
1358 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1356 "Shows statistics, where all your Stats and Resistances are shown."
1359 ); 1357 );
1360 $ntb->add ( 1358 $ntb->add (
1361 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1359 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills."
1361 );
1362
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1365 $ntb->add (
1366 "Spellbook (F4)" => $spellsw,
1362 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1367 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1363 ); 1368 );
1364 $ntb->add ( 1369 $ntb->add (
1365 Inventory => $INVENTORY_PAGE = inventory_widget, 1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1366 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1371 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1367 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1368 ); 1373 );
1369 1374
1370 $ntb->set_current_page ($INVENTORY_PAGE); 1375 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1376sub update_bindings { 1381sub update_bindings {
1377 $BIND_UPD_CB->() if $BIND_UPD_CB; 1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1378} 1383}
1379 1384
1380sub keyboard_setup { 1385sub keyboard_setup {
1381 my $binding_list = new CFClient::UI::VBox; 1386 my $binding_list = new CFPlus::UI::VBox;
1382 1387
1383 my $refresh; 1388 my $refresh;
1384 $refresh = $BIND_UPD_CB = sub { 1389 $refresh = $BIND_UPD_CB = sub {
1385 $binding_list->clear (); 1390 $binding_list->clear ();
1386 1391
… …
1388 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1389 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1391 1396
1392 my $lbl = join "; ", @$cmds; 1397 my $lbl = join "; ", @$cmds;
1393 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); 1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1394 $binding_list->add (my $hb = new CFClient::UI::HBox); 1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1395 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFPlus::UI::Button
1396 text => "delete", 1401 text => "delete",
1397 tooltip => "Deletes the binding", 1402 tooltip => "Deletes the binding",
1398 on_activate => sub { 1403 on_activate => sub {
1399 $binding_list->remove ($hb); 1404 $binding_list->remove ($hb);
1400 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1401 0 1406 0
1402 }); 1407 });
1403 1408
1404 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFPlus::UI::Button
1405 text => "edit", 1410 text => "edit",
1406 tooltip => "Edits the binding", 1411 tooltip => "Edits the binding",
1407 on_activate => sub { 1412 on_activate => sub {
1408 $::BIND_EDITOR->set_binding ( 1413 $::BIND_EDITOR->set_binding (
1409 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
… …
1422 $::BIND_EDITOR->show; 1427 $::BIND_EDITOR->show;
1423 $SETUP_DIALOG->hide; 1428 $SETUP_DIALOG->hide;
1424 0 1429 0
1425 }); 1430 });
1426 1431
1427 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1428 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1429 } 1434 }
1430 } 1435 }
1431 }; 1436 };
1432 1437
1433 my $vb = new CFClient::UI::VBox; 1438 my $vb = new CFPlus::UI::VBox;
1434 $vb->add (my $hb = new CFClient::UI::HBox); 1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1435 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); 1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1436 $hb->add (new CFClient::UI::CheckBox 1441 $hb->add (new CFPlus::UI::CheckBox
1437 expand => 1, 1442 expand => 1,
1438 state => $CFG->{shift_fire_stop}, 1443 state => $CFG->{shift_fire_stop},
1439 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1440 on_changed => sub { 1445 on_changed => sub {
1441 my ($cbox, $value) = @_; 1446 my ($cbox, $value) = @_;
1442 $CFG->{shift_fire_stop} = $value; 1447 $CFG->{shift_fire_stop} = $value;
1443 0 1448 0
1444 }); 1449 });
1445 1450
1446 $vb->add ($binding_list); 1451 $vb->add ($binding_list);
1447 $vb->add (my $hb = new CFClient::UI::HBox); 1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1448 1453
1449 $hb->add (new CFClient::UI::Button 1454 $hb->add (new CFPlus::UI::Button
1450 text => "record new", 1455 text => "record new",
1451 expand => 1, 1456 expand => 1,
1452 tooltip => "This button opens the binding editor with an empty binding.", 1457 tooltip => "This button opens the binding editor with an empty binding.",
1453 on_activate => sub { 1458 on_activate => sub {
1454 $::BIND_EDITOR->set_binding (undef, undef, [], 1459 $::BIND_EDITOR->set_binding (undef, undef, [],
… …
1468 $::BIND_EDITOR->show; 1473 $::BIND_EDITOR->show;
1469 0 1474 0
1470 }, 1475 },
1471 ); 1476 );
1472 1477
1473 $hb->add (new CFClient::UI::Button 1478 $hb->add (new CFPlus::UI::Button
1474 text => "close", 1479 text => "close",
1475 tooltip => "Closes the binding window", 1480 tooltip => "Closes the binding window",
1476 expand => 1, 1481 expand => 1,
1477 on_activate => sub { 1482 on_activate => sub {
1478 $SETUP_DIALOG->hide; 1483 $SETUP_DIALOG->hide;
… …
1484 1489
1485 $vb 1490 $vb
1486} 1491}
1487 1492
1488sub help_window { 1493sub help_window {
1489 my $win = new CFClient::UI::FancyFrame 1494 my $win = new CFPlus::UI::FancyFrame
1490 x => 'center', 1495 x => 'center',
1491 y => 'center', 1496 y => 'center',
1492 z => 2, 1497 z => 2,
1493 name => 'doc_browser', 1498 name => 'doc_browser',
1494 force_w => int $WIDTH * 7/8, 1499 force_w => int $WIDTH * 7/8,
1495 force_h => int $HEIGHT * 7/8, 1500 force_h => int $HEIGHT * 7/8,
1496 title => "Help Browser", 1501 title => "Help Browser",
1497 has_close_button => 1; 1502 has_close_button => 1;
1498 1503
1499 $win->add (my $vbox = new CFClient::UI::VBox); 1504 $win->add (my $vbox = new CFPlus::UI::VBox);
1500 1505
1501 $vbox->add (my $buttons = new CFClient::UI::HBox); 1506 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1502 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1503 expand => 1, fontsize => 0.8, padding_x => 4); 1508 expand => 1, fontsize => 0.8, padding_x => 4);
1504 1509
1505 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1510 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1506 $buttons->add (my $combo = new CFClient::UI::Combobox 1511 $buttons->add (my $combo = new CFPlus::UI::Selector
1507 value => undef, 1512 value => undef,
1508 options => [ 1513 options => [
1509 [intro => "Introduction"], 1514 [intro => "Introduction"],
1510 [manual => "Main Manual"], 1515 [manual => "Main Manual"],
1511 [skill_help => "Skill Reference"], 1516 [skill_help => "Skill Reference"],
… …
1514 [COPYING => "License Terms"], 1519 [COPYING => "License Terms"],
1515 ], 1520 ],
1516 on_changed => sub { 1521 on_changed => sub {
1517 my ($self, $pod) = @_; 1522 my ($self, $pod) = @_;
1518 1523
1519 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1520 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1521
1522 $viewer->clear; 1524 $viewer->clear;
1523 1525 $viewer->add_paragraph (CFPlus::Pod::section_paragraphs pod => $pod);
1524# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1525# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1526# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1527# ]);#d#
1528
1529 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1530 for @$pom;
1531
1532 $viewer->set_offset (0); 1526 $viewer->set_offset (0);
1533 1527
1534 0 1528 0
1535 }, 1529 },
1536 on_visibility_change => sub { 1530 on_visibility_change => sub {
… …
1544 1538
1545 $win 1539 $win
1546} 1540}
1547 1541
1548sub sdl_init { 1542sub sdl_init {
1549 CFClient::SDL_Init 1543 CFPlus::SDL_Init
1550 and die "SDL::Init failed!\n"; 1544 and die "SDL::Init failed!\n";
1551} 1545}
1552 1546
1553sub video_init { 1547sub video_init {
1554 sdl_init; 1548 sdl_init;
… …
1559 1553
1560 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1554 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1561 $FULLSCREEN = $CFG->{fullscreen}; 1555 $FULLSCREEN = $CFG->{fullscreen};
1562 $FAST = $CFG->{fast}; 1556 $FAST = $CFG->{fast};
1563 1557
1564 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1558 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1565 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1559 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1566 1560
1567 $SDL_ACTIVE = 1; 1561 $SDL_ACTIVE = 1;
1568 $LAST_REFRESH = time - 0.01; 1562 $LAST_REFRESH = time - 0.01;
1569 1563
1570 CFClient::OpenGL::init; 1564 CFPlus::OpenGL::init;
1571 1565
1572 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1566 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1573 1567
1574 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1568 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1575 1569
1576 ############################################################################# 1570 #############################################################################
1577 1571
1578 if ($DEBUG_STATUS) { 1572 if ($DEBUG_STATUS) {
1579 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1573 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1580 } else { 1574 } else {
1581 # create the widgets 1575 # create the widgets
1582 1576
1583 $DEBUG_STATUS = new CFClient::UI::Label 1577 $DEBUG_STATUS = new CFPlus::UI::Label
1584 padding => 0, 1578 padding => 0,
1585 z => 100, 1579 z => 100,
1586 force_x => "max", 1580 force_x => "max",
1587 force_y => 0; 1581 force_y => 0;
1588 $DEBUG_STATUS->show; 1582 $DEBUG_STATUS->show;
1589 1583
1590 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); 1584 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1591 1585
1592 $STATUSBOX = new CFClient::UI::Statusbox; 1586 $STATUSBOX = new CFPlus::UI::Statusbox;
1593 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1587 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1594 1588
1595 (new CFClient::UI::Frame 1589 (new CFPlus::UI::Frame
1596 bg => [0, 0, 0, 0.4], 1590 bg => [0, 0, 0, 0.4],
1597 force_x => 0, 1591 force_x => 0,
1598 force_y => "max", 1592 force_y => "max",
1599 child => $STATUSBOX, 1593 child => $STATUSBOX,
1600 )->show; 1594 )->show;
1601 1595
1602 CFClient::UI::FancyFrame->new ( 1596 CFPlus::UI::FancyFrame->new (
1603 title => "Map", 1597 title => "Map",
1604 name => "mapmap", 1598 name => "mapmap",
1605 x => 0, 1599 x => 0,
1606 y => $FONTSIZE + 8, 1600 y => $FONTSIZE + 8,
1607 border_bg => [1, 1, 1, 192/255], 1601 border_bg => [1, 1, 1, 192/255],
1608 bg => [1, 1, 1, 0], 1602 bg => [1, 1, 1, 0],
1609 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1603 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1610 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1604 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1611 ), 1605 ),
1612 )->show; 1606 )->show;
1613 1607
1614 $MAPWIDGET = new CFClient::MapWidget; 1608 $MAPWIDGET = new CFPlus::MapWidget;
1615 $MAPWIDGET->connect (activate_console => sub { 1609 $MAPWIDGET->connect (activate_console => sub {
1616 my ($mapwidget, $preset) = @_; 1610 my ($mapwidget, $preset) = @_;
1617 1611
1618 if ($CONSOLE) { 1612 if ($CONSOLE) {
1619 $CONSOLE->{input}->{auto_activated} = 1; 1613 $CONSOLE->{input}->{auto_activated} = 1;
… …
1625 } 1619 }
1626 }); 1620 });
1627 $MAPWIDGET->show; 1621 $MAPWIDGET->show;
1628 $MAPWIDGET->grab_focus; 1622 $MAPWIDGET->grab_focus;
1629 1623
1630 $LOGVIEW = new CFClient::UI::TextScroller 1624 $LOGVIEW = new CFPlus::UI::TextScroller
1631 expand => 1, 1625 expand => 1,
1632 font => $FONT_FIXED, 1626 font => $FONT_FIXED,
1633 fontsize => $::CFG->{log_fontsize}, 1627 fontsize => $::CFG->{log_fontsize},
1634 indent => -4, 1628 indent => -4,
1635 can_hover => 1, 1629 can_hover => 1,
1636 can_events => 1, 1630 can_events => 1,
1637 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1631 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1638 ; 1632 ;
1639 1633
1640 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1634 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1641 title => "Setup", 1635 title => "Setup",
1642 name => "setup_dialog", 1636 name => "setup_dialog",
1643 x => 'center', 1637 x => 'center',
1644 y => 'center', 1638 y => 'center',
1645 z => 2, 1639 z => 2,
… …
1648 has_close_button => 1, 1642 has_close_button => 1,
1649 ; 1643 ;
1650 1644
1651 $METASERVER = metaserver_dialog; 1645 $METASERVER = metaserver_dialog;
1652 1646
1653 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1647 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1654 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1648 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1655 1649
1656 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1650 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1657 "Configure the server to play on, your username, password and other server-related options."); 1651 "Configure the server to play on, your username, password and other server-related options.");
1658 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1652 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1659 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1653 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
… …
1669 . "After pressing the combo the binding will be saved automatically and the " 1663 . "After pressing the combo the binding will be saved automatically and the "
1670 . "binding editor closes"); 1664 . "binding editor closes");
1671 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1665 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1672 "Some debuggin' options. Do not ask."); 1666 "Some debuggin' options. Do not ask.");
1673 1667
1674 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1668 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1675 1669
1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1670 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1677 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1671 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1678 1672
1679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1673 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1680 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1674 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1681 1675
1682 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1676 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1683 1677
1684 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1678 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1685 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1679 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1686 1680
1687 $BUTTONBAR->add (new CFClient::UI::Button 1681 $BUTTONBAR->add (new CFPlus::UI::Button
1688 text => "Save Config", 1682 text => "Save Config",
1689 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1683 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1690 on_activate => sub { 1684 on_activate => sub {
1691 $::CFG->{layout} = CFClient::UI::get_layout; 1685 $::CFG->{layout} = CFPlus::UI::get_layout;
1692 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1686 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1693 status "Configuration Saved"; 1687 status "Configuration Saved";
1694 0 1688 0
1695 }, 1689 },
1696 ); 1690 );
1697 1691
1698 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1699 tooltip => "View Documentation"); 1693 tooltip => "View Documentation");
1700 1694
1701 $BUTTONBAR->add (new CFClient::UI::Button 1695 $BUTTONBAR->add (new CFPlus::UI::Button
1702 text => "Quit", 1696 text => "Quit",
1703 tooltip => "Terminates the program", 1697 tooltip => "Terminates the program",
1704 on_activate => sub { 1698 on_activate => sub {
1705 if ($CONN) { 1699 if ($CONN) {
1706 open_quit_dialog; 1700 open_quit_dialog;
… …
1717 1711
1718 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1712 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1719} 1713}
1720 1714
1721sub video_shutdown { 1715sub video_shutdown {
1722 CFClient::OpenGL::shutdown; 1716 CFPlus::OpenGL::shutdown;
1723 1717
1724 undef $SDL_ACTIVE; 1718 undef $SDL_ACTIVE;
1725} 1719}
1726 1720
1727my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1721my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
… …
1735 1729
1736sub audio_music_finished { 1730sub audio_music_finished {
1737 return unless $CFG->{bgm_enable}; 1731 return unless $CFG->{bgm_enable};
1738 1732
1739 # TODO: hack, do play loop and mood music 1733 # TODO: hack, do play loop and mood music
1740 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1734 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1741 $bgmusic->play (0); 1735 $bgmusic->play (0);
1742 1736
1743 push @bgmusic, shift @bgmusic; 1737 push @bgmusic, shift @bgmusic;
1744} 1738}
1745 1739
1746sub audio_init { 1740sub audio_init {
1747 if ($CFG->{audio_enable}) { 1741 if ($CFG->{audio_enable}) {
1748 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1742 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1749 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1743 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1750 1744
1751 unless ($SDL_MIXER) { 1745 unless ($SDL_MIXER) {
1752 status "Unable to open sound device: there will be no sound"; 1746 status "Unable to open sound device: there will be no sound";
1753 return; 1747 return;
1754 } 1748 }
1755 1749
1756 CFClient::Mix_AllocateChannels 8; 1750 CFPlus::Mix_AllocateChannels 8;
1757 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1751 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1758 1752
1759 audio_music_finished; 1753 audio_music_finished;
1760 1754
1761 while (<$fh>) { 1755 while (<$fh>) {
1762 next if /^\s*#/; 1756 next if /^\s*#/;
… …
1765 my ($file, $volume, $event) = split /\s+/, $_, 3; 1759 my ($file, $volume, $event) = split /\s+/, $_, 3;
1766 1760
1767 push @SOUNDS, "$volume,$file"; 1761 push @SOUNDS, "$volume,$file";
1768 1762
1769 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1763 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1770 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1764 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1771 $chunk->volume ($volume * 128 / 100); 1765 $chunk->volume ($volume * 128 / 100);
1772 $chunk 1766 $chunk
1773 }; 1767 };
1774 } 1768 }
1775 } else { 1769 } else {
… …
1777 } 1771 }
1778 } 1772 }
1779} 1773}
1780 1774
1781sub audio_shutdown { 1775sub audio_shutdown {
1782 CFClient::Mix_CloseAudio if $SDL_MIXER; 1776 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1783 undef $SDL_MIXER; 1777 undef $SDL_MIXER;
1784 @SOUNDS = (); 1778 @SOUNDS = ();
1785 %AUDIO_CHUNKS = (); 1779 %AUDIO_CHUNKS = ();
1786} 1780}
1787 1781
… …
1794 1788
1795sub force_refresh { 1789sub force_refresh {
1796 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1790 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1797 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1791 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1798 1792
1799 $CFClient::UI::ROOT->draw; 1793 $CFPlus::UI::ROOT->draw;
1800 1794
1801 $WANT_REFRESH = 0; 1795 $WANT_REFRESH = 0;
1802 $CAN_REFRESH = 0; 1796 $CAN_REFRESH = 0;
1803 $LAST_REFRESH = $NOW; 1797 $LAST_REFRESH = $NOW;
1804 1798
18050 && do {
1806 # some weird model-drawing code, just a joke right now
1807 use CFClient::OpenGL;
1808
1809 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1810 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1811 $demo{r} ||= do {
1812 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1813 $mod->{v} = pack "f*", @{$mod->{v}};
1814 $_ = [scalar @$_, pack "S!*", @$_]
1815 for values %{$mod->{g}};
1816 $mod
1817 };
1818
1819 my $r = $demo{r} or die;
1820
1821 glDepthMask 1;
1822 glClear GL_DEPTH_BUFFER_BIT;
1823 glEnable GL_TEXTURE_2D;
1824 glEnable GL_DEPTH_TEST;
1825 glEnable GL_CULL_FACE;
1826 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1827
1828 glMatrixMode GL_PROJECTION;
1829 glLoadIdentity;
1830 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1831 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1832 glMatrixMode GL_MODELVIEW;
1833 glLoadIdentity;
1834
1835 glPushMatrix;
1836 glTranslate 0, 0, -800;
1837 glScale 1, -1, 1;
1838 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1839 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1840 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1841 glScale 50, 50, 50;
1842
1843 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1844 while (my ($k, $v) = each %{$r->{g}}) {
1845 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1846 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1847 }
1848
1849 glPopMatrix;
1850
1851 glShadeModel GL_FLAT;
1852 glDisable GL_DEPTH_TEST;
1853 glDisable GL_TEXTURE_2D;
1854 glDepthMask 0;
1855
1856 $WANT_REFRESH++;
1857};
1858
1859 CFClient::SDL_GL_SwapBuffers; 1799 CFPlus::SDL_GL_SwapBuffers;
1860} 1800}
1861 1801
1862my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1802my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1863 $NOW = time; 1803 $NOW = time;
1864 1804
1865 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1805 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1866 for CFClient::SDL_PollEvent; 1806 for CFPlus::SDL_PollEvent;
1867 1807
1868 if (%animate_object) { 1808 if (%animate_object) {
1869 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1809 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1870 $WANT_REFRESH++; 1810 $WANT_REFRESH++;
1871 } 1811 }
… …
1895 $CONN->face_prefetch 1835 $CONN->face_prefetch
1896 if $CONN; 1836 if $CONN;
1897}); 1837});
1898 1838
1899%SDL_CB = ( 1839%SDL_CB = (
1900 CFClient::SDL_QUIT => sub { 1840 CFPlus::SDL_QUIT => sub {
1901 Event::unloop -1; 1841 Event::unloop -1;
1902 }, 1842 },
1903 CFClient::SDL_VIDEORESIZE => sub { 1843 CFPlus::SDL_VIDEORESIZE => sub {
1904 }, 1844 },
1905 CFClient::SDL_VIDEOEXPOSE => sub { 1845 CFPlus::SDL_VIDEOEXPOSE => sub {
1906 CFClient::UI::full_refresh; 1846 CFPlus::UI::full_refresh;
1907 }, 1847 },
1908 CFClient::SDL_ACTIVEEVENT => sub { 1848 CFPlus::SDL_ACTIVEEVENT => sub {
1909# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1849# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1910 }, 1850 },
1911 CFClient::SDL_KEYDOWN => sub { 1851 CFPlus::SDL_KEYDOWN => sub {
1912 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1852 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1913 # alt-enter 1853 # alt-enter
1854 $FULLSCREEN_ENABLE->toggle;
1914 video_shutdown; 1855 video_shutdown;
1915 $CFG->{fullscreen} = !$CFG->{fullscreen};
1916 video_init; 1856 video_init;
1917 } else { 1857 } else {
1918 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1858 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1919 } 1859 }
1920 }, 1860 },
1921 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1861 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1922 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1862 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1923 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1863 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1924 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1864 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1925 CFClient::SDL_USEREVENT => sub { 1865 CFPlus::SDL_USEREVENT => sub {
1926 if ($_[0]{code} == 1) { 1866 if ($_[0]{code} == 1) {
1927 audio_channel_finished $_[0]{data1}; 1867 audio_channel_finished $_[0]{data1};
1928 } elsif ($_[0]{code} == 0) { 1868 } elsif ($_[0]{code} == 0) {
1929 audio_music_finished; 1869 audio_music_finished;
1930 } 1870 }
… …
1934############################################################################# 1874#############################################################################
1935 1875
1936$SIG{INT} = $SIG{TERM} = sub { exit }; 1876$SIG{INT} = $SIG{TERM} = sub { exit };
1937 1877
1938{ 1878{
1939 local $SIG{__DIE__} = sub {
1940 return unless defined $^S && !$^S;
1941 Carp::confess $_[1];#d#TODO: remove when stable
1942 CFClient::fatal $_[0];
1943 };
1944
1945 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1879 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1946 CFClient::UI::set_layout ($::CFG->{layout}); 1880 CFPlus::UI::set_layout ($::CFG->{layout});
1947 1881
1948 my %DEF_CFG = ( 1882 my %DEF_CFG = (
1949 sdl_mode => 0, 1883 sdl_mode => 0,
1950 width => 640, 1884 width => 640,
1951 height => 480, 1885 height => 480,
… …
1967 bgm_volume => 0.25, 1901 bgm_volume => 0.25,
1968 face_prefetch => 0, 1902 face_prefetch => 0,
1969 output_sync => 1, 1903 output_sync => 1,
1970 output_count => 1, 1904 output_count => 1,
1971 pickup => 0, 1905 pickup => 0,
1906 inv_sort => "mtime",
1972 default => "profile", # default profile 1907 default => "profile", # default profile
1973 ); 1908 );
1974 1909
1975 while (my ($k, $v) = each %DEF_CFG) { 1910 while (my ($k, $v) = each %DEF_CFG) {
1976 $CFG->{$k} = $v unless exists $CFG->{$k}; 1911 $CFG->{$k} = $v unless exists $CFG->{$k};
… …
1980 1915
1981 sdl_init; 1916 sdl_init;
1982 1917
1983 @SDL_MODES = reverse 1918 @SDL_MODES = reverse
1984 grep $_->[0] >= 640 && $_->[1] >= 480, 1919 grep $_->[0] >= 640 && $_->[1] >= 480,
1985 CFClient::SDL_ListModes; 1920 CFPlus::SDL_ListModes;
1986 1921
1987 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1922 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1988 1923
1989 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1990 1925
1991 { 1926 {
1992 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1927 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1993 DejaVuSans.ttf 1928 DejaVuSans.ttf
1994 DejaVuSansMono.ttf 1929 DejaVuSansMono.ttf
1995 DejaVuSans-Bold.ttf 1930 DejaVuSans-Bold.ttf
1996 DejaVuSansMono-Bold.ttf 1931 DejaVuSansMono-Bold.ttf
1997 DejaVuSans-Oblique.ttf 1932 DejaVuSans-Oblique.ttf
1998 DejaVuSansMono-Oblique.ttf 1933 DejaVuSansMono-Oblique.ttf
1999 DejaVuSans-BoldOblique.ttf 1934 DejaVuSans-BoldOblique.ttf
2000 DejaVuSansMono-BoldOblique.ttf 1935 DejaVuSansMono-BoldOblique.ttf
2001 ); 1936 );
2002 1937
2003 CFClient::add_font $_ for @fonts; 1938 CFPlus::add_font $_ for @fonts;
2004 1939
2005 CFClient::pango_init; 1940 CFPlus::pango_init;
2006 1941
2007 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1942 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2008 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1943 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2009 1944
2010 $FONT_PROP->make_default; 1945 $FONT_PROP->make_default;
2011 } 1946 }
2012 1947
2013# compare mono (ft) vs. rgba (cairo) 1948# compare mono (ft) vs. rgba (cairo)
2014# ft - 1.8s, cairo 3s, even in alpha-only mode 1949# ft - 1.8s, cairo 3s, even in alpha-only mode
2015# for my $rgba (0..1) { 1950# for my $rgba (0..1) {
2016# my $t1 = Time::HiRes::time; 1951# my $t1 = Time::HiRes::time;
2017# for (1..1000) { 1952# for (1..1000) {
2018# my $layout = CFClient::Layout->new ($rgba); 1953# my $layout = CFPlus::Layout->new ($rgba);
2019# $layout->set_text ("hallo" x 100); 1954# $layout->set_text ("hallo" x 100);
2020# $layout->render; 1955# $layout->render;
2021# } 1956# }
2022# my $t2 = Time::HiRes::time; 1957# my $t2 = Time::HiRes::time;
2023# warn $t2-$t1; 1958# warn $t2-$t1;
… …
2026 video_init; 1961 video_init;
2027 audio_init; 1962 audio_init;
2028} 1963}
2029 1964
2030Event::loop; 1965Event::loop;
2031#CFClient::SDL_Quit; 1966#CFPlus::SDL_Quit;
2032#CFClient::_exit 0; 1967#CFPlus::_exit 0;
2033 1968
2034END { CFClient::SDL_Quit } 1969END { CFPlus::SDL_Quit }
2035 1970
2036=head1 NAME 1971=head1 NAME
2037 1972
2038cfplus - A Crossfire+ and Crossfire game client 1973cfplus - A Crossfire+ and Crossfire game client
2039 1974

Diff Legend

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