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.31 by root, Tue May 30 02:22:03 2006 UTC vs.
Revision 1.105 by elmex, Sun Jul 30 13:40:18 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines