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

Diff Legend

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