ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

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