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

Diff Legend

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