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

Diff Legend

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