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

Diff Legend

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