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

Diff Legend

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