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

Diff Legend

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