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.74 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.117 by elmex, Tue Aug 15 06:30:05 2006 UTC

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

Diff Legend

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