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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.110 by root, Sun Aug 13 18:48:57 2006 UTC

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

Diff Legend

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