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.66 by elmex, Thu Jun 8 19:43:26 2006 UTC vs.
Revision 1.113 by root, Sun Aug 13 21:46:10 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 };
… …
626 629
627 $win 630 $win
628} 631}
629 632
630sub debug_setup { 633sub debug_setup {
631 my $table = new CFClient::UI::Table; 634 my $table = new CFPlus::UI::Table;
632 635
633 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
634 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 }); 637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
635 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
636 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 }); 639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
637 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
638 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 }); 641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
639 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
640 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 }); 643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
641 644
642 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
643 646
644 for my $x (0..2) { 647 for my $x (0..2) {
645 for my $y (0 .. 2) { 648 for my $y (0 .. 2) {
646 $table->add ($x + 3, $y, 649 $table->add ($x + 3, $y,
647 new CFClient::UI::Entry 650 new CFPlus::UI::Entry
648 text => $default_smooth[$x * 3 + $y], 651 text => $default_smooth[$x * 3 + $y],
649 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
650 ); 653 );
651 } 654 }
652 } 655 }
… …
654 657
655 $table 658 $table
656} 659}
657 660
658sub stats_window { 661sub stats_window {
659 my $tgw = new CFClient::UI::FancyFrame 662 my $r = new CFPlus::UI::ScrolledWindow (
660 y => $HEIGHT * (2/8), 663 expand => 1,
661 x => "max", 664 scroll_y => 1
662 title => "Stats", 665 );
663 name => "stats_window"; 666 $r->add (my $vb = new CFPlus::UI::VBox);
664 667
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $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,
667 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
668 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.");
669 $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,
670 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
671 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).");
672 674
673 $vb->add (my $hb0 = new CFClient::UI::HBox); 675 $vb->add (my $hb0 = new CFPlus::UI::HBox);
674 $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,
675 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
676 tooltip => "The weight of the player including all inventory items."); 678 tooltip => "The weight of the player including all inventory items.");
677 $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,
678 can_hover => 1, can_events => 1, 680 can_hover => 1, can_events => 1,
679 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
680 682
681
682 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
684 685
685 my $color2 = [1, 1, 0]; 686 my $color2 = [1, 1, 0];
686 687
687 for ( 688 for (
688 [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],
689 [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],
690 [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],
691 [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],
692 [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],
693 [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],
694 [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],
695 696
696 [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],
697 [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],
698 [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],
699 [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],
700 [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],
701 [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],
702 ) { 703 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 704 my ($col, $row, $id, $label, $template) = @$_;
704 705
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
706 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");
707 $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
708 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");
709 } 712 }
710 713
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
712 715
713 my $row = 0; 716 my $row = 0;
714 my $col = 0; 717 my $col = 0;
715 718
716 my %resist_names = ( 719 my %resist_names = (
720 slow => ["Slow",
717 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",
718 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",
719 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",
720 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",
721 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",
722 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",
723 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",
724 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",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 737 "<b>Poison</b> (resistance to getting poisoned)"],
738 para => ["Paralysation",
726 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",
727 deat => "<b>Death</b> (resistance against death spells)", 741 "<b>Death</b> (resistance against death spells)"],
728 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",
729 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",
730 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",
731 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",
732 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",
733 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",
734 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)"],
735 ); 756 );
736 for (qw/slow holyw conf fire depl magic 757 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 758 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 759 blind fear tund elec cold ghit/)
739 { 760 {
740 $tbl2->add ($col, $row, 761 $tbl2->add ($col, $row,
741 $STATWIDS->{"res_$_"} = 762 $STATWIDS->{"res_$_"} =
742 new CFClient::UI::Label 763 new CFPlus::UI::Label
743 font => $FONT_FIXED, 764 font => $FONT_FIXED,
744 template => "-100%", 765 template => "-100%",
745 align => +1, 766 align => +1,
746 valign => 0, 767 valign => 0,
747 can_events => 1, 768 can_events => 1,
748 can_hover => 1, 769 can_hover => 1,
749 tooltip => $resist_names{$_}, 770 tooltip => $resist_names{$_}->[1],
750 ); 771 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
752 font => $FONT_FIXED, 773 font => $FONT_FIXED,
753 can_hover => 1, 774 can_hover => 1,
754 can_events => 1, 775 can_events => 1,
755 image => "ui/resist/resist_$_.png", 776 path => "ui/resist/resist_$_.png",
756 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],
757 ); 785 );
758 786
759 $row++; 787 $row++;
760 if ($row % 6 == 0) { 788 if ($row % 6 == 0) {
761 $col += 2; 789 $col += 3;
762 $row = 0; 790 $row = 0;
763 } 791 }
764 } 792 }
765 793
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 794 #update_stats_window ({});
768 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]);
769 $tgw 802 $sw
770} 803}
771 804
772sub formsep($) { 805sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 806 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 807}
775 808
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = (
821 phys => 100,
822 magic => 101,
823 fire => 102,
824 elec => 103,
825 cold => 104,
826 conf => 105,
827 acid => 106,
828 drain => 107,
829 ghit => 108,
830 pois => 109,
831 slow => 110,
832 para => 111,
833 tund => 112,
834 fear => 113,
835 depl => 113,
836 deat => 115,
837 holyw => 116,
838 blind => 117,
839 );
840
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl;
843}
844
845my $METASERVER_ATIME; 809my $METASERVER_ATIME;
846 810
847sub update_metaserver { 811sub update_metaserver {
812 my ($metaserver_dialog) = @_;
813
814 $METASERVER = $metaserver_dialog
815 if defined $metaserver_dialog;
816
848 return if $METASERVER_ATIME > time; 817 return if $METASERVER_ATIME > time;
849 $METASERVER_ATIME = time + 60; 818 $METASERVER_ATIME = time + 60;
850 819
851 my $table = $METASERVER->{table}; 820 my $table = $METASERVER->{table};
852 $table->clear; 821 $table->clear;
853 $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...");
854 823
855 my $buf; 824 my $buf;
856 825
857 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
858 827
… …
881 "The time this server has been running without being restarted.", 850 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.", 851 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.", 852 "Short information about this server provided by its admins.",
884 ); 853 );
885 my @col = qw(#Users Host Uptime Version Description); 854 my @col = qw(#Users Host Uptime Version Description);
886 $table->add ($_, 0, new CFClient::UI::Label 855 $table->add ($_, 0, new CFPlus::UI::Label
887 can_hover => 1, can_events => 1, 856 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0], 857 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_]) 858 text => $col[$_], tooltip => $tip[$_])
890 for 0 .. $#col; 859 for 0 .. $#col;
891 860
… …
912 881
913 $m = [$users, $host, $uptime, $version, $desc]; 882 $m = [$users, $host, $uptime, $version, $desc];
914 883
915 $y++; 884 $y++;
916 885
917 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
918 (new CFClient::UI::Button 887 (new CFPlus::UI::Button
919 text => "Use", 888 text => "Use",
920 tooltip => "Put this server into the <b>Host:Port</b> field", 889 tooltip => "Put this server into the <b>Host:Port</b> field",
921 on_activate => sub { 890 on_activate => sub {
922 $HOST_ENTRY->set_text ($CFG->{host} = $host); 891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
923 $METASERVER->hide; 892 $METASERVER->hide;
893 0
924 }, 894 },
925 ), 895 ),
926 (new CFClient::UI::Empty expand => 1), 896 (new CFPlus::UI::Empty expand => 1),
927 ]); 897 ]);
928 898
929 $table->add ($_, $y, new CFClient::UI::Label 899 $table->add ($_, $y, new CFPlus::UI::Label
930 ellipsise => 0, 900 ellipsise => 0,
931 align => $align[$_], 901 align => $align[$_],
932 text => $m->[$_], 902 text => $m->[$_],
933 tooltip => $tip[$_], 903 tooltip => $tip[$_],
934 can_hover => 1, 904 can_hover => 1,
… …
939 } 909 }
940 }); 910 });
941} 911}
942 912
943sub 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
944 my $dialog = new CFClient::UI::FancyFrame 918 my $dialog = new CFPlus::UI::FancyFrame
945 title => "Server List", 919 title => "Server List",
946 name => 'metaserver_dialog', 920 name => 'metaserver_dialog',
947 x => 'center', 921 x => 'center',
948 y => 'center', 922 y => 'center',
949 z => 3, 923 z => 3,
950 force_h => $::HEIGHT * 0.4, 924 force_h => $::HEIGHT * 0.4,
951 child => (my $vbox = new CFClient::UI::VBox), 925 child => $vbox,
926 has_close_button => 1,
927 table => $table,
952 on_visibility_change => sub { 928 on_visibility_change => sub {
953 update_metaserver if $_[1]; 929 update_metaserver ($_[0]) if $_[1];
930 0
954 }, 931 },
955 ; 932 ;
956 933
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960
961 $dialog 934 $dialog
962} 935}
963 936
964sub server_setup { 937sub server_setup {
965 my $vbox = new CFClient::UI::VBox; 938 my $vbox = new CFPlus::UI::VBox;
966 939
967 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
968 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
969 942
970 { 943 {
971 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
972 945
973 $vbox->add ( 946 $vbox->add (
974 $HOST_ENTRY = new CFClient::UI::Entry 947 $HOST_ENTRY = new CFPlus::UI::Entry
975 expand => 1, 948 expand => 1,
976 text => $CFG->{host}, 949 text => $CFG->{profile}{default}{host},
977 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
978 on_changed => sub { 951 on_changed => sub {
979 my ($self, $value) = @_; 952 my ($self, $value) = @_;
980 $CFG->{host} = $value; 953 $CFG->{profile}{default}{host} = $value;
954 0
981 } 955 }
982 ); 956 );
983 957
984 $METASERVER = metaserver_dialog;
985
986 $vbox->add (new CFClient::UI::Button 958 $vbox->add (new CFPlus::UI::Button
987 expand => 1, 959 expand => 1,
988 text => "Server List", 960 text => "Server List",
989 other => $METASERVER, 961 other => $METASERVER,
990 tooltip => "Show a list of available crossfire servers", 962 tooltip => "Show a list of available crossfire servers",
991 on_activate => sub { $METASERVER->toggle_visibility }, 963 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1] }, 964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
993 ); 965 );
994 } 966 }
995 967
996 $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");
997 $table->add (1, 4, new CFClient::UI::Entry 969 $table->add (1, 4, new CFPlus::UI::Entry
998 text => $CFG->{user}, 970 text => $CFG->{profile}{default}{user},
999 tooltip => "The name of your character on the server", 971 tooltip => "The name of your character on the server",
1000 on_changed => sub { 972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1001 my ($self, $value) = @_;
1002 $CFG->{user} = $value;
1003 }
1004 ); 973 );
1005 974
1006 $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");
1007 $table->add (1, 5, new CFClient::UI::Entry 976 $table->add (1, 5, new CFPlus::UI::Entry
1008 text => $CFG->{password}, 977 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 978 hidden => 1,
1010 tooltip => "The password for your character", 979 tooltip => "The password for your character",
1011 on_changed => sub { 980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 my ($self, $value) = @_;
1013 $CFG->{password} = $value;
1014 }
1015 ); 981 );
1016 982
1017 $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");
1018 $table->add (1, 7, new CFClient::UI::Slider 984 $table->add (1, 7, new CFPlus::UI::Slider
1019 force_w => 100, 985 force_w => 100,
1020 range => [$CFG->{mapsize}, 10, 100, 0, 1], 986 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1021 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. "
1022 . "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, "
1023 . "but you also increase bandwidth requirements and latency. " 989 . "but you also increase bandwidth requirements and latency. "
1024 . "This option is only used once at log-in.", 990 . "This option is only used once at log-in.",
1025 on_changed => sub { 991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1026 my ($self, $value) = @_;
1027
1028 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1029 },
1030 ); 992 );
1031 993
1032 $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");
1033 $table->add (1, 8, new CFClient::UI::CheckBox 995 $table->add (1, 8, new CFPlus::UI::CheckBox
1034 state => $CFG->{face_prefetch}, 996 state => $CFG->{face_prefetch},
1035 tooltip => "<b>Background Image Prefetch</b>\n\n" 997 tooltip => "<b>Background Image Prefetch</b>\n\n"
1036 . "If enabled, the client automatically pre-fetches images from the server. " 998 . "If enabled, the client automatically pre-fetches images from the server. "
1037 . "This might increase or create lag, but increases the chances " 999 . "This might increase or create lag, but increases the chances "
1038 . "of faces being ready for display when you encounter them. " 1000 . "of faces being ready for display when you encounter them. "
1039 . "It also uses up server bandwidth on every connect, " 1001 . "It also uses up server bandwidth on every connect, "
1040 . "so only set it if you really need to prefetch images. " 1002 . "so only set it if you really need to prefetch images. "
1041 . "This option can be set and unset any time.", 1003 . "This option can be set and unset any time.",
1042 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1043 ); 1005 );
1044 1006
1045 $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");
1046 $table->add (1, 9, new CFClient::UI::Entry 1008 $table->add (1, 9, new CFPlus::UI::Entry
1047 text => $CFG->{output_count}, 1009 text => $CFG->{output_count},
1048 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.",
1049 on_changed => sub { $CFG->{output_count} = $_[1] }, 1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1050 ); 1012 );
1051 1013
1052 $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");
1053 $table->add (1, 10, new CFClient::UI::Entry 1015 $table->add (1, 10, new CFPlus::UI::Entry
1054 text => $CFG->{output_sync}, 1016 text => $CFG->{output_sync},
1055 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.",
1056 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1057 ); 1019 );
1058 1020
1059 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1060 expand => 1, 1022 expand => 1,
1061 align => 0, 1023 align => 0,
1062 text => "Login", 1024 text => "Login",
1063 on_activate => sub { 1025 on_activate => sub {
1064 $CONN ? stop_game 1026 $CONN ? stop_game
1065 : start_game; 1027 : start_game;
1028 0
1066 }, 1029 },
1067 ); 1030 );
1068 1031
1069 $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");
1070 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1071 text => $CFG->{say_command}, 1034 text => $CFG->{say_command},
1072 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. "
1073 . "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. "
1074 . "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.",
1075 on_changed => sub { 1038 on_changed => sub {
1076 my ($self, $value) = @_; 1039 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1040 $CFG->{say_command} = $value;
1041 0
1078 } 1042 }
1079 ); 1043 );
1080 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
1081 $vbox 1054 $vbox
1082} 1055}
1083 1056
1084sub message_window { 1057sub message_window {
1085 my $window = new CFClient::UI::FancyFrame 1058 my $window = new CFPlus::UI::FancyFrame
1086 name => "message_window", 1059 name => "message_window",
1087 title => "Messages", 1060 title => "Messages",
1088 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
1089 bg => [0, 0, 0, 0.75],
1090 x => "max", 1062 x => "max",
1091 y => 0, 1063 y => 0,
1092 force_w => $::WIDTH * 0.4, 1064 force_w => $::WIDTH * 0.4,
1093 force_h => $::HEIGHT * 0.5, 1065 force_h => $::HEIGHT * 0.5,
1094 child => (my $vbox = new CFClient::UI::VBox); 1066 child => (my $vbox = new CFPlus::UI::VBox),
1067 has_close_button => 1;
1095 1068
1096 $vbox->add ($LOGVIEW); 1069 $vbox->add ($LOGVIEW);
1097 1070
1098 $vbox->add (my $input = new CFClient::UI::Entry 1071 $vbox->add (my $input = new CFPlus::UI::Entry
1099 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> "
1100 . "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>...). "
1101 . "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). "
1102 . "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.",
1103 on_focus_in => sub { 1076 on_focus_in => sub {
… …
1107 1080
1108 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1109 $input->{refocus_map} = 1; 1082 $input->{refocus_map} = 1;
1110 } 1083 }
1111 delete $input->{auto_activated}; 1084 delete $input->{auto_activated};
1085
1086 0
1112 }, 1087 },
1113 on_activate => sub { 1088 on_activate => sub {
1114 my ($input, $text) = @_; 1089 my ($input, $text) = @_;
1115 $input->set_text (''); 1090 $input->set_text ('');
1116 1091
… …
1122 } 1097 }
1123 if ($input->{refocus_map}) { 1098 if ($input->{refocus_map}) {
1124 delete $input->{refocus_map}; 1099 delete $input->{refocus_map};
1125 $MAPWIDGET->focus_in 1100 $MAPWIDGET->focus_in
1126 } 1101 }
1102
1103 0
1127 }, 1104 },
1128 on_escape => sub { 1105 on_escape => sub {
1129 $MAPWIDGET->focus_in 1106 $MAPWIDGET->grab_focus;
1107
1108 0
1130 }, 1109 },
1131 ); 1110 );
1132 1111
1133 $CONSOLE = { 1112 $CONSOLE = {
1134 window => $window, 1113 window => $window,
… …
1136 }; 1115 };
1137 1116
1138 $window 1117 $window
1139} 1118}
1140 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
1141sub open_quit_dialog { 1139sub open_quit_dialog {
1142 unless ($QUIT_DIALOG) { 1140 unless ($QUIT_DIALOG) {
1143 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1144 x => "center", 1142 x => "center",
1145 y => "center", 1143 y => "center",
1146 z => 50, 1144 z => 50,
1147 title => "Really Quit?", 1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1148 ; 1150 ;
1149 1151
1150 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1151 1153
1152 $vb->add (new CFClient::UI::Label 1154 $vb->add (new CFPlus::UI::Label
1153 text => "You should find a savebed and apply it first!", 1155 text => "You should find a savebed and apply it first!",
1154 max_w => $WIDTH * 0.25, 1156 max_w => $WIDTH * 0.25,
1155 ellipsize => 0, 1157 ellipsize => 0,
1156 ); 1158 );
1157 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1158 $hb->add (new CFClient::UI::Button 1160 $hb->add (new CFPlus::UI::Button
1159 text => "Ok", 1161 text => "Ok",
1160 expand => 1, 1162 expand => 1,
1161 on_activate => sub { $QUIT_DIALOG->hide }, 1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1162 ); 1164 );
1163 $hb->add (new CFClient::UI::Button 1165 $hb->add (new CFPlus::UI::Button
1164 text => "Quit anyway", 1166 text => "Quit anyway",
1165 expand => 1, 1167 expand => 1,
1166 on_activate => sub { exit }, 1168 on_activate => sub { exit },
1167 ); 1169 );
1168 } 1170 }
1169 1171
1170 $QUIT_DIALOG->show; 1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1171} 1174}
1172 1175
1173sub autopickup_setup { 1176sub autopickup_setup {
1174 my $table = new CFClient::UI::Table; 1177 my $table = new CFPlus::UI::Table;
1175 1178
1176 for ( 1179 for (
1177 ["General", 0, 0, 1180 ["General", 0, 0,
1178 ["Enable autopickup" => PICKUP_NEWMODE], 1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1179 ["Inhibit autopickup" => PICKUP_INHIBIT], 1182 ["Inhibit autopickup" => PICKUP_INHIBIT],
1180 ["Stop before pickup" => PICKUP_STOP], 1183 ["Stop before pickup" => PICKUP_STOP],
1181 ["Debug autopickup" => PICKUP_DEBUG], 1184 ["Debug autopickup" => PICKUP_DEBUG],
1182 ], 1185 ],
1183 ["Weapons", 0, 6, 1186 ["Weapons", 0, 6,
… …
1213 ], 1216 ],
1214 ["Weight/Value ratio", 2, 17] 1217 ["Weight/Value ratio", 2, 17]
1215 ) 1218 )
1216 { 1219 {
1217 my ($title, $x, $y, @bits) = @$_; 1220 my ($title, $x, $y, @bits) = @$_;
1218 $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]);
1219 1222
1220 for (@bits) { 1223 for (@bits) {
1221 ++$y; 1224 ++$y;
1222 1225
1223 my $mask = $_->[1]; 1226 my $mask = $_->[1];
1224 $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);
1225 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1226 state => $CFG->{pickup} & $mask, 1229 state => $::CFG->{pickup} & $mask,
1227 on_changed => sub { 1230 on_changed => sub {
1228 my ($box, $value) = @_; 1231 my ($box, $value) = @_;
1229 1232
1230 if ($value) { 1233 if ($value) {
1231 $::CFG->{pickup} |= $mask; 1234 $::CFG->{pickup} |= $mask;
… …
1233 $::CFG->{pickup} &= ~$mask; 1236 $::CFG->{pickup} &= ~$mask;
1234 } 1237 }
1235 1238
1236 $::CONN->send_command ("pickup $::CFG->{pickup}") 1239 $::CONN->send_command ("pickup $::CFG->{pickup}")
1237 if defined $::CONN; 1240 if defined $::CONN;
1241
1242 0
1238 }); 1243 });
1244
1245 ${$_->[2]} = $checkbox if $_->[2];
1239 } 1246 }
1240 } 1247 }
1241 1248
1242 $table->add (2, 18, new CFClient::UI::ValSlider 1249 $table->add (2, 18, new CFPlus::UI::ValSlider
1243 range => [0, 0, 16, 1, 1], 1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99",
1244 to_value => sub { ">= " . 5 * $_[0] }, 1252 to_value => sub { ">= " . 5 * $_[0] },
1245 on_changed => sub { 1253 on_changed => sub {
1246 my ($slider, $value) = @_; 1254 my ($slider, $value) = @_;
1247 1255
1248 $::CFG->{pickup} &= ~0x7; 1256 $::CFG->{pickup} &= ~0xF;
1249 $::CFG->{pickup} |= int $value 1257 $::CFG->{pickup} |= int $value
1250 if $value; 1258 if $value;
1251 1; 1259 1;
1252 }); 1260 });
1261
1253 $table->add (3, 18, new CFClient::UI::Button 1262 $table->add (3, 18, new CFPlus::UI::Button
1254 text => "set", 1263 text => "set",
1255 on_activate => sub { 1264 on_activate => sub {
1256 $::CONN->send_command ("pickup $::CFG->{pickup}") 1265 $::CONN->send_command ("pickup $::CFG->{pickup}")
1257 if defined $::CONN; 1266 if defined $::CONN;
1258 1; 1267 0
1259 }); 1268 });
1260 1269
1261 $table 1270 $table
1262} 1271}
1263 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
1264sub 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 {
1265 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1266 x => "center", 1341 x => "center",
1267 y => "center", 1342 y => "center",
1268 force_w => $WIDTH * 9/10, 1343 force_w => $WIDTH * 9/10,
1269 force_h => $HEIGHT * 9/10, 1344 force_h => $HEIGHT * 9/10,
1270 title => "Inventory", 1345 title => "Player",
1346 name => "playerbook",
1347 has_close_button => 1
1271 ; 1348 ;
1272 1349
1273 $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;
1274 1353
1275 $hb->add (my $vb1 = new CFClient::UI::VBox); 1354 $ntb->add (
1276 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1355 "Statistics (F2)" => $STATS_PAGE = stats_window,
1277 $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 );
1278 1362
1279 $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 );
1280 1374
1281 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1375 $ntb->set_current_page ($INVENTORY_PAGE);
1282 1376
1283 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1377 $plwin->add ($ntb);
1284 1378 $plwin
1285 # XXX: Call after $INVR = ... because set_opencont sets the items
1286 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1287
1288 $invwin
1289} 1379}
1290 1380
1291sub spell_setup { 1381sub update_bindings {
1292 new CFClient::UI::SpellList 1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1293} 1383}
1294 1384
1295sub keyboard_setup { 1385sub keyboard_setup {
1296 my $binding_list = new CFClient::UI::VBox; 1386 my $binding_list = new CFPlus::UI::VBox;
1297 1387
1298 my $refresh; 1388 my $refresh;
1299 $refresh = sub { 1389 $refresh = $BIND_UPD_CB = sub {
1300 $binding_list->clear (); 1390 $binding_list->clear ();
1301 1391
1302 for my $mod (keys %{$::CFG->{bindings}}) { 1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1303 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1304 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1305 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1306 1396
1307 my $lbl = join "; ", @$cmds; 1397 my $lbl = join "; ", @$cmds;
1308 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1309 $binding_list->add (my $hb = new CFClient::UI::HBox); 1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1310 $hb->add (new CFClient::UI::Button 1400 $hb->add (new CFPlus::UI::Button
1311 text => "delete", 1401 text => "delete",
1312 tooltip => "Deletes the binding", 1402 tooltip => "Deletes the binding",
1313 on_activate => sub { 1403 on_activate => sub {
1314 $binding_list->remove ($hb); 1404 $binding_list->remove ($hb);
1315 delete $::CFG->{bindings}->{$mod}->{$sym}; 1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1316 }); 1407 });
1317 1408
1318 $hb->add (new CFClient::UI::Button 1409 $hb->add (new CFPlus::UI::Button
1319 text => "edit", 1410 text => "edit",
1320 tooltip => "Edits the binding", 1411 tooltip => "Edits the binding",
1321 on_activate => sub { 1412 on_activate => sub {
1322 $::BIND_EDITOR->set_binding ( 1413 $::BIND_EDITOR->set_binding (
1323 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1324 sub { 1415 sub {
1325 my ($nmod, $nsym, $ncmds) = @_; 1416 my ($nmod, $nsym, $ncmds) = @_;
1326 delete $::CFG->{bindings}->{$mod}->{$sym}; 1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1327 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1328 $refresh->(); 1419 $refresh->();
1329 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1330 $SETUP_DIALOG->show; 1421 $SETUP_DIALOG->show;
1331 }, 1422 },
1332 sub { 1423 sub {
1333 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1334 $SETUP_DIALOG->show; 1425 $SETUP_DIALOG->show;
1335 }); 1426 });
1336 $::BIND_EDITOR->show; 1427 $::BIND_EDITOR->show;
1337 $SETUP_DIALOG->hide; 1428 $SETUP_DIALOG->hide;
1429 0
1338 }); 1430 });
1339 1431
1340 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1341 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1342 } 1434 }
1343 } 1435 }
1344 }; 1436 };
1345 1437
1346 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
1347 $vb->add ($binding_list); 1451 $vb->add ($binding_list);
1348 $vb->add (my $hb = new CFClient::UI::HBox); 1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1349 1453
1350 $hb->add (new CFClient::UI::Button 1454 $hb->add (new CFPlus::UI::Button
1351 text => "record new", 1455 text => "record new",
1352 expand => 1, 1456 expand => 1,
1353 tooltip => "This button opens the binding editor with an empty binding.", 1457 tooltip => "This button opens the binding editor with an empty binding.",
1354 on_activate => sub { 1458 on_activate => sub {
1355 $::BIND_EDITOR->set_binding (undef, undef, [], 1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1356 sub { 1460 sub {
1357 my ($mod, $sym, $cmds) = @_; 1461 my ($mod, $sym, $cmds) = @_;
1358 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1359 $refresh->(); 1463 $refresh->();
1360 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1361 $SETUP_DIALOG->show; 1465 $SETUP_DIALOG->show;
1362 }, 1466 },
1363 sub { 1467 sub {
… …
1365 $SETUP_DIALOG->show; 1469 $SETUP_DIALOG->show;
1366 }, 1470 },
1367 ); 1471 );
1368 $SETUP_DIALOG->hide; 1472 $SETUP_DIALOG->hide;
1369 $::BIND_EDITOR->show; 1473 $::BIND_EDITOR->show;
1474 0
1370 }, 1475 },
1371 ); 1476 );
1372 1477
1373 $hb->add (new CFClient::UI::Button 1478 $hb->add (new CFPlus::UI::Button
1374 text => "close", 1479 text => "close",
1375 tooltip => "Closes the binding window", 1480 tooltip => "Closes the binding window",
1376 expand => 1, 1481 expand => 1,
1377 on_activate => sub { 1482 on_activate => sub {
1378 $SETUP_DIALOG->hide; 1483 $SETUP_DIALOG->hide;
1484 0
1379 } 1485 }
1380 ); 1486 );
1381 1487
1382 $refresh->(); 1488 $refresh->();
1383 1489
1384 $vb 1490 $vb
1385} 1491}
1386 1492
1387sub help_window { 1493sub help_window {
1388 my $win = new CFClient::UI::FancyFrame 1494 my $win = new CFPlus::UI::FancyFrame
1389 x => 'center', 1495 x => 'center',
1390 y => 'center', 1496 y => 'center',
1391 z => 2, 1497 z => 2,
1392 name => 'doc_browser', 1498 name => 'doc_browser',
1393 force_w => int $WIDTH * 7/8, 1499 force_w => int $WIDTH * 7/8,
1394 force_h => int $HEIGHT * 7/8, 1500 force_h => int $HEIGHT * 7/8,
1395 title => "Documentation"; 1501 title => "Help Browser",
1502 has_close_button => 1;
1396 1503
1397 $win->add (my $vbox = new CFClient::UI::VBox); 1504 $win->add (my $vbox = new CFPlus::UI::VBox);
1398 1505
1399 $vbox->add (my $buttons = new CFClient::UI::HBox); 1506 $vbox->add (my $buttons = new CFPlus::UI::HBox);
1400 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1401 expand => 1, fontsize => 0.8, padding_x => 4); 1508 expand => 1, fontsize => 0.8, padding_x => 4);
1402 1509
1403 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1510 my @history;
1404 $buttons->add (my $combo = new CFClient::UI::Combobox 1511 my @future;
1405 value => undef, 1512 my $curnode;
1406 options => [ 1513
1407 [intro => "Introduction"], 1514 my $load_node; $load_node = sub {
1408 [manual => "Manual"], 1515 my ($node) = @_;
1409 [skill_help => "Skills"], 1516
1410 [command_help => "Commands"], 1517 $buttons->clear;
1411 [dmcommand_help => "DM Commands"], 1518
1412 [COPYING => "License Terms"], 1519 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button
1521 text => "⋘",
1522 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>",
1523 on_activate => sub {
1524 unshift @future, $curnode if $curnode;
1525 $load_node->(pop @history);
1526 },
1527 );
1413 ], 1528 }
1414 on_changed => sub {
1415 my ($self, $pod) = @_;
1416 1529
1417 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1530 if (@future) {
1418 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1531 $buttons->add (new CFPlus::UI::Button
1532 text => "⋙",
1533 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>",
1534 on_activate => sub {
1535 push @history, $curnode;
1536 $load_node->(shift @future);
1537 },
1538 );
1539 }
1419 1540
1541 $buttons->add (new CFPlus::UI::Label text => " ");
1542
1543 my @path = CFPlus::Pod::full_path_of $node;
1544 pop @path; # drop current node
1545
1546 for my $node (@path) {
1547 $buttons->add (new CFPlus::UI::Button
1548 text => $node->{kw}[0],
1549 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1550 on_activate => sub {
1551 push @history, $curnode if $curnode; @future = ();
1552 $load_node->($node);
1553 },
1554 );
1555 $buttons->add (new CFPlus::UI::Label text => "/");
1556 }
1557
1558 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0]);
1559
1560 $curnode = $node;
1561
1420 $viewer->clear; 1562 $viewer->clear;
1421 1563 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1422 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1423 for @$pom;
1424
1425 $viewer->set_offset (0); 1564 $viewer->set_offset (0);
1426 },
1427 on_visibility_change => sub {
1428 my ($self, $visible) = @_;
1429 return unless $visible;
1430 return if $self->{value};
1431 $self->set_value ("intro");
1432 },
1433 ); 1565 };
1566
1567 $load_node->(CFPlus::Pod::find pod => "mainpage");
1568
1569 $CFPlus::Pod::goto_document = sub {
1570 my (@path) = @_;
1571
1572 push @history, $curnode if $curnode; @future = ();
1573
1574 $load_node->(CFPlus::Pod::find @path);
1575 $win->show;
1576 };
1434 1577
1435 $win 1578 $win
1436} 1579}
1437 1580
1438sub sdl_init { 1581sub sdl_init {
1439 CFClient::SDL_Init 1582 CFPlus::SDL_Init
1440 and die "SDL::Init failed!\n"; 1583 and die "SDL::Init failed!\n";
1441} 1584}
1442 1585
1443sub video_init { 1586sub video_init {
1444 sdl_init; 1587 sdl_init;
… …
1449 1592
1450 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1593 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1451 $FULLSCREEN = $CFG->{fullscreen}; 1594 $FULLSCREEN = $CFG->{fullscreen};
1452 $FAST = $CFG->{fast}; 1595 $FAST = $CFG->{fast};
1453 1596
1454 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1597 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1455 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1598 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1456 1599
1457 $SDL_ACTIVE = 1; 1600 $SDL_ACTIVE = 1;
1458 $LAST_REFRESH = time - 0.01; 1601 $LAST_REFRESH = time - 0.01;
1459 1602
1460 CFClient::OpenGL::init; 1603 CFPlus::OpenGL::init;
1461 1604
1462 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1605 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1463 1606
1464 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1607 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1465 1608
1466 ############################################################################# 1609 #############################################################################
1467 1610
1468 if ($DEBUG_STATUS) { 1611 if ($DEBUG_STATUS) {
1469 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1612 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1470 } else { 1613 } else {
1471 # create the widgets 1614 # create the widgets
1472 1615
1473 $DEBUG_STATUS = new CFClient::UI::Label 1616 $DEBUG_STATUS = new CFPlus::UI::Label
1474 padding => 0, 1617 padding => 0,
1475 z => 100, 1618 z => 100,
1476 force_x => "max", 1619 force_x => "max",
1477 force_y => 0; 1620 force_y => 0;
1478 $DEBUG_STATUS->show; 1621 $DEBUG_STATUS->show;
1479 1622
1480 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1623 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1481 1624
1482 $STATUSBOX = new CFClient::UI::Statusbox; 1625 $STATUSBOX = new CFPlus::UI::Statusbox;
1483 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1626 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1484 1627
1485 (new CFClient::UI::Frame 1628 (new CFPlus::UI::Frame
1486 bg => [0, 0, 0, 0.4], 1629 bg => [0, 0, 0, 0.4],
1487 force_x => 0, 1630 force_x => 0,
1488 force_y => "max", 1631 force_y => "max",
1489 child => $STATUSBOX, 1632 child => $STATUSBOX,
1490 )->show; 1633 )->show;
1491 1634
1492 CFClient::UI::FancyFrame->new ( 1635 CFPlus::UI::FancyFrame->new (
1493 title => "Map", 1636 title => "Map",
1494 name => "mapmap", 1637 name => "mapmap",
1495 x => 0, 1638 x => 0,
1496 y => $FONTSIZE + 8, 1639 y => $FONTSIZE + 8,
1497 border_bg => [1, 1, 1, 192/255], 1640 border_bg => [1, 1, 1, 192/255],
1498 bg => [1, 1, 1, 0], 1641 bg => [1, 1, 1, 0],
1499 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1642 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1500 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1643 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1501 ), 1644 ),
1502 )->show; 1645 )->show;
1503 1646
1504 $MAPWIDGET = new CFClient::MapWidget; 1647 $MAPWIDGET = new CFPlus::MapWidget;
1505 $MAPWIDGET->connect (activate_console => sub { 1648 $MAPWIDGET->connect (activate_console => sub {
1506 my ($mapwidget, $preset) = @_; 1649 my ($mapwidget, $preset) = @_;
1507 1650
1508 if ($CONSOLE) { 1651 if ($CONSOLE) {
1509 $CONSOLE->{input}->{auto_activated} = 1; 1652 $CONSOLE->{input}->{auto_activated} = 1;
1510 $CONSOLE->{input}->focus_in; 1653 $CONSOLE->{input}->grab_focus;
1511 1654
1512 if ($preset && $CONSOLE->{input}->get_text eq '') { 1655 if ($preset && $CONSOLE->{input}->get_text eq '') {
1513 $CONSOLE->{input}->set_text ($preset); 1656 $CONSOLE->{input}->set_text ($preset);
1514 } 1657 }
1515 } 1658 }
1516 }); 1659 });
1517 $MAPWIDGET->show; 1660 $MAPWIDGET->show;
1518 $MAPWIDGET->focus_in; 1661 $MAPWIDGET->grab_focus;
1519 1662
1520 $LOGVIEW = new CFClient::UI::TextScroller 1663 $LOGVIEW = new CFPlus::UI::TextScroller
1521 expand => 1, 1664 expand => 1,
1522 font => $FONT_FIXED, 1665 font => $FONT_FIXED,
1523 fontsize => $::CFG->{log_fontsize}, 1666 fontsize => $::CFG->{log_fontsize},
1524 indent => -4, 1667 indent => -4,
1525 can_hover => 1, 1668 can_hover => 1,
1526 can_events => 1, 1669 can_events => 1,
1527 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1670 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1528 ; 1671 ;
1529 1672
1530 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1673 $SETUP_DIALOG = new CFPlus::UI::FancyFrame
1531 title => "Setup", 1674 title => "Setup",
1532 name => "setup_dialog", 1675 name => "setup_dialog",
1533 x => 'center', 1676 x => 'center',
1534 y => 'center', 1677 y => 'center',
1535 z => 2, 1678 z => 2,
1536 force_w => $::WIDTH * 0.6, 1679 force_w => $::WIDTH * 0.6,
1537 force_h => $::HEIGHT * 0.6, 1680 force_h => $::HEIGHT * 0.6,
1681 has_close_button => 1,
1538 ; 1682 ;
1539 1683
1684 $METASERVER = metaserver_dialog;
1685
1540 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1686 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1541 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1687 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1542 1688
1543 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1689 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1544 "Configure the server to play on, your username, password and other server-related options."); 1690 "Configure the server to play on, your username, password and other server-related options.");
1545 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1691 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1546 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1692 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1547 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1693 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1548 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1694 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1549 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1695 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1550 "Configure the use of audio, sound effects and background music."); 1696 "Configure the use of audio, sound effects and background music.");
1551 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1697 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1552 "Lets you define, edit and delete bindings." 1698 "Lets you define, edit and delete key bindings."
1553 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1699 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1554 . "with nothing set and the recording started. After doing the actions you " 1700 . "with nothing set and the recording started. After doing the actions you "
1555 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1701 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1556 . "After pressing the combo the binding will be saved automatically and the " 1702 . "After pressing the combo the binding will be saved automatically and the "
1557 . "binding editor closes"); 1703 . "binding editor closes");
1558 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1559 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1560 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1704 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1561 "Some debuggign options. Do not ask."); 1705 "Some debuggin' options. Do not ask.");
1562 1706
1563 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1707 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1564 1708
1565 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1709 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1566 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1710 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1567 1711
1568 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1712 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1569 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1713 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1570 1714
1571 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 1715 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
1572 1716
1573 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1574 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1575 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1717 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1576 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1718 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1577 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1578 1719
1579 $BUTTONBAR->add (new CFClient::UI::Button 1720 $BUTTONBAR->add (new CFPlus::UI::Button
1580 text => "Save Config", 1721 text => "Save Config",
1581 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1722 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1582 on_activate => sub { 1723 on_activate => sub {
1583 $::CFG->{layout} = CFClient::UI::get_layout; 1724 $::CFG->{layout} = CFPlus::UI::get_layout;
1584 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1725 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1585 status "Configuration Saved"; 1726 status "Configuration Saved";
1727 0
1586 }, 1728 },
1587 ); 1729 );
1588 1730
1589 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1731 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1590 tooltip => "View Documentation"); 1732 tooltip => "View Documentation");
1591 1733
1592 $BUTTONBAR->add (new CFClient::UI::Button 1734 $BUTTONBAR->add (new CFPlus::UI::Button
1593 text => "Quit", 1735 text => "Quit",
1594 tooltip => "Terminates the program", 1736 tooltip => "Terminates the program",
1595 on_activate => sub { 1737 on_activate => sub {
1596 if ($CONN) { 1738 if ($CONN) {
1597 open_quit_dialog; 1739 open_quit_dialog;
1598 } else { 1740 } else {
1599 exit; 1741 exit;
1600 } 1742 }
1743 0
1601 }, 1744 },
1602 ); 1745 );
1603 1746
1604 $BUTTONBAR->show; 1747 $BUTTONBAR->show;
1605 $SETUP_DIALOG->show; 1748 $SETUP_DIALOG->show;
… …
1607 1750
1608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1751 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1609} 1752}
1610 1753
1611sub video_shutdown { 1754sub video_shutdown {
1755 CFPlus::OpenGL::shutdown;
1756
1612 undef $SDL_ACTIVE; 1757 undef $SDL_ACTIVE;
1613} 1758}
1614 1759
1615my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1760my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1616my $bgmusic;#TODO#hack#d# 1761my $bgmusic;#TODO#hack#d#
… …
1623 1768
1624sub audio_music_finished { 1769sub audio_music_finished {
1625 return unless $CFG->{bgm_enable}; 1770 return unless $CFG->{bgm_enable};
1626 1771
1627 # TODO: hack, do play loop and mood music 1772 # TODO: hack, do play loop and mood music
1628 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 1773 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1629 $bgmusic->play (0); 1774 $bgmusic->play (0);
1630 1775
1631 push @bgmusic, shift @bgmusic; 1776 push @bgmusic, shift @bgmusic;
1632} 1777}
1633 1778
1634sub audio_init { 1779sub audio_init {
1635 if ($CFG->{audio_enable}) { 1780 if ($CFG->{audio_enable}) {
1636 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1781 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1637 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1782 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1638 1783
1639 unless ($SDL_MIXER) { 1784 unless ($SDL_MIXER) {
1640 status "Unable to open sound device: there will be no sound"; 1785 status "Unable to open sound device: there will be no sound";
1641 return; 1786 return;
1642 } 1787 }
1643 1788
1644 CFClient::Mix_AllocateChannels 8; 1789 CFPlus::Mix_AllocateChannels 8;
1645 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1790 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1646 1791
1647 audio_music_finished; 1792 audio_music_finished;
1648 1793
1649 while (<$fh>) { 1794 while (<$fh>) {
1650 next if /^\s*#/; 1795 next if /^\s*#/;
… …
1653 my ($file, $volume, $event) = split /\s+/, $_, 3; 1798 my ($file, $volume, $event) = split /\s+/, $_, 3;
1654 1799
1655 push @SOUNDS, "$volume,$file"; 1800 push @SOUNDS, "$volume,$file";
1656 1801
1657 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1802 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1658 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1803 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1659 $chunk->volume ($volume * 128 / 100); 1804 $chunk->volume ($volume * 128 / 100);
1660 $chunk 1805 $chunk
1661 }; 1806 };
1662 } 1807 }
1663 } else { 1808 } else {
… …
1665 } 1810 }
1666 } 1811 }
1667} 1812}
1668 1813
1669sub audio_shutdown { 1814sub audio_shutdown {
1670 CFClient::Mix_CloseAudio if $SDL_MIXER; 1815 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1671 undef $SDL_MIXER; 1816 undef $SDL_MIXER;
1672 @SOUNDS = (); 1817 @SOUNDS = ();
1673 %AUDIO_CHUNKS = (); 1818 %AUDIO_CHUNKS = ();
1674} 1819}
1675 1820
… …
1682 1827
1683sub force_refresh { 1828sub force_refresh {
1684 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1829 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1685 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1830 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1686 1831
1687 $CFClient::UI::ROOT->draw; 1832 $CFPlus::UI::ROOT->draw;
1688 1833
1689 $WANT_REFRESH = 0; 1834 $WANT_REFRESH = 0;
1690 $CAN_REFRESH = 0; 1835 $CAN_REFRESH = 0;
1691 $LAST_REFRESH = $NOW; 1836 $LAST_REFRESH = $NOW;
1692 1837
16930 && do {
1694 # some weird model-drawing code, just a joke right now
1695 use CFClient::OpenGL;
1696
1697 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1698 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1699 $demo{r} ||= do {
1700 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1701 $mod->{v} = pack "f*", @{$mod->{v}};
1702 $_ = [scalar @$_, pack "S!*", @$_]
1703 for values %{$mod->{g}};
1704 $mod
1705 };
1706
1707 my $r = $demo{r} or die;
1708
1709 glDepthMask 1;
1710 glClear GL_DEPTH_BUFFER_BIT;
1711 glEnable GL_TEXTURE_2D;
1712 glEnable GL_DEPTH_TEST;
1713 glEnable GL_CULL_FACE;
1714 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1715
1716 glMatrixMode GL_PROJECTION;
1717 glLoadIdentity;
1718 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1719 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1720 glMatrixMode GL_MODELVIEW;
1721 glLoadIdentity;
1722
1723 glPushMatrix;
1724 glTranslate 0, 0, -800;
1725 glScale 1, -1, 1;
1726 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1727 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1728 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1729 glScale 50, 50, 50;
1730
1731 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1732 while (my ($k, $v) = each %{$r->{g}}) {
1733 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1734 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1735 }
1736
1737 glPopMatrix;
1738
1739 glShadeModel GL_FLAT;
1740 glDisable GL_DEPTH_TEST;
1741 glDisable GL_TEXTURE_2D;
1742 glDepthMask 0;
1743
1744 $WANT_REFRESH++;
1745};
1746
1747 CFClient::SDL_GL_SwapBuffers; 1838 CFPlus::SDL_GL_SwapBuffers;
1748} 1839}
1749 1840
1750my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1841my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1751 $NOW = time; 1842 $NOW = time;
1752 1843
1753 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1844 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1754 for CFClient::SDL_PollEvent; 1845 for CFPlus::SDL_PollEvent;
1755 1846
1756 if (%animate_object) { 1847 if (%animate_object) {
1757 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1848 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1758 $WANT_REFRESH++; 1849 $WANT_REFRESH++;
1759 } 1850 }
… …
1783 $CONN->face_prefetch 1874 $CONN->face_prefetch
1784 if $CONN; 1875 if $CONN;
1785}); 1876});
1786 1877
1787%SDL_CB = ( 1878%SDL_CB = (
1788 CFClient::SDL_QUIT => sub { 1879 CFPlus::SDL_QUIT => sub {
1789 Event::unloop -1; 1880 Event::unloop -1;
1790 }, 1881 },
1791 CFClient::SDL_VIDEORESIZE => sub { 1882 CFPlus::SDL_VIDEORESIZE => sub {
1792 }, 1883 },
1793 CFClient::SDL_VIDEOEXPOSE => sub { 1884 CFPlus::SDL_VIDEOEXPOSE => sub {
1794 CFClient::UI::full_refresh; 1885 CFPlus::UI::full_refresh;
1795 }, 1886 },
1796 CFClient::SDL_ACTIVEEVENT => sub { 1887 CFPlus::SDL_ACTIVEEVENT => sub {
1797# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1888# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1798 }, 1889 },
1799 CFClient::SDL_KEYDOWN => sub { 1890 CFPlus::SDL_KEYDOWN => sub {
1800 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1891 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1801 # alt-enter 1892 # alt-enter
1893 $FULLSCREEN_ENABLE->toggle;
1802 video_shutdown; 1894 video_shutdown;
1803 $CFG->{fullscreen} = !$CFG->{fullscreen};
1804 video_init; 1895 video_init;
1805 } else { 1896 } else {
1806 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1897 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1807 } 1898 }
1808 }, 1899 },
1809 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1900 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1810 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1901 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1811 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1902 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1812 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1903 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1813 CFClient::SDL_USEREVENT => sub { 1904 CFPlus::SDL_USEREVENT => sub {
1814 if ($_[0]{code} == 1) { 1905 if ($_[0]{code} == 1) {
1815 audio_channel_finished $_[0]{data1}; 1906 audio_channel_finished $_[0]{data1};
1816 } elsif ($_[0]{code} == 0) { 1907 } elsif ($_[0]{code} == 0) {
1817 audio_music_finished; 1908 audio_music_finished;
1818 } 1909 }
… …
1822############################################################################# 1913#############################################################################
1823 1914
1824$SIG{INT} = $SIG{TERM} = sub { exit }; 1915$SIG{INT} = $SIG{TERM} = sub { exit };
1825 1916
1826{ 1917{
1827 local $SIG{__DIE__} = sub {
1828 return unless defined $^S && !$^S;
1829 Carp::confess $_[1];#d#TODO: remove when stable
1830 CFClient::fatal $_[0];
1831 };
1832
1833 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1918 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1834 CFClient::UI::set_layout ($::CFG->{layout}); 1919 CFPlus::UI::set_layout ($::CFG->{layout});
1835 1920
1836 my %DEF_CFG = ( 1921 my %DEF_CFG = (
1837 sdl_mode => 0, 1922 sdl_mode => 0,
1838 width => 640, 1923 width => 640,
1839 height => 480, 1924 height => 480,
1840 fullscreen => 0, 1925 fullscreen => 0,
1841 fast => 0, 1926 fast => 0,
1842 map_scale => 1, 1927 map_scale => 1,
1843 fow_enable => 1, 1928 fow_enable => 1,
1844 fow_intensity => 0.45, 1929 fow_intensity => 0.45,
1845 fow_smooth => 0, 1930 fow_smooth => 0,
1846 gui_fontsize => 1, 1931 gui_fontsize => 1,
1847 log_fontsize => 0.7, 1932 log_fontsize => 0.7,
1848 gauge_fontsize=> 1, 1933 gauge_fontsize => 1,
1849 gauge_size => 0.35, 1934 gauge_size => 0.35,
1850 stat_fontsize => 0.7, 1935 stat_fontsize => 0.7,
1851 mapsize => 100, 1936 mapsize => 100,
1852 host => "crossfire.schmorp.de",
1853 say_command => 'say', 1937 say_command => 'say',
1854 audio_enable => 1, 1938 audio_enable => 1,
1855 bgm_enable => 1, 1939 bgm_enable => 1,
1856 bgm_volume => 0.25, 1940 bgm_volume => 0.25,
1857 face_prefetch => 0, 1941 face_prefetch => 0,
1858 output_sync => 1, 1942 output_sync => 1,
1859 output_count => 1, 1943 output_count => 1,
1860 pickup => 0, 1944 pickup => 0,
1945 inv_sort => "mtime",
1946 default => "profile", # default profile
1947 );
1861 ); 1948
1862
1863 while (my ($k, $v) = each %DEF_CFG) { 1949 while (my ($k, $v) = each %DEF_CFG) {
1864 $CFG->{$k} = $v unless exists $CFG->{$k}; 1950 $CFG->{$k} = $v unless exists $CFG->{$k};
1865 } 1951 }
1866 1952
1953 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1954
1867 sdl_init; 1955 sdl_init;
1868 1956
1869 @SDL_MODES = reverse 1957 @SDL_MODES = reverse
1870 grep $_->[0] >= 640 && $_->[1] >= 480, 1958 grep $_->[0] >= 640 && $_->[1] >= 480,
1871 CFClient::SDL_ListModes; 1959 CFPlus::SDL_ListModes;
1872 1960
1873 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1961 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1874 1962
1875 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1963 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1876 1964
1877 { 1965 {
1878 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1966 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1879 DejaVuSans.ttf 1967 DejaVuSans.ttf
1880 DejaVuSansMono.ttf 1968 DejaVuSansMono.ttf
1881 DejaVuSans-Bold.ttf 1969 DejaVuSans-Bold.ttf
1882 DejaVuSansMono-Bold.ttf 1970 DejaVuSansMono-Bold.ttf
1883 DejaVuSans-Oblique.ttf 1971 DejaVuSans-Oblique.ttf
1884 DejaVuSansMono-Oblique.ttf 1972 DejaVuSansMono-Oblique.ttf
1885 DejaVuSans-BoldOblique.ttf 1973 DejaVuSans-BoldOblique.ttf
1886 DejaVuSansMono-BoldOblique.ttf 1974 DejaVuSansMono-BoldOblique.ttf
1887 ); 1975 );
1888 1976
1889 CFClient::add_font $_ for @fonts; 1977 CFPlus::add_font $_ for @fonts;
1890 1978
1891 CFClient::pango_init; 1979 CFPlus::pango_init;
1892 1980
1893 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1981 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1894 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1982 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1895 1983
1896 $FONT_PROP->make_default; 1984 $FONT_PROP->make_default;
1897 } 1985 }
1898 1986
1899# compare mono (ft) vs. rgba (cairo) 1987# compare mono (ft) vs. rgba (cairo)
1900# ft - 1.8s, cairo 3s, even in alpha-only mode 1988# ft - 1.8s, cairo 3s, even in alpha-only mode
1901# for my $rgba (0..1) { 1989# for my $rgba (0..1) {
1902# my $t1 = Time::HiRes::time; 1990# my $t1 = Time::HiRes::time;
1903# for (1..1000) { 1991# for (1..1000) {
1904# my $layout = CFClient::Layout->new ($rgba); 1992# my $layout = CFPlus::Layout->new ($rgba);
1905# $layout->set_text ("hallo" x 100); 1993# $layout->set_text ("hallo" x 100);
1906# $layout->render; 1994# $layout->render;
1907# } 1995# }
1908# my $t2 = Time::HiRes::time; 1996# my $t2 = Time::HiRes::time;
1909# warn $t2-$t1; 1997# warn $t2-$t1;
… …
1912 video_init; 2000 video_init;
1913 audio_init; 2001 audio_init;
1914} 2002}
1915 2003
1916Event::loop; 2004Event::loop;
2005#CFPlus::SDL_Quit;
2006#CFPlus::_exit 0;
1917 2007
1918END { CFClient::SDL_Quit } 2008END { CFPlus::SDL_Quit }
1919 2009
1920=head1 NAME 2010=head1 NAME
1921 2011
1922cfplus - A Crossfire+ and Crossfire game client 2012cfplus - A Crossfire+ and Crossfire game client
1923 2013

Diff Legend

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