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.64 by root, Wed Jun 7 06:28:30 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 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 271 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
247 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 274 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248 [7 => "Cha", "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
… …
854 "The time this server has been running without being restarted.", 868 "The time this server has been running without being restarted.",
855 "The server software version - a '+' indicates a Crossfire+ server.", 869 "The server software version - a '+' indicates a Crossfire+ server.",
856 "Short information about this server provided by its admins.", 870 "Short information about this server provided by its admins.",
857 ); 871 );
858 my @col = qw(#Users Host Uptime Version Description); 872 my @col = qw(#Users Host Uptime Version Description);
859 $table->add ($_, 0, new CFClient::UI::Label 873 $table->add ($_, 0, new CFPlus::UI::Label
860 can_hover => 1, can_events => 1, 874 can_hover => 1, can_events => 1,
861 align => 0, fg => [1, 1, 0], 875 align => 0, fg => [1, 1, 0],
862 text => $col[$_], tooltip => $tip[$_]) 876 text => $col[$_], tooltip => $tip[$_])
863 for 0 .. $#col; 877 for 0 .. $#col;
864 878
… …
885 899
886 $m = [$users, $host, $uptime, $version, $desc]; 900 $m = [$users, $host, $uptime, $version, $desc];
887 901
888 $y++; 902 $y++;
889 903
890 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 904 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
891 (new CFClient::UI::Button 905 (new CFPlus::UI::Button
892 text => "Use", 906 text => "Use",
893 tooltip => "Put this server into the <b>Host:Port</b> field", 907 tooltip => "Put this server into the <b>Host:Port</b> field",
894 on_activate => sub { 908 on_activate => sub {
895 $HOST_ENTRY->set_text ($CFG->{host} = $host); 909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
896 $METASERVER->hide; 910 $METASERVER->hide;
911 0
897 }, 912 },
898 ), 913 ),
899 (new CFClient::UI::Empty expand => 1), 914 (new CFPlus::UI::Empty expand => 1),
900 ]); 915 ]);
901 916
902 $table->add ($_, $y, new CFClient::UI::Label 917 $table->add ($_, $y, new CFPlus::UI::Label
903 ellipsise => 0, 918 ellipsise => 0,
904 align => $align[$_], 919 align => $align[$_],
905 text => $m->[$_], 920 text => $m->[$_],
906 tooltip => $tip[$_], 921 tooltip => $tip[$_],
907 can_hover => 1, 922 can_hover => 1,
… …
912 } 927 }
913 }); 928 });
914} 929}
915 930
916sub 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
917 my $dialog = new CFClient::UI::FancyFrame 936 my $dialog = new CFPlus::UI::FancyFrame
918 title => "Server List", 937 title => "Server List",
919 name => 'metaserver_dialog', 938 name => 'metaserver_dialog',
920 x => 'center', 939 x => 'center',
921 y => 'center', 940 y => 'center',
922 z => 3, 941 z => 3,
923 force_h => $::HEIGHT * 0.4, 942 force_h => $::HEIGHT * 0.4,
924 child => (my $vbox = new CFClient::UI::VBox), 943 child => $vbox,
944 has_close_button => 1,
945 table => $table,
925 on_visibility_change => sub { 946 on_visibility_change => sub {
926 update_metaserver if $_[1]; 947 update_metaserver ($_[0]) if $_[1];
948 0
927 }, 949 },
928 ; 950 ;
929 951
930 $dialog->{table} = new CFClient::UI::Table;
931
932 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
933
934 $dialog 952 $dialog
935} 953}
936 954
937sub server_setup { 955sub server_setup {
938 my $vbox = new CFClient::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
939 957
940 $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]);
941 $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");
942 960
943 { 961 {
944 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
945 963
946 $vbox->add ( 964 $vbox->add (
947 $HOST_ENTRY = new CFClient::UI::Entry 965 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 966 expand => 1,
949 text => $CFG->{host}, 967 text => $CFG->{profile}{default}{host},
950 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",
951 on_changed => sub { 969 on_changed => sub {
952 my ($self, $value) = @_; 970 my ($self, $value) = @_;
953 $CFG->{host} = $value; 971 $CFG->{profile}{default}{host} = $value;
972 0
954 } 973 }
955 ); 974 );
956 975
957 $METASERVER = metaserver_dialog;
958
959 $vbox->add (new CFClient::UI::Button 976 $vbox->add (new CFPlus::UI::Button
960 expand => 1, 977 expand => 1,
961 text => "Server List", 978 text => "Server List",
962 other => $METASERVER, 979 other => $METASERVER,
963 tooltip => "Show a list of available crossfire servers", 980 tooltip => "Show a list of available crossfire servers",
964 on_activate => sub { $METASERVER->toggle_visibility }, 981 on_activate => sub { $METASERVER->toggle_visibility; 0 },
965 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
966 ); 983 );
967 } 984 }
968 985
969 $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");
970 $table->add (1, 4, new CFClient::UI::Entry 987 $table->add (1, 4, new CFPlus::UI::Entry
971 text => $CFG->{user}, 988 text => $CFG->{profile}{default}{user},
972 tooltip => "The name of your character on the server", 989 tooltip => "The name of your character on the server",
973 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
974 my ($self, $value) = @_;
975 $CFG->{user} = $value;
976 }
977 ); 991 );
978 992
979 $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");
980 $table->add (1, 5, new CFClient::UI::Entry 994 $table->add (1, 5, new CFPlus::UI::Entry
981 text => $CFG->{password}, 995 text => $CFG->{profile}{default}{password},
982 hidden => 1, 996 hidden => 1,
983 tooltip => "The password for your character", 997 tooltip => "The password for your character",
984 on_changed => sub { 998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
985 my ($self, $value) = @_;
986 $CFG->{password} = $value;
987 }
988 ); 999 );
989 1000
990 $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");
991 $table->add (1, 7, new CFClient::UI::Slider 1002 $table->add (1, 7, new CFPlus::UI::Slider
992 force_w => 100, 1003 force_w => 100,
993 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1004 range => [$CFG->{mapsize}, 10, 100, 0, 1],
994 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. "
995 . "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, "
996 . "but you also increase bandwidth requirements and latency. " 1007 . "but you also increase bandwidth requirements and latency. "
997 . "This option is only used once at log-in.", 1008 . "This option is only used once at log-in.",
998 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
999 my ($self, $value) = @_;
1000
1001 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1002 },
1003 ); 1010 );
1004 1011
1005 $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");
1006 $table->add (1, 8, new CFClient::UI::CheckBox 1013 $table->add (1, 8, new CFPlus::UI::CheckBox
1007 state => $CFG->{face_prefetch}, 1014 state => $CFG->{face_prefetch},
1008 tooltip => "<b>Background Image Prefetch</b>\n\n" 1015 tooltip => "<b>Background Image Prefetch</b>\n\n"
1009 . "If enabled, the client automatically pre-fetches images from the server. " 1016 . "If enabled, the client automatically pre-fetches images from the server. "
1010 . "This might increase or create lag, but increases the chances " 1017 . "This might increase or create lag, but increases the chances "
1011 . "of faces being ready for display when you encounter them. " 1018 . "of faces being ready for display when you encounter them. "
1012 . "It also uses up server bandwidth on every connect, " 1019 . "It also uses up server bandwidth on every connect, "
1013 . "so only set it if you really need to prefetch images. " 1020 . "so only set it if you really need to prefetch images. "
1014 . "This option can be set and unset any time.", 1021 . "This option can be set and unset any time.",
1015 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016 ); 1023 );
1017 1024
1018 $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");
1019 $table->add (1, 9, new CFClient::UI::Entry 1026 $table->add (1, 9, new CFPlus::UI::Entry
1020 text => $CFG->{output_count}, 1027 text => $CFG->{output_count},
1021 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.",
1022 on_changed => sub { $CFG->{output_count} = $_[1] }, 1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023 ); 1030 );
1024 1031
1025 $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");
1026 $table->add (1, 10, new CFClient::UI::Entry 1033 $table->add (1, 10, new CFPlus::UI::Entry
1027 text => $CFG->{output_sync}, 1034 text => $CFG->{output_sync},
1028 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.",
1029 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030 ); 1037 );
1031 1038
1032 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033 expand => 1, 1040 expand => 1,
1034 align => 0, 1041 align => 0,
1035 text => "Login", 1042 text => "Login",
1036 on_activate => sub { 1043 on_activate => sub {
1037 $CONN ? stop_game 1044 $CONN ? stop_game
1038 : start_game; 1045 : start_game;
1046 0
1039 }, 1047 },
1040 ); 1048 );
1041 1049
1042 $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");
1043 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1044 text => $CFG->{say_command}, 1052 text => $CFG->{say_command},
1045 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. "
1046 . "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. "
1047 . "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.",
1048 on_changed => sub { 1056 on_changed => sub {
1049 my ($self, $value) = @_; 1057 my ($self, $value) = @_;
1050 $CFG->{say_command} = $value; 1058 $CFG->{say_command} = $value;
1059 0
1051 } 1060 }
1052 ); 1061 );
1053 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
1054 $vbox 1072 $vbox
1055} 1073}
1056 1074
1057sub message_window { 1075sub message_window {
1058 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFPlus::UI::FancyFrame
1059 name => "message_window", 1077 name => "message_window",
1060 title => "Messages", 1078 title => "Messages",
1061 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1062 bg => [0, 0, 0, 0.75],
1063 x => "max", 1080 x => "max",
1064 y => 0, 1081 y => 0,
1065 force_w => $::WIDTH * 0.4, 1082 force_w => $::WIDTH * 0.4,
1066 force_h => $::HEIGHT * 0.5, 1083 force_h => $::HEIGHT * 0.5,
1067 child => (my $vbox = new CFClient::UI::VBox); 1084 child => (my $vbox = new CFPlus::UI::VBox),
1085 has_close_button => 1;
1068 1086
1069 $vbox->add ($LOGVIEW); 1087 $vbox->add ($LOGVIEW);
1070 1088
1071 $vbox->add (my $input = new CFClient::UI::Entry 1089 $vbox->add (my $input = new CFPlus::UI::Entry
1072 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> "
1073 . "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>...). "
1074 . "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). "
1075 . "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.",
1076 on_focus_in => sub { 1094 on_focus_in => sub {
… …
1080 1098
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1099 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1; 1100 $input->{refocus_map} = 1;
1083 } 1101 }
1084 delete $input->{auto_activated}; 1102 delete $input->{auto_activated};
1103
1104 0
1085 }, 1105 },
1086 on_activate => sub { 1106 on_activate => sub {
1087 my ($input, $text) = @_; 1107 my ($input, $text) = @_;
1088 $input->set_text (''); 1108 $input->set_text ('');
1089 1109
… …
1095 } 1115 }
1096 if ($input->{refocus_map}) { 1116 if ($input->{refocus_map}) {
1097 delete $input->{refocus_map}; 1117 delete $input->{refocus_map};
1098 $MAPWIDGET->focus_in 1118 $MAPWIDGET->focus_in
1099 } 1119 }
1120
1121 0
1100 }, 1122 },
1101 on_escape => sub { 1123 on_escape => sub {
1102 $MAPWIDGET->focus_in 1124 $MAPWIDGET->grab_focus;
1125
1126 0
1103 }, 1127 },
1104 ); 1128 );
1105 1129
1106 $CONSOLE = { 1130 $CONSOLE = {
1107 window => $window, 1131 window => $window,
… …
1111 $window 1135 $window
1112} 1136}
1113 1137
1114sub open_quit_dialog { 1138sub open_quit_dialog {
1115 unless ($QUIT_DIALOG) { 1139 unless ($QUIT_DIALOG) {
1116 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1140 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1117 x => "center", 1141 x => "center",
1118 y => "center", 1142 y => "center",
1119 z => 50, 1143 z => 50,
1120 title => "Really Quit?", 1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1121 ; 1149 ;
1122 1150
1123 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1151 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1124 1152
1125 $vb->add (new CFClient::UI::Label 1153 $vb->add (new CFPlus::UI::Label
1126 text => "You should find a savebed and apply it first!", 1154 text => "You should find a savebed and apply it first!",
1127 max_w => $WIDTH * 0.25, 1155 max_w => $WIDTH * 0.25,
1128 ellipsize => 0, 1156 ellipsize => 0,
1129 ); 1157 );
1130 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1158 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1131 $hb->add (new CFClient::UI::Button 1159 $hb->add (new CFPlus::UI::Button
1132 text => "Ok", 1160 text => "Ok",
1133 expand => 1, 1161 expand => 1,
1134 on_activate => sub { $QUIT_DIALOG->hide }, 1162 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1135 ); 1163 );
1136 $hb->add (new CFClient::UI::Button 1164 $hb->add (new CFPlus::UI::Button
1137 text => "Quit anyway", 1165 text => "Quit anyway",
1138 expand => 1, 1166 expand => 1,
1139 on_activate => sub { exit }, 1167 on_activate => sub { exit },
1140 ); 1168 );
1141 } 1169 }
1142 1170
1143 $QUIT_DIALOG->show; 1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1144} 1173}
1145 1174
1146sub autopickup_setup { 1175sub autopickup_setup {
1147 my $table = new CFClient::UI::Table; 1176 my $table = new CFPlus::UI::Table;
1148 1177
1149 for ( 1178 for (
1150 ["General", 0, 0, 1179 ["General", 0, 0,
1151 ["Enable autopickup" => PICKUP_NEWMODE], 1180 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1152 ["Inhibit autopickup" => PICKUP_INHIBIT], 1181 ["Inhibit autopickup" => PICKUP_INHIBIT],
1153 ["Stop before pickup" => PICKUP_STOP], 1182 ["Stop before pickup" => PICKUP_STOP],
1154 ["Debug autopickup" => PICKUP_DEBUG], 1183 ["Debug autopickup" => PICKUP_DEBUG],
1155 ], 1184 ],
1156 ["Weapons", 0, 6, 1185 ["Weapons", 0, 6,
… …
1182 ["Potions" => PICKUP_POTION], 1211 ["Potions" => PICKUP_POTION],
1183 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1212 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1184 ["Ignore cursed" => PICKUP_NOT_CURSED], 1213 ["Ignore cursed" => PICKUP_NOT_CURSED],
1185 ["Jewelery" => PICKUP_JEWELS], 1214 ["Jewelery" => PICKUP_JEWELS],
1186 ], 1215 ],
1216 ["Weight/Value ratio", 2, 17]
1187 ) 1217 )
1188 { 1218 {
1189 my ($title, $x, $y, @bits) = @$_; 1219 my ($title, $x, $y, @bits) = @$_;
1190 $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]);
1191 1221
1192 for (@bits) { 1222 for (@bits) {
1193 ++$y; 1223 ++$y;
1194 1224
1195 my $mask = $_->[1]; 1225 my $mask = $_->[1];
1196 $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);
1197 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1227 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1198 state => $CFG->{pickup} & $mask, 1228 state => $::CFG->{pickup} & $mask,
1199 on_changed => sub { 1229 on_changed => sub {
1200 my ($box, $value) = @_; 1230 my ($box, $value) = @_;
1201 1231
1202 if ($value) { 1232 if ($value) {
1203 $::CFG->{pickup} |= $mask; 1233 $::CFG->{pickup} |= $mask;
… …
1205 $::CFG->{pickup} &= ~$mask; 1235 $::CFG->{pickup} &= ~$mask;
1206 } 1236 }
1207 1237
1208 $::CONN->send_command ("pickup $::CFG->{pickup}") 1238 $::CONN->send_command ("pickup $::CFG->{pickup}")
1209 if defined $::CONN; 1239 if defined $::CONN;
1240
1241 0
1210 }); 1242 });
1243
1244 ${$_->[2]} = $checkbox if $_->[2];
1211 } 1245 }
1212 } 1246 }
1213 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
1214 $table 1269 $table
1215} 1270}
1216 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
1217sub 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 {
1218 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1339 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1219 x => "center", 1340 x => "center",
1220 y => "center", 1341 y => "center",
1221 force_w => $WIDTH * 9/10, 1342 force_w => $WIDTH * 9/10,
1222 force_h => $HEIGHT * 9/10, 1343 force_h => $HEIGHT * 9/10,
1223 title => "Inventory", 1344 title => "Player",
1345 name => "playerbook",
1346 has_close_button => 1
1224 ; 1347 ;
1225 1348
1226 $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;
1227 1352
1228 $hb->add (my $vb1 = new CFClient::UI::VBox); 1353 $ntb->add (
1229 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1354 "Statistics (F2)" => $STATS_PAGE = stats_window,
1230 $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 );
1231 1361
1232 $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 );
1233 1373
1234 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1374 $ntb->set_current_page ($INVENTORY_PAGE);
1235 1375
1236 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1376 $plwin->add ($ntb);
1237 1377 $plwin
1238 # XXX: Call after $INVR = ... because set_opencont sets the items
1239 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1240
1241 $invwin
1242} 1378}
1243 1379
1244sub spell_setup { 1380sub update_bindings {
1245 new CFClient::UI::SpellList 1381 $BIND_UPD_CB->() if $BIND_UPD_CB;
1246} 1382}
1247 1383
1248sub keyboard_setup { 1384sub keyboard_setup {
1249 my $binding_list = new CFClient::UI::VBox; 1385 my $binding_list = new CFPlus::UI::VBox;
1250 1386
1251 my $refresh; 1387 my $refresh;
1252 $refresh = sub { 1388 $refresh = $BIND_UPD_CB = sub {
1253 $binding_list->clear (); 1389 $binding_list->clear ();
1254 1390
1255 for my $mod (keys %{$::CFG->{bindings}}) { 1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1256 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1257 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1258 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1259 1395
1260 my $lbl = join "; ", @$cmds; 1396 my $lbl = join "; ", @$cmds;
1261 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1397 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1262 $binding_list->add (my $hb = new CFClient::UI::HBox); 1398 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1263 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFPlus::UI::Button
1264 text => "delete", 1400 text => "delete",
1265 tooltip => "Deletes the binding", 1401 tooltip => "Deletes the binding",
1266 on_activate => sub { 1402 on_activate => sub {
1267 $binding_list->remove ($hb); 1403 $binding_list->remove ($hb);
1268 delete $::CFG->{bindings}->{$mod}->{$sym}; 1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405 0
1269 }); 1406 });
1270 1407
1271 $hb->add (new CFClient::UI::Button 1408 $hb->add (new CFPlus::UI::Button
1272 text => "edit", 1409 text => "edit",
1273 tooltip => "Edits the binding", 1410 tooltip => "Edits the binding",
1274 on_activate => sub { 1411 on_activate => sub {
1275 $::BIND_EDITOR->set_binding ( 1412 $::BIND_EDITOR->set_binding (
1276 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1277 sub { 1414 sub {
1278 my ($nmod, $nsym, $ncmds) = @_; 1415 my ($nmod, $nsym, $ncmds) = @_;
1279 delete $::CFG->{bindings}->{$mod}->{$sym}; 1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1280 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1281 $refresh->(); 1418 $refresh->();
1282 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1283 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1284 }, 1421 },
1285 sub { 1422 sub {
1286 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1287 $SETUP_DIALOG->show; 1424 $SETUP_DIALOG->show;
1288 }); 1425 });
1289 $::BIND_EDITOR->show; 1426 $::BIND_EDITOR->show;
1290 $SETUP_DIALOG->hide; 1427 $SETUP_DIALOG->hide;
1428 0
1291 }); 1429 });
1292 1430
1293 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1431 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1294 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1432 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1295 } 1433 }
1296 } 1434 }
1297 }; 1435 };
1298 1436
1299 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
1300 $vb->add ($binding_list); 1450 $vb->add ($binding_list);
1301 $vb->add (my $hb = new CFClient::UI::HBox); 1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1302 1452
1303 $hb->add (new CFClient::UI::Button 1453 $hb->add (new CFPlus::UI::Button
1304 text => "record new", 1454 text => "record new",
1305 expand => 1, 1455 expand => 1,
1306 tooltip => "This button opens the binding editor with an empty binding.", 1456 tooltip => "This button opens the binding editor with an empty binding.",
1307 on_activate => sub { 1457 on_activate => sub {
1308 $::BIND_EDITOR->set_binding (undef, undef, [], 1458 $::BIND_EDITOR->set_binding (undef, undef, [],
1309 sub { 1459 sub {
1310 my ($mod, $sym, $cmds) = @_; 1460 my ($mod, $sym, $cmds) = @_;
1311 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1461 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1312 $refresh->(); 1462 $refresh->();
1313 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1314 $SETUP_DIALOG->show; 1464 $SETUP_DIALOG->show;
1315 }, 1465 },
1316 sub { 1466 sub {
… …
1318 $SETUP_DIALOG->show; 1468 $SETUP_DIALOG->show;
1319 }, 1469 },
1320 ); 1470 );
1321 $SETUP_DIALOG->hide; 1471 $SETUP_DIALOG->hide;
1322 $::BIND_EDITOR->show; 1472 $::BIND_EDITOR->show;
1473 0
1323 }, 1474 },
1324 ); 1475 );
1325 1476
1326 $hb->add (new CFClient::UI::Button 1477 $hb->add (new CFPlus::UI::Button
1327 text => "close", 1478 text => "close",
1328 tooltip => "Closes the binding window", 1479 tooltip => "Closes the binding window",
1329 expand => 1, 1480 expand => 1,
1330 on_activate => sub { 1481 on_activate => sub {
1331 $SETUP_DIALOG->hide; 1482 $SETUP_DIALOG->hide;
1483 0
1332 } 1484 }
1333 ); 1485 );
1334 1486
1335 $refresh->(); 1487 $refresh->();
1336 1488
1337 $vb 1489 $vb
1338} 1490}
1339 1491
1340sub help_window { 1492sub help_window {
1341 my $win = new CFClient::UI::FancyFrame 1493 my $win = new CFPlus::UI::FancyFrame
1342 x => 'center', 1494 x => 'center',
1343 y => 'center', 1495 y => 'center',
1344 z => 2, 1496 z => 2,
1345 name => 'doc_browser', 1497 name => 'doc_browser',
1346 force_w => int $WIDTH * 7/8, 1498 force_w => int $WIDTH * 7/8,
1347 force_h => int $HEIGHT * 7/8, 1499 force_h => int $HEIGHT * 7/8,
1348 title => "Documentation"; 1500 title => "Help Browser",
1501 has_close_button => 1;
1349 1502
1350 $win->add (my $vbox = new CFClient::UI::VBox); 1503 $win->add (my $vbox = new CFPlus::UI::VBox);
1351 1504
1352 $vbox->add (my $buttons = new CFClient::UI::HBox); 1505 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1353 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1506 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1354 expand => 1, fontsize => 0.8, padding_x => 4); 1507 expand => 1, fontsize => 0.8, padding_x => 4);
1355 1508
1356 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1509 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1357 $buttons->add (my $combo = new CFClient::UI::Combobox 1510 $buttons->add (my $combo = new CFPlus::UI::Selector
1358 value => undef, 1511 value => undef,
1359 options => [ 1512 options => [
1360 [intro => "Introduction"], 1513 [intro => "Introduction"],
1361 [manual => "Manual"], 1514 [manual => "Main Manual"],
1362 [skill_help => "Skills"], 1515 [skill_help => "Skill Reference"],
1363 [command_help => "Commands"], 1516 [command_help => "Command Reference"],
1364 [dmcommand_help => "DM Commands"], 1517 [dmcommand_help => "DM Commands"],
1365 [COPYING => "License Terms"], 1518 [COPYING => "License Terms"],
1366 ], 1519 ],
1367 on_changed => sub { 1520 on_changed => sub {
1368 my ($self, $pod) = @_; 1521 my ($self, $pod) = @_;
1369 1522
1370 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1371 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1372
1373 $viewer->clear; 1523 $viewer->clear;
1374 1524 $viewer->add_paragraph (@{ CFPlus::Pod::pod_paragraphs $pod });
1375 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1376 for @$pom;
1377
1378 $viewer->set_offset (0); 1525 $viewer->set_offset (0);
1526
1527 0
1379 }, 1528 },
1380 on_visibility_change => sub { 1529 on_visibility_change => sub {
1381 my ($self, $visible) = @_; 1530 my ($self, $visible) = @_;
1382 return unless $visible; 1531 return unless $visible;
1383 return if $self->{value}; 1532 return if $self->{value};
1384 $self->set_value ("intro"); 1533 $self->set_value ("intro");
1534 0
1385 }, 1535 },
1386 ); 1536 );
1387 1537
1388 $win 1538 $win
1389} 1539}
1390 1540
1391sub sdl_init { 1541sub sdl_init {
1392 CFClient::SDL_Init 1542 CFPlus::SDL_Init
1393 and die "SDL::Init failed!\n"; 1543 and die "SDL::Init failed!\n";
1394} 1544}
1395 1545
1396sub video_init { 1546sub video_init {
1397 sdl_init; 1547 sdl_init;
… …
1402 1552
1403 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1553 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1404 $FULLSCREEN = $CFG->{fullscreen}; 1554 $FULLSCREEN = $CFG->{fullscreen};
1405 $FAST = $CFG->{fast}; 1555 $FAST = $CFG->{fast};
1406 1556
1407 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1557 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1408 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1558 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1409 1559
1410 $SDL_ACTIVE = 1; 1560 $SDL_ACTIVE = 1;
1411 $LAST_REFRESH = time - 0.01; 1561 $LAST_REFRESH = time - 0.01;
1412 1562
1413 CFClient::OpenGL::init; 1563 CFPlus::OpenGL::init;
1414 1564
1415 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1565 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1416 1566
1417 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1567 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1418 1568
1419 ############################################################################# 1569 #############################################################################
1420 1570
1421 if ($DEBUG_STATUS) { 1571 if ($DEBUG_STATUS) {
1422 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1572 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1423 } else { 1573 } else {
1424 # create the widgets 1574 # create the widgets
1425 1575
1426 $DEBUG_STATUS = new CFClient::UI::Label 1576 $DEBUG_STATUS = new CFPlus::UI::Label
1427 padding => 0, 1577 padding => 0,
1428 z => 100, 1578 z => 100,
1429 force_x => "max", 1579 force_x => "max",
1430 force_y => 0; 1580 force_y => 0;
1431 $DEBUG_STATUS->show; 1581 $DEBUG_STATUS->show;
1432 1582
1433 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1583 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1434 1584
1435 $STATUSBOX = new CFClient::UI::Statusbox; 1585 $STATUSBOX = new CFPlus::UI::Statusbox;
1436 $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]);
1437 1587
1438 (new CFClient::UI::Frame 1588 (new CFPlus::UI::Frame
1439 bg => [0, 0, 0, 0.4], 1589 bg => [0, 0, 0, 0.4],
1440 force_x => 0, 1590 force_x => 0,
1441 force_y => "max", 1591 force_y => "max",
1442 child => $STATUSBOX, 1592 child => $STATUSBOX,
1443 )->show; 1593 )->show;
1444 1594
1445 CFClient::UI::FancyFrame->new ( 1595 CFPlus::UI::FancyFrame->new (
1446 title => "Map", 1596 title => "Map",
1447 name => "mapmap", 1597 name => "mapmap",
1448 x => 0, 1598 x => 0,
1449 y => $FONTSIZE + 8, 1599 y => $FONTSIZE + 8,
1450 border_bg => [1, 1, 1, 192/255], 1600 border_bg => [1, 1, 1, 192/255],
1451 bg => [1, 1, 1, 0], 1601 bg => [1, 1, 1, 0],
1452 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1602 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1453 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.",
1454 ), 1604 ),
1455 )->show; 1605 )->show;
1456 1606
1457 $MAPWIDGET = new CFClient::MapWidget; 1607 $MAPWIDGET = new CFPlus::MapWidget;
1458 $MAPWIDGET->connect (activate_console => sub { 1608 $MAPWIDGET->connect (activate_console => sub {
1459 my ($mapwidget, $preset) = @_; 1609 my ($mapwidget, $preset) = @_;
1460 1610
1461 if ($CONSOLE) { 1611 if ($CONSOLE) {
1462 $CONSOLE->{input}->{auto_activated} = 1; 1612 $CONSOLE->{input}->{auto_activated} = 1;
1463 $CONSOLE->{input}->focus_in; 1613 $CONSOLE->{input}->grab_focus;
1464 1614
1465 if ($preset && $CONSOLE->{input}->get_text eq '') { 1615 if ($preset && $CONSOLE->{input}->get_text eq '') {
1466 $CONSOLE->{input}->set_text ($preset); 1616 $CONSOLE->{input}->set_text ($preset);
1467 } 1617 }
1468 } 1618 }
1469 }); 1619 });
1470 $MAPWIDGET->show; 1620 $MAPWIDGET->show;
1471 $MAPWIDGET->focus_in; 1621 $MAPWIDGET->grab_focus;
1472 1622
1473 $LOGVIEW = new CFClient::UI::TextScroller 1623 $LOGVIEW = new CFPlus::UI::TextScroller
1474 expand => 1, 1624 expand => 1,
1475 font => $FONT_FIXED, 1625 font => $FONT_FIXED,
1476 fontsize => $::CFG->{log_fontsize}, 1626 fontsize => $::CFG->{log_fontsize},
1477 indent => -4, 1627 indent => -4,
1478 can_hover => 1, 1628 can_hover => 1,
1479 can_events => 1, 1629 can_events => 1,
1480 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.",
1481 ; 1631 ;
1482 1632
1483 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1633 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1484 title => "Setup", 1634 title => "Setup",
1485 name => "setup_dialog", 1635 name => "setup_dialog",
1486 x => 'center', 1636 x => 'center',
1487 y => 'center', 1637 y => 'center',
1488 z => 2, 1638 z => 2,
1489 force_w => $::WIDTH * 0.6, 1639 force_w => $::WIDTH * 0.6,
1490 force_h => $::HEIGHT * 0.6, 1640 force_h => $::HEIGHT * 0.6,
1641 has_close_button => 1,
1491 ; 1642 ;
1492 1643
1644 $METASERVER = metaserver_dialog;
1645
1493 $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,
1494 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1647 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1495 1648
1496 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1649 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1497 "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.");
1498 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1651 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1499 "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.");
1500 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1653 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1501 "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.");
1502 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1655 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1503 "Configure the use of audio, sound effects and background music."); 1656 "Configure the use of audio, sound effects and background music.");
1504 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1657 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1505 "Lets you define, edit and delete bindings." 1658 "Lets you define, edit and delete key bindings."
1506 . "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 "
1507 . "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 "
1508 . "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. "
1509 . "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 "
1510 . "binding editor closes"); 1663 . "binding editor closes");
1511 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1664 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1512 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1665 "Some debuggin' options. Do not ask.");
1513 1666
1514 $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
1515 1668
1516 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1669 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1517 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.");
1518 1671
1519 $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,
1520 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.");
1521 1674
1522 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
1523 1676
1524 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1525 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1526 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1677 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1527 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.");
1528 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1529 1679
1530 $BUTTONBAR->add (new CFClient::UI::Button 1680 $BUTTONBAR->add (new CFPlus::UI::Button
1531 text => "Save Config", 1681 text => "Save Config",
1532 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.",
1533 on_activate => sub { 1683 on_activate => sub {
1534 $::CFG->{layout} = CFClient::UI::get_layout; 1684 $::CFG->{layout} = CFPlus::UI::get_layout;
1535 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1685 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1536 status "Configuration Saved"; 1686 status "Configuration Saved";
1687 0
1537 }, 1688 },
1538 ); 1689 );
1539 1690
1540 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1691 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1541 tooltip => "View Documentation"); 1692 tooltip => "View Documentation");
1542 1693
1543 $BUTTONBAR->add (new CFClient::UI::Button 1694 $BUTTONBAR->add (new CFPlus::UI::Button
1544 text => "Quit", 1695 text => "Quit",
1545 tooltip => "Terminates the program", 1696 tooltip => "Terminates the program",
1546 on_activate => sub { 1697 on_activate => sub {
1547 if ($CONN) { 1698 if ($CONN) {
1548 open_quit_dialog; 1699 open_quit_dialog;
1549 } else { 1700 } else {
1550 exit; 1701 exit;
1551 } 1702 }
1703 0
1552 }, 1704 },
1553 ); 1705 );
1554 1706
1555 $BUTTONBAR->show; 1707 $BUTTONBAR->show;
1556 $SETUP_DIALOG->show; 1708 $SETUP_DIALOG->show;
… …
1558 1710
1559 $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]);
1560} 1712}
1561 1713
1562sub video_shutdown { 1714sub video_shutdown {
1715 CFPlus::OpenGL::shutdown;
1716
1563 undef $SDL_ACTIVE; 1717 undef $SDL_ACTIVE;
1564} 1718}
1565 1719
1566my @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#
1567my $bgmusic;#TODO#hack#d# 1721my $bgmusic;#TODO#hack#d#
… …
1574 1728
1575sub audio_music_finished { 1729sub audio_music_finished {
1576 return unless $CFG->{bgm_enable}; 1730 return unless $CFG->{bgm_enable};
1577 1731
1578 # TODO: hack, do play loop and mood music 1732 # TODO: hack, do play loop and mood music
1579 $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]";
1580 $bgmusic->play (0); 1734 $bgmusic->play (0);
1581 1735
1582 push @bgmusic, shift @bgmusic; 1736 push @bgmusic, shift @bgmusic;
1583} 1737}
1584 1738
1585sub audio_init { 1739sub audio_init {
1586 if ($CFG->{audio_enable}) { 1740 if ($CFG->{audio_enable}) {
1587 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1741 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1588 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1742 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1589 1743
1590 unless ($SDL_MIXER) { 1744 unless ($SDL_MIXER) {
1591 status "Unable to open sound device: there will be no sound"; 1745 status "Unable to open sound device: there will be no sound";
1592 return; 1746 return;
1593 } 1747 }
1594 1748
1595 CFClient::Mix_AllocateChannels 8; 1749 CFPlus::Mix_AllocateChannels 8;
1596 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1750 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1597 1751
1598 audio_music_finished; 1752 audio_music_finished;
1599 1753
1600 while (<$fh>) { 1754 while (<$fh>) {
1601 next if /^\s*#/; 1755 next if /^\s*#/;
… …
1604 my ($file, $volume, $event) = split /\s+/, $_, 3; 1758 my ($file, $volume, $event) = split /\s+/, $_, 3;
1605 1759
1606 push @SOUNDS, "$volume,$file"; 1760 push @SOUNDS, "$volume,$file";
1607 1761
1608 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1762 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1609 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";
1610 $chunk->volume ($volume * 128 / 100); 1764 $chunk->volume ($volume * 128 / 100);
1611 $chunk 1765 $chunk
1612 }; 1766 };
1613 } 1767 }
1614 } else { 1768 } else {
… …
1616 } 1770 }
1617 } 1771 }
1618} 1772}
1619 1773
1620sub audio_shutdown { 1774sub audio_shutdown {
1621 CFClient::Mix_CloseAudio if $SDL_MIXER; 1775 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1622 undef $SDL_MIXER; 1776 undef $SDL_MIXER;
1623 @SOUNDS = (); 1777 @SOUNDS = ();
1624 %AUDIO_CHUNKS = (); 1778 %AUDIO_CHUNKS = ();
1625} 1779}
1626 1780
… …
1633 1787
1634sub force_refresh { 1788sub force_refresh {
1635 $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;
1636 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1790 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1637 1791
1638 $CFClient::UI::ROOT->draw; 1792 $CFPlus::UI::ROOT->draw;
1639 1793
1640 $WANT_REFRESH = 0; 1794 $WANT_REFRESH = 0;
1641 $CAN_REFRESH = 0; 1795 $CAN_REFRESH = 0;
1642 $LAST_REFRESH = $NOW; 1796 $LAST_REFRESH = $NOW;
1643 1797
16440 && do {
1645 # some weird model-drawing code, just a joke right now
1646 use CFClient::OpenGL;
1647
1648 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1649 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1650 $demo{r} ||= do {
1651 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1652 $mod->{v} = pack "f*", @{$mod->{v}};
1653 $_ = [scalar @$_, pack "S!*", @$_]
1654 for values %{$mod->{g}};
1655 $mod
1656 };
1657
1658 my $r = $demo{r} or die;
1659
1660 glDepthMask 1;
1661 glClear GL_DEPTH_BUFFER_BIT;
1662 glEnable GL_TEXTURE_2D;
1663 glEnable GL_DEPTH_TEST;
1664 glEnable GL_CULL_FACE;
1665 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1666
1667 glMatrixMode GL_PROJECTION;
1668 glLoadIdentity;
1669 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1670 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1671 glMatrixMode GL_MODELVIEW;
1672 glLoadIdentity;
1673
1674 glPushMatrix;
1675 glTranslate 0, 0, -800;
1676 glScale 1, -1, 1;
1677 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1678 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1679 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1680 glScale 50, 50, 50;
1681
1682 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1683 while (my ($k, $v) = each %{$r->{g}}) {
1684 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1685 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1686 }
1687
1688 glPopMatrix;
1689
1690 glShadeModel GL_FLAT;
1691 glDisable GL_DEPTH_TEST;
1692 glDisable GL_TEXTURE_2D;
1693 glDepthMask 0;
1694
1695 $WANT_REFRESH++;
1696};
1697
1698 CFClient::SDL_GL_SwapBuffers; 1798 CFPlus::SDL_GL_SwapBuffers;
1699} 1799}
1700 1800
1701my $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 {
1702 $NOW = time; 1802 $NOW = time;
1703 1803
1704 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1804 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1705 for CFClient::SDL_PollEvent; 1805 for CFPlus::SDL_PollEvent;
1706 1806
1707 if (%animate_object) { 1807 if (%animate_object) {
1708 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1808 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1709 $WANT_REFRESH++; 1809 $WANT_REFRESH++;
1710 } 1810 }
… …
1734 $CONN->face_prefetch 1834 $CONN->face_prefetch
1735 if $CONN; 1835 if $CONN;
1736}); 1836});
1737 1837
1738%SDL_CB = ( 1838%SDL_CB = (
1739 CFClient::SDL_QUIT => sub { 1839 CFPlus::SDL_QUIT => sub {
1740 Event::unloop -1; 1840 Event::unloop -1;
1741 }, 1841 },
1742 CFClient::SDL_VIDEORESIZE => sub { 1842 CFPlus::SDL_VIDEORESIZE => sub {
1743 }, 1843 },
1744 CFClient::SDL_VIDEOEXPOSE => sub { 1844 CFPlus::SDL_VIDEOEXPOSE => sub {
1745 CFClient::UI::full_refresh; 1845 CFPlus::UI::full_refresh;
1746 }, 1846 },
1747 CFClient::SDL_ACTIVEEVENT => sub { 1847 CFPlus::SDL_ACTIVEEVENT => sub {
1748# 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#
1749 }, 1849 },
1750 CFClient::SDL_KEYDOWN => sub { 1850 CFPlus::SDL_KEYDOWN => sub {
1751 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1851 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1752 # alt-enter 1852 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle;
1753 video_shutdown; 1854 video_shutdown;
1754 $CFG->{fullscreen} = !$CFG->{fullscreen};
1755 video_init; 1855 video_init;
1756 } else { 1856 } else {
1757 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1857 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1758 } 1858 }
1759 }, 1859 },
1760 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1860 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1761 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1861 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1762 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1862 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1763 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1863 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1764 CFClient::SDL_USEREVENT => sub { 1864 CFPlus::SDL_USEREVENT => sub {
1765 if ($_[0]{code} == 1) { 1865 if ($_[0]{code} == 1) {
1766 audio_channel_finished $_[0]{data1}; 1866 audio_channel_finished $_[0]{data1};
1767 } elsif ($_[0]{code} == 0) { 1867 } elsif ($_[0]{code} == 0) {
1768 audio_music_finished; 1868 audio_music_finished;
1769 } 1869 }
… …
1773############################################################################# 1873#############################################################################
1774 1874
1775$SIG{INT} = $SIG{TERM} = sub { exit }; 1875$SIG{INT} = $SIG{TERM} = sub { exit };
1776 1876
1777{ 1877{
1778 local $SIG{__DIE__} = sub {
1779 return unless defined $^S && !$^S;
1780 Carp::confess $_[1];#d#TODO: remove when stable
1781 CFClient::fatal $_[0];
1782 };
1783
1784 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1878 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1785 CFClient::UI::set_layout ($::CFG->{layout}); 1879 CFPlus::UI::set_layout ($::CFG->{layout});
1786 1880
1787 my %DEF_CFG = ( 1881 my %DEF_CFG = (
1788 sdl_mode => 0, 1882 sdl_mode => 0,
1789 width => 640, 1883 width => 640,
1790 height => 480, 1884 height => 480,
1791 fullscreen => 0, 1885 fullscreen => 0,
1792 fast => 0, 1886 fast => 0,
1793 map_scale => 1, 1887 map_scale => 1,
1794 fow_enable => 1, 1888 fow_enable => 1,
1795 fow_intensity => 0.45, 1889 fow_intensity => 0.45,
1796 fow_smooth => 0, 1890 fow_smooth => 0,
1797 gui_fontsize => 1, 1891 gui_fontsize => 1,
1798 log_fontsize => 0.7, 1892 log_fontsize => 0.7,
1799 gauge_fontsize=> 1, 1893 gauge_fontsize => 1,
1800 gauge_size => 0.35, 1894 gauge_size => 0.35,
1801 stat_fontsize => 0.7, 1895 stat_fontsize => 0.7,
1802 mapsize => 100, 1896 mapsize => 100,
1803 host => "crossfire.schmorp.de",
1804 say_command => 'say', 1897 say_command => 'say',
1805 audio_enable => 1, 1898 audio_enable => 1,
1806 bgm_enable => 1, 1899 bgm_enable => 1,
1807 bgm_volume => 0.25, 1900 bgm_volume => 0.25,
1808 face_prefetch => 0, 1901 face_prefetch => 0,
1809 output_sync => 1, 1902 output_sync => 1,
1810 output_count => 1, 1903 output_count => 1,
1811 pickup => 0, 1904 pickup => 0,
1905 inv_sort => "mtime",
1906 default => "profile", # default profile
1907 );
1812 ); 1908
1813
1814 while (my ($k, $v) = each %DEF_CFG) { 1909 while (my ($k, $v) = each %DEF_CFG) {
1815 $CFG->{$k} = $v unless exists $CFG->{$k}; 1910 $CFG->{$k} = $v unless exists $CFG->{$k};
1816 } 1911 }
1817 1912
1913 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1914
1818 sdl_init; 1915 sdl_init;
1819 1916
1820 @SDL_MODES = reverse 1917 @SDL_MODES = reverse
1821 grep $_->[0] >= 640 && $_->[1] >= 480, 1918 grep $_->[0] >= 640 && $_->[1] >= 480,
1822 CFClient::SDL_ListModes; 1919 CFPlus::SDL_ListModes;
1823 1920
1824 @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)";
1825 1922
1826 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1923 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1827 1924
1828 { 1925 {
1829 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1926 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1830 DejaVuSans.ttf 1927 DejaVuSans.ttf
1831 DejaVuSansMono.ttf 1928 DejaVuSansMono.ttf
1832 DejaVuSans-Bold.ttf 1929 DejaVuSans-Bold.ttf
1833 DejaVuSansMono-Bold.ttf 1930 DejaVuSansMono-Bold.ttf
1834 DejaVuSans-Oblique.ttf 1931 DejaVuSans-Oblique.ttf
1835 DejaVuSansMono-Oblique.ttf 1932 DejaVuSansMono-Oblique.ttf
1836 DejaVuSans-BoldOblique.ttf 1933 DejaVuSans-BoldOblique.ttf
1837 DejaVuSansMono-BoldOblique.ttf 1934 DejaVuSansMono-BoldOblique.ttf
1838 ); 1935 );
1839 1936
1840 CFClient::add_font $_ for @fonts; 1937 CFPlus::add_font $_ for @fonts;
1841 1938
1842 CFClient::pango_init; 1939 CFPlus::pango_init;
1843 1940
1844 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1941 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1845 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1942 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1846 1943
1847 $FONT_PROP->make_default; 1944 $FONT_PROP->make_default;
1848 } 1945 }
1849 1946
1850# compare mono (ft) vs. rgba (cairo) 1947# compare mono (ft) vs. rgba (cairo)
1851# ft - 1.8s, cairo 3s, even in alpha-only mode 1948# ft - 1.8s, cairo 3s, even in alpha-only mode
1852# for my $rgba (0..1) { 1949# for my $rgba (0..1) {
1853# my $t1 = Time::HiRes::time; 1950# my $t1 = Time::HiRes::time;
1854# for (1..1000) { 1951# for (1..1000) {
1855# my $layout = CFClient::Layout->new ($rgba); 1952# my $layout = CFPlus::Layout->new ($rgba);
1856# $layout->set_text ("hallo" x 100); 1953# $layout->set_text ("hallo" x 100);
1857# $layout->render; 1954# $layout->render;
1858# } 1955# }
1859# my $t2 = Time::HiRes::time; 1956# my $t2 = Time::HiRes::time;
1860# warn $t2-$t1; 1957# warn $t2-$t1;
… …
1863 video_init; 1960 video_init;
1864 audio_init; 1961 audio_init;
1865} 1962}
1866 1963
1867Event::loop; 1964Event::loop;
1965#CFPlus::SDL_Quit;
1966#CFPlus::_exit 0;
1868 1967
1869END { CFClient::SDL_Quit } 1968END { CFPlus::SDL_Quit }
1870 1969
1871=head1 NAME 1970=head1 NAME
1872 1971
1873cfplus - A Crossfire+ and Crossfire game client 1972cfplus - A Crossfire+ and Crossfire game client
1874 1973

Diff Legend

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