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.25 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.107 by root, Sun Aug 13 03:20:56 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 $INVR_LBL; 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 my ($w, $h) = $DEBUG_STATUS->size_request; 149}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 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 => "#stat_$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;
118} 361}
119 362
120sub start_game { 363sub start_game {
121 status "logging in..."; 364 status "logging in...";
122 365
123 $LOGIN_BUTTON->set_text ("Logout"); 366 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 367 $SETUP_DIALOG->hide;
125 368
126 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;
127 370
128 my ($host, $port) = split /:/, $CFG->{host}; 371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
129 372
130 $MAP = new CFClient::Map $mapsize, $mapsize; 373 $MAP = new CFPlus::Map $mapsize, $mapsize;
131 374
132 $CONN = eval { 375 $CONN = eval {
133 new CFClient::Protocol 376 new CFPlus::Protocol
134 host => $host, 377 host => $host,
135 port => $port || 13327, 378 port => $port || 13327,
136 user => $CFG->{user}, 379 user => $CFG->{profile}{default}{user},
137 pass => $CFG->{password}, 380 pass => $CFG->{profile}{default}{password},
138 mapw => $mapsize, 381 mapw => $mapsize,
139 maph => $mapsize, 382 maph => $mapsize,
140 383
141 map_widget => $MAPWIDGET, 384 map_widget => $MAPWIDGET,
142 logview => $LOGVIEW, 385 logview => $LOGVIEW,
143 statusbox => $STATUSBOX, 386 statusbox => $STATUSBOX,
144 map => $MAP, 387 map => $MAP,
145 mapmap => $MAPMAP, 388 mapmap => $MAPMAP,
389 query => \&server_query,
146 390
147 sound_play => sub { 391 sound_play => sub {
148 my ($x, $y, $soundnum, $type) = @_; 392 my ($x, $y, $soundnum, $type) = @_;
149 393
150 $SDL_MIXER 394 $SDL_MIXER
156 $chunk->play; 400 $chunk->play;
157 }, 401 },
158 }; 402 };
159 403
160 if ($CONN) { 404 if ($CONN) {
161 CFClient::lowdelay fileno $CONN->{fh}; 405 CFPlus::lowdelay fileno $CONN->{fh};
162 406
163 status "login successful"; 407 status "login successful";
164 } else { 408 } else {
165 status "unable to connect"; 409 status "unable to connect";
166 stop_game(); 410 stop_game();
167 } 411 }
168} 412}
169 413
170sub stop_game { 414sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 415 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 416 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 418 $PL_WINDOW->hide;
174 $LOGVIEW->hide; 419 $SPELL_PAGE->clear_spells;
175 420
176 return unless $CONN; 421 return unless $CONN;
177 422
178 status "connection closed"; 423 status "connection closed";
179 424
425 destroy_query_dialog $CONN;
180 $CONN->destroy; 426 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 427 $CONN = 0; # false, does not autovivify
182}
183 428
184sub client_setup { 429 undef $MAP;
185 my $dialog = new CFClient::UI::FancyFrame 430}
186 req_x => 1, 431
187 req_y => $HEIGHT * (1/8), 432sub graphics_setup {
188 name => "client_setup", 433 my $vbox = new CFPlus::UI::VBox;
189 title => "Client Setup", 434
190 child => (my $vbox = new CFClient::UI::VBox);
191 $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]);
192 436
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 438 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
195 439
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, 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]);
197 $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");
198 442
199 $mode_slider->connect (changed => sub { 443 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 444 my ($self, $value) = @_;
201 445
202 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 446 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
204 }); 448 });
205 $mode_slider->emit (changed => $mode_slider->{range}[0]); 449 $mode_slider->emit (changed => $mode_slider->{range}[0]);
206 450
207 my $row = 1; 451 my $row = 1;
208 452
209 $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");
210 $table->add (1, $row++, new CFClient::UI::CheckBox 454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
211 state => $CFG->{fullscreen}, 455 state => $CFG->{fullscreen},
212 tooltip => "Bring the client into fullscreen mode.", 456 tooltip => "Bring the client into fullscreen mode.",
213 on_changed => sub { 457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
214 my ($self, $value) = @_;
215 $CFG->{fullscreen} = $value;
216 }
217 ); 458 );
218 459
219 $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");
220 $table->add (1, $row++, new CFClient::UI::CheckBox 461 $table->add (1, $row++, new CFPlus::UI::CheckBox
221 state => $CFG->{fast}, 462 state => $CFG->{fast},
222 tooltip => "Lower the visual quality considerably to speed up rendering.", 463 tooltip => "Lower the visual quality considerably to speed up rendering.",
223 on_changed => sub { 464 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
224 my ($self, $value) = @_;
225 $CFG->{fast} = $value;
226 }
227 ); 465 );
228 466
229 $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");
230 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFPlus::UI::Slider
231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 469 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 470 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
233 on_changed => sub { 471 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
234 my ($self, $value) = @_;
235 $CFG->{map_scale} = 2 ** $value;
236 }
237 ); 472 );
238 473
239 $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");
240 $table->add (1, $row++, new CFClient::UI::CheckBox 475 $table->add (1, $row++, new CFPlus::UI::CheckBox
241 state => $CFG->{fow_enable}, 476 state => $CFG->{fow_enable},
242 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.",
243 on_changed => sub { 478 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
244 my ($self, $value) = @_;
245 $CFG->{fow_enable} = $value;
246 }
247 ); 479 );
248 480
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFPlus::UI::Slider
251 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 483 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
252 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.",
253 on_changed => sub { 485 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
254 my ($self, $value) = @_;
255 $CFG->{fow_intensity} = $value;
256 }
257 ); 486 );
258 487
259 $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");
260 $table->add (1, $row++, new CFClient::UI::CheckBox 489 $table->add (1, $row++, new CFPlus::UI::CheckBox
261 state => $CFG->{fow_smooth}, 490 state => $CFG->{fow_smooth},
262 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.",
263 on_changed => sub { 492 on_changed => sub {
264 my ($self, $value) = @_; 493 my ($self, $value) = @_;
265 $CFG->{fow_smooth} = $value; 494 $CFG->{fow_smooth} = $value;
266 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
267 } 497 }
268 ); 498 );
269 499
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 501 $table->add (1, $row++, new CFPlus::UI::Slider
272 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 502 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
273 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.",
274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 504 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
275 ); 505 );
276 506
277 $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");
278 $table->add (1, $row++, new CFClient::UI::Slider 508 $table->add (1, $row++, new CFPlus::UI::Slider
279 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 509 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
280 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.",
281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 511 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
282 ); 512 );
283 513
284 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
285
286 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
289 on_changed => sub {
290 $CFG->{stat_fontsize} = $_[1];
291 &set_stats_window_fontsize;
292 }
293 );
294
295 $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");
296 $table->add (1, $row++, new CFClient::UI::Slider 515 $table->add (1, $row++, new CFPlus::UI::Slider
297 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 516 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
298 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.",
299 on_changed => sub { 518 on_changed => sub {
300 $CFG->{gauge_fontsize} = $_[1]; 519 $CFG->{gauge_fontsize} = $_[1];
301 &set_gauge_window_fontsize; 520 &set_gauge_window_fontsize;
521 0
302 } 522 }
303 ); 523 );
304 524
305 $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");
306 $table->add (1, $row++, new CFClient::UI::Slider 526 $table->add (1, $row++, new CFPlus::UI::Slider
307 range => [$CFG->{gauge_size}, 0.2, 0.8], 527 range => [$CFG->{gauge_size}, 0.2, 0.8],
308 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.",
309 on_changed => sub { 529 on_changed => sub {
310 $CFG->{gauge_size} = $_[1]; 530 $CFG->{gauge_size} = $_[1];
311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 531 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532 0
312 } 533 }
313 ); 534 );
314 535
315 $table->add (1, $row++, new CFClient::UI::Button 536 $table->add (1, $row++, new CFPlus::UI::Button
316 expand => 1, align => 0, text => "Apply", 537 expand => 1, align => 0, text => "Apply",
317 tooltip => "Apply the video settings", 538 tooltip => "Apply the video settings",
318 on_activate => sub { 539 on_activate => sub {
319 video_shutdown (); 540 video_shutdown ();
320 video_init (); 541 video_init ();
542 0
321 } 543 }
322 ); 544 );
323 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
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 557 $table->add (1, $row++, new CFPlus::UI::CheckBox
326 state => $CFG->{audio_enable}, 558 state => $CFG->{audio_enable},
327 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.",
328 on_changed => sub { 560 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
329 $CFG->{audio_enable} = $_[1];
330 }
331 ); 561 );
332# $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");
333# $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 {
334# $CFG->{effects_volume} = $_[1]; 564# $CFG->{effects_volume} = $_[1];
335# }); 565# });
336 $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");
337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 567 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
338 $hbox->add (new CFClient::UI::CheckBox 568 $hbox->add (new CFPlus::UI::CheckBox
339 expand => 1, state => $CFG->{bgm_enable}, 569 expand => 1, state => $CFG->{bgm_enable},
340 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.",
341 on_changed => sub { 571 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
342 $CFG->{bgm_enable} = $_[1];
343 }
344 ); 572 );
345 $hbox->add (new CFClient::UI::Slider 573 $hbox->add (new CFPlus::UI::Slider
346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 574 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
347 tooltip => "The volume of the background music. Changes are instant.", 575 tooltip => "The volume of the background music. Changes are instant.",
348 on_changed => sub { 576 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
349 $CFG->{bgm_volume} = $_[1];
350 CFClient::MixMusic::volume $_[1] * 128;
351 }
352 ); 577 );
353 578
354 $table->add (1, $row++, new CFClient::UI::Button 579 $table->add (1, $row++, new CFPlus::UI::Button
355 expand => 1, align => 0, text => "Apply", 580 expand => 1, align => 0, text => "Apply",
356 tooltip => "Apply the audio settings", 581 tooltip => "Apply the audio settings",
357 on_activate => sub { 582 on_activate => sub {
358 audio_shutdown (); 583 audio_shutdown ();
359 audio_init (); 584 audio_init ();
585 0
360 } 586 }
361 ); 587 );
362 588
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 589 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376}
377
378sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize});
381 }
382} 590}
383 591
384sub set_gauge_window_fontsize { 592sub set_gauge_window_fontsize {
385 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 593 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386 $_->set_fontsize ($::CFG->{gauge_fontsize}); 594 $_->set_fontsize ($::CFG->{gauge_fontsize});
388} 596}
389 597
390sub make_gauge_window { 598sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 599 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 600
393 my $win = new CFClient::UI::Frame ( 601 my $win = new CFPlus::UI::Frame (
394 req_x => 0, 602 force_x => 0,
395 req_y => -1, 603 force_y => "max",
396 def_w => $WIDTH, 604 force_w => $WIDTH,
397 def_h => $gh, 605 force_h => $gh,
398 ); 606 );
399 607
400 $win->add (my $hbox = new CFClient::UI::HBox 608 $win->add (my $hbox = new CFPlus::UI::HBox
401 children => [ 609 children => [
402 (new CFClient::UI::HBox expand => 1), 610 (new CFPlus::UI::HBox expand => 1),
403 (new CFClient::UI::VBox children => [ 611 (new CFPlus::UI::VBox children => [
404 (new CFClient::UI::Empty expand => 1), 612 (new CFPlus::UI::Empty expand => 1),
405 (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)),
406 ]), 614 ]),
407 (my $vbox = new CFClient::UI::VBox), 615 (my $vbox = new CFPlus::UI::VBox),
408 ], 616 ],
409 ); 617 );
410 618
411 $vbox->add (new CFClient::UI::HBox 619 $vbox->add (new CFPlus::UI::HBox
412 expand => 1, 620 expand => 1,
413 children => [ 621 children => [
414 (new CFClient::UI::Empty expand => 1), 622 (new CFPlus::UI::Empty expand => 1),
415 (my $hb = new CFClient::UI::HBox), 623 (my $hb = new CFPlus::UI::HBox),
416 ], 624 ],
417 ); 625 );
418 626
419 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
420 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.");
421 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
422 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.");
423 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
424 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.");
425 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
426 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.");
427 635
428 $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,
429 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.");
430 $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,
431 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.)");
432 640
433 $GAUGES = { 641 $GAUGES = {
434 exp => $exp, win => $win, range => $rng, 642 exp => $exp, win => $win, range => $rng,
435 food => $fg, mana => $mg, hp => $hg, grace => $gg 643 food => $fg, mana => $mg, hp => $hg, grace => $gg
438 &set_gauge_window_fontsize; 646 &set_gauge_window_fontsize;
439 647
440 $win 648 $win
441} 649}
442 650
651sub debug_setup {
652 my $table = new CFPlus::UI::Table;
443 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
444sub make_stats_window { 679sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 680 my $r = new CFPlus::UI::ScrolledWindow (
446 req_y => $HEIGHT * (2/8),
447 req_x => -1, 681 expand => 1,
448 title => "Stats", 682 scroll_y => 1
449 name => "stats_window"; 683 );
684 $r->add (my $vb = new CFPlus::UI::VBox);
450 685
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
452 $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,
453 can_hover => 1, can_events => 1, 687 can_hover => 1, can_events => 1,
454 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.");
455 $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,
456 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
457 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).");
458 692
459 $vb->add (my $hb0 = new CFClient::UI::HBox); 693 $vb->add (my $hb0 = new CFPlus::UI::HBox);
460 $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,
461 can_hover => 1, can_events => 1, 695 can_hover => 1, can_events => 1,
462 tooltip => "The weight of the player including all inventory items."); 696 tooltip => "The weight of the player including all inventory items.");
463 $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,
464 can_hover => 1, can_events => 1, 698 can_hover => 1, can_events => 1,
465 tooltip => "The weight limit: you cannot carry more than this."); 699 tooltip => "The weight limit: you cannot carry more than this.");
466 700
467
468 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
469 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470 703
471 my $color2 = [1, 1, 0]; 704 my $color2 = [1, 1, 0];
472 705
473 for ( 706 for (
474 [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],
475 [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],
476 [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],
477 [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],
478 [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],
479 [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],
480 [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],
481 714
482 [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],
483 [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],
484 [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],
485 [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],
486 [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],
487 [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],
488 ) { 721 ) {
489 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 722 my ($col, $row, $id, $label, $template) = @$_;
490 723
491 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492 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 => "#stat_$label");
493 $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
494 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 => "#stat_$label");
495 } 730 }
496 731
497 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
498 733
499 my $row = 0; 734 my $row = 0;
500 my $col = 0; 735 my $col = 0;
501 736
502 my %resist_names = ( 737 my %resist_names = (
738 slow => ["Slow",
503 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",
504 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",
505 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",
506 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",
507 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",
508 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",
509 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",
510 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",
511 pois => "<b>Poison</b> (resistance to getting poisoned)", 755 "<b>Poison</b> (resistance to getting poisoned)"],
756 para => ["Paralysation",
512 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",
513 deat => "<b>Death</b> (resistance against death spells)", 759 "<b>Death</b> (resistance against death spells)"],
514 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",
515 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",
516 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",
517 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",
518 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",
519 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",
520 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)"],
521 ); 774 );
522 for (qw/slow holyw conf fire depl magic 775 for (qw/slow holyw conf fire depl magic
523 drain acid pois para deat phys 776 drain acid pois para deat phys
524 blind fear tund elec cold ghit/) 777 blind fear tund elec cold ghit/)
525 { 778 {
526 $tbl2->add ($col, $row, 779 $tbl2->add ($col, $row,
527 $STATWIDS->{"res_$_"} = 780 $STATWIDS->{"res_$_"} =
528 new CFClient::UI::Label 781 new CFPlus::UI::Label
529 font => $FONT_FIXED, 782 font => $FONT_FIXED,
530 template => "-100%", 783 template => "-100%",
531 align => +1, 784 align => +1,
532 valign => 0, 785 valign => 0,
533 can_events => 1, 786 can_events => 1,
534 can_hover => 1, 787 can_hover => 1,
535 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
536 ); 789 );
537 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 790 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
538 font => $FONT_FIXED, 791 font => $FONT_FIXED,
539 can_hover => 1, 792 can_hover => 1,
540 can_events => 1, 793 can_events => 1,
541 image => "ui/resist/resist_$_.png", 794 path => "ui/resist/resist_$_.png",
542 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],
543 ); 803 );
544 804
545 $row++; 805 $row++;
546 if ($row % 6 == 0) { 806 if ($row % 6 == 0) {
547 $col += 2; 807 $col += 3;
548 $row = 0; 808 $row = 0;
549 } 809 }
550 } 810 }
551 811
552 &set_stats_window_fontsize;
553 update_stats_window ({}); 812 #update_stats_window ({});
554 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]);
555 $tgw 820 $sw
556} 821}
557 822
558sub formsep { 823sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560}
561
562sub update_stats_window {
563 my ($stats) = @_;
564
565 # I love text protocols...
566
567 my $hp = $stats->{+CS_STAT_HP} * 1;
568 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569 my $sp = $stats->{+CS_STAT_SP} * 1;
570 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571 my $fo = $stats->{+CS_STAT_FOOD} * 1;
572 my $fo_m = 999;
573 my $gr = $stats->{+CS_STAT_GRACE} * 1;
574 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576 $GAUGES->{hp} ->set_value ($hp, $hp_m);
577 $GAUGES->{mana} ->set_value ($sp, $sp_m);
578 $GAUGES->{food} ->set_value ($fo, $fo_m);
579 $GAUGES->{grace} ->set_value ($gr, $gr_m);
580 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582 my $rng = $stats->{+CS_STAT_RANGE};
583 $rng =~ s/^Range: //; # thank you so much dear server
584 $GAUGES->{range} ->set_text ("Rng: " . $rng);
585 my $title = $stats->{+CS_STAT_TITLE};
586 $title =~ s/^Player: //;
587 $STATWIDS->{title} ->set_text ("Title: " . $title);
588
589 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = (
607 phys => 100,
608 magic => 101,
609 fire => 102,
610 elec => 103,
611 cold => 104,
612 conf => 105,
613 acid => 106,
614 drain => 107,
615 ghit => 108,
616 pois => 109,
617 slow => 110,
618 para => 111,
619 tund => 112,
620 fear => 113,
621 depl => 113,
622 deat => 115,
623 holyw => 116,
624 blind => 117,
625 );
626
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl;
629}
630
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639} 825}
640 826
641my $METASERVER_ATIME; 827my $METASERVER_ATIME;
642 828
643sub update_metaserver { 829sub update_metaserver {
644 my ($HOST) = @_; 830 my ($metaserver_dialog) = @_;
831
832 $METASERVER = $metaserver_dialog
833 if defined $metaserver_dialog;
645 834
646 return if $METASERVER_ATIME > time; 835 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 836 $METASERVER_ATIME = time + 60;
648 837
649 my $table = $METASERVER->{table}; 838 my $table = $METASERVER->{table};
650 $table->clear; 839 $table->clear;
651 $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...");
652 841
653 my $buf; 842 my $buf;
654 843
655 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
656 845
671 860
672 utf8::decode $buf if utf8::valid $buf; 861 utf8::decode $buf if utf8::valid $buf;
673 862
674 $table->clear; 863 $table->clear;
675 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 );
676 my @col = qw(Use #Users Host Uptime Version Description); 872 my @col = qw(#Users Host Uptime Version Description);
677 $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[$_])
678 for 0 .. $#col; 877 for 0 .. $#col;
679 878
680 my @align = qw(1 0 1 1 -1); 879 my @align = qw(1 0 1 1 -1);
681 880
682 my $y = 0; 881 my $y = 0;
683 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) {
700 899
701 $m = [$users, $host, $uptime, $version, $desc]; 900 $m = [$users, $host, $uptime, $version, $desc];
702 901
703 $y++; 902 $y++;
704 903
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 904 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
706 (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 {
707 $HOST->set_text ($CFG->{host} = $host); 909 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910 $METASERVER->hide;
911 0
912 },
708 }), 913 ),
709 (new CFClient::UI::Empty expand => 1), 914 (new CFPlus::UI::Empty expand => 1),
710 ]); 915 ]);
711 916
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 917 $table->add ($_, $y, new CFPlus::UI::Label
713 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)
714 for 0 .. $#$m; 925 for 0 .. $#$m;
715 } 926 }
716 } 927 }
717 }); 928 });
718} 929}
719 930
720sub server_setup { 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
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 936 my $dialog = new CFPlus::UI::FancyFrame
722 x => $WIDTH * (1/3), 937 title => "Server List",
723 y => $HEIGHT * (1/8), 938 name => 'metaserver_dialog',
724 name => "server_setup", 939 x => 'center',
725 title => "Server Setup", 940 y => 'center',
726 child => (my $vbox = new CFClient::UI::VBox), 941 z => 3,
942 force_h => $::HEIGHT * 0.4,
943 child => $vbox,
944 has_close_button => 1,
945 table => $table,
727 on_visibility_change => sub { 946 on_visibility_change => sub {
728 my ($self, $visible) = @_; 947 update_metaserver ($_[0]) if $_[1];
729 $self->center if $visible; 948 0
730 }, 949 },
731 ; 950 ;
732 951
952 $dialog
953}
954
955sub server_setup {
956 my $vbox = new CFPlus::UI::VBox;
957
733 $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]);
734 $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");
735 960
736 { 961 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
738 963
739 $vbox->add ( 964 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 965 $HOST_ENTRY = new CFPlus::UI::Entry
741 expand => 1, 966 expand => 1,
742 text => $CFG->{host}, 967 text => $CFG->{profile}{default}{host},
743 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",
744 on_changed => sub { 969 on_changed => sub {
745 my ($self, $value) = @_; 970 my ($self, $value) = @_;
746 $CFG->{host} = $value; 971 $CFG->{profile}{default}{host} = $value;
972 0
747 } 973 }
748 ); 974 );
749 975
750 $METASERVER = metaserver_dialog;
751
752 $vbox->add (new CFClient::UI::Flopper 976 $vbox->add (new CFPlus::UI::Button
753 expand => 1, 977 expand => 1,
754 text => "Server List", 978 text => "Server List",
755 other => $METASERVER, 979 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 980 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 981 on_activate => sub { $METASERVER->toggle_visibility; 0 },
758 update_metaserver $HOST; 982 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
759 }
760 ); 983 );
761 } 984 }
762 985
763 $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");
764 $table->add (1, 4, new CFClient::UI::Entry 987 $table->add (1, 4, new CFPlus::UI::Entry
765 text => $CFG->{user}, 988 text => $CFG->{profile}{default}{user},
766 tooltip => "The name of your character on the server", 989 tooltip => "The name of your character on the server",
767 on_changed => sub { 990 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
768 my ($self, $value) = @_;
769 $CFG->{user} = $value;
770 }
771 ); 991 );
772 992
773 $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");
774 $table->add (1, 5, new CFClient::UI::Entry 994 $table->add (1, 5, new CFPlus::UI::Entry
775 text => $CFG->{password}, 995 text => $CFG->{profile}{default}{password},
776 hidden => 1, 996 hidden => 1,
777 tooltip => "The password for your character", 997 tooltip => "The password for your character",
778 on_changed => sub { 998 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
779 my ($self, $value) = @_;
780 $CFG->{password} = $value;
781 }
782 ); 999 );
783 1000
784 $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");
785 $table->add (1, 7, new CFClient::UI::Slider 1002 $table->add (1, 7, new CFPlus::UI::Slider
786 req_w => 100, 1003 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1004 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 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. "
789 . "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, "
790 . "but you also increase bandwidth requirements and latency. " 1007 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 1008 . "This option is only used once at log-in.",
792 on_changed => sub { 1009 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
793 my ($self, $value) = @_;
794
795 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
796 },
797 ); 1010 );
798 1011
799 $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");
800 $table->add (1, 8, new CFClient::UI::CheckBox 1013 $table->add (1, 8, new CFPlus::UI::CheckBox
801 state => $CFG->{face_prefetch}, 1014 state => $CFG->{face_prefetch},
802 tooltip => "<b>Background Image Prefetch</b>\n\n" 1015 tooltip => "<b>Background Image Prefetch</b>\n\n"
803 . "If enabled, the client automatically pre-fetches images from the server. " 1016 . "If enabled, the client automatically pre-fetches images from the server. "
804 . "This might increase or create lag, but increases the chances " 1017 . "This might increase or create lag, but increases the chances "
805 . "of faces being ready for display when you encounter them. " 1018 . "of faces being ready for display when you encounter them. "
806 . "It also uses up server bandwidth on every connect, " 1019 . "It also uses up server bandwidth on every connect, "
807 . "so only set it if you really need to prefetch images. " 1020 . "so only set it if you really need to prefetch images. "
808 . "This option can be set and unset any time.", 1021 . "This option can be set and unset any time.",
809 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1022 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
810 ); 1023 );
811 1024
812 $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");
813 $table->add (1, 9, new CFClient::UI::Entry 1026 $table->add (1, 9, new CFPlus::UI::Entry
814 text => $CFG->{output_count}, 1027 text => $CFG->{output_count},
815 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.",
816 on_changed => sub { $CFG->{output_count} = $_[1] }, 1029 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
817 ); 1030 );
818 1031
819 $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");
820 $table->add (1, 10, new CFClient::UI::Entry 1033 $table->add (1, 10, new CFPlus::UI::Entry
821 text => $CFG->{output_sync}, 1034 text => $CFG->{output_sync},
822 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.",
823 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1036 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
824 ); 1037 );
825 1038
826 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1039 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
827 expand => 1, 1040 expand => 1,
828 align => 0, 1041 align => 0,
829 text => "Login", 1042 text => "Login",
830 on_activate => sub { 1043 on_activate => sub {
831 $CONN ? stop_game 1044 $CONN ? stop_game
832 : start_game; 1045 : start_game;
1046 0
833 }, 1047 },
834 ); 1048 );
835 1049
836 $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
837} 1073}
838 1074
839sub message_window { 1075sub message_window {
840 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFPlus::UI::FancyFrame
841 name => "message_window", 1077 name => "message_window",
842 title => "Messages", 1078 title => "Messages",
843 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75], 1080 x => "max",
845 req_x => -1,
846 req_y => 0, 1081 y => 0,
847 def_w => int $::WIDTH / 3, 1082 force_w => $::WIDTH * 0.4,
848 def_h => int $::HEIGHT / 5, 1083 force_h => $::HEIGHT * 0.5,
849 child => (my $vbox = new CFClient::UI::VBox); 1084 child => (my $vbox = new CFPlus::UI::VBox),
1085 has_close_button => 1;
850 1086
851 $vbox->add ($LOGVIEW); 1087 $vbox->add ($LOGVIEW);
852 1088
853 $vbox->add (my $input = new CFClient::UI::Entry 1089 $vbox->add (my $input = new CFPlus::UI::Entry
854 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> "
855 . "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>...). "
856 . "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). "
857 . "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.",
858 on_focus_in => sub { 1094 on_focus_in => sub {
862 1098
863 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1099 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
864 $input->{refocus_map} = 1; 1100 $input->{refocus_map} = 1;
865 } 1101 }
866 delete $input->{auto_activated}; 1102 delete $input->{auto_activated};
1103
1104 0
867 }, 1105 },
868 on_activate => sub { 1106 on_activate => sub {
869 my ($input, $text) = @_; 1107 my ($input, $text) = @_;
870 $input->set_text (''); 1108 $input->set_text ('');
871 1109
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) { 1110 if ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1); 1111 $::CONN->user_send ($1);
876 } else { 1112 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say'; 1113 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text"); 1114 $::CONN->user_send ("$say_cmd $text");
879 } 1115 }
880 if ($input->{refocus_map}) { 1116 if ($input->{refocus_map}) {
881 delete $input->{refocus_map}; 1117 delete $input->{refocus_map};
882 $MAPWIDGET->focus_in 1118 $MAPWIDGET->focus_in
883 } 1119 }
1120
1121 0
884 }, 1122 },
885 on_escape => sub { 1123 on_escape => sub {
886 $MAPWIDGET->focus_in 1124 $MAPWIDGET->grab_focus;
1125
1126 0
887 }, 1127 },
888 ); 1128 );
889 1129
890 $CONSOLE = { 1130 $CONSOLE = {
891 window => $window, 1131 window => $window,
892 input => $input 1132 input => $input,
893 }; 1133 };
894 1134
895 $window 1135 $window
1136}
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;
896} 1155}
897 1156
898sub open_quit_dialog { 1157sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 1158 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1160 x => "center",
1161 y => "center",
1162 z => 50,
1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1168 ;
901 1169
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
903 1171
904 $vb->add (new CFClient::UI::Label 1172 $vb->add (new CFPlus::UI::Label
905 text => "You should find a savebed and apply it first!", 1173 text => "You should find a savebed and apply it first!",
906 max_w => $WIDTH * 0.25, 1174 max_w => $WIDTH * 0.25,
907 ellipsize => 0, 1175 ellipsize => 0,
908 ); 1176 );
909 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
910 $hb->add (new CFClient::UI::Button 1178 $hb->add (new CFPlus::UI::Button
911 text => "Ok", 1179 text => "Ok",
912 expand => 1, 1180 expand => 1,
913 on_activate => sub { $QUIT_DIALOG->hide }, 1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
914 ); 1182 );
915 $hb->add (new CFClient::UI::Button 1183 $hb->add (new CFPlus::UI::Button
916 text => "Quit anyway", 1184 text => "Quit anyway",
917 expand => 1, 1185 expand => 1,
918 on_activate => sub { exit }, 1186 on_activate => sub { exit },
919 ); 1187 );
920 } 1188 }
921 1189
922 $QUIT_DIALOG->show; 1190 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 1191 $QUIT_DIALOG->grab_focus;
924} 1192}
925 1193
926sub make_inventory_window { 1194sub autopickup_setup {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1195 my $table = new CFPlus::UI::Table;
928 def_w => $WIDTH * 7/8, 1196
929 def_h => $HEIGHT * 7/8, 1197 for (
930 title => "Inventory", 1198 ["General", 0, 0,
931 name => "inventory_window", 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] },
932 on_visibility_change => sub { 1271 on_changed => sub {
933 my ($self, $visible) = @_; 1272 my ($slider, $value) = @_;
934 $self->center if $visible; 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
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]});
935 }, 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 {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1359 x => "center",
1360 y => "center",
1361 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10,
1363 title => "Player",
1364 name => "playerbook",
1365 has_close_button => 1
936 ; 1366 ;
937 1367
938 $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;
939 1371
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1372 $ntb->add (
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1373 "Statistics (F2)" => $STATS_PAGE = stats_window,
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1374 "Shows statistics, where all your Stats and Resistances are shown."
943
944 $hb->add (my $vb2 = new CFClient::UI::VBox);
945
946 $vb2->add (my $hb2 = new CFClient::UI::HBox);
947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
948 $hb2->add (new CFClient::UI::Button
949 text => "Close",
950 tooltip => "Close the currently open container (if one is open)",
951 on_activate => sub {
952 $CONN->send ("apply $CONN->{open_container}")
953 if $CONN->{open_container} != 0;
954 },
955 ); 1375 );
1376 $ntb->add (
1377 "Skills (F3)" => $SKILL_PAGE = skill_window,
1378 "Shows all your Skills."
1379 );
956 1380
957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 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 );
958 1392
959 $invwin 1393 $ntb->set_current_page ($INVENTORY_PAGE);
960}
961 1394
962sub make_binding_window { 1395 $plwin->add ($ntb);
1396 $plwin
1397}
1398
1399sub update_bindings {
1400 $BIND_UPD_CB->() if $BIND_UPD_CB;
1401}
1402
1403sub keyboard_setup {
963 my $binding_list = new CFClient::UI::VBox; 1404 my $binding_list = new CFPlus::UI::VBox;
964 1405
965 my $refresh = sub { 1406 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub {
966 $binding_list->clear (); 1408 $binding_list->clear ();
967 1409
968 for my $mod (keys %{$::CFG->{bindings}}) { 1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972 1414
973 my $lbl = join "; ", @$cmds; 1415 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym); 1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox); 1417 $binding_list->add (my $hb = new CFPlus::UI::HBox);
976 $hb->add (new CFClient::UI::Button 1418 $hb->add (new CFPlus::UI::Button
977 text => "delete", 1419 text => "delete",
1420 tooltip => "Deletes the binding",
978 on_activate => sub { 1421 on_activate => sub {
979 $binding_list->remove ($hb); 1422 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym}; 1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1424 0
981 }); 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
982 $hb->add (new CFClient::UI::Label text => "($nam)"); 1450 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1451 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
984 } 1452 }
985 } 1453 }
986 }; 1454 };
987 1455
988 $BIND_WINDOW = new CFClient::UI::FancyFrame 1456 my $vb = new CFPlus::UI::VBox;
989 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
1513 x => 'center',
1514 y => 'center',
1515 z => 2,
1516 name => 'doc_browser',
990 def_w => int $WIDTH * 7/8, 1517 force_w => int $WIDTH * 7/8,
991 def_h => int $HEIGHT * 7/8, 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::section pod => $pod);
1544 $viewer->set_offset (0);
1545
1546 0
1547 },
992 on_visibility_change => sub { 1548 on_visibility_change => sub {
993 my ($self, $visible) = @_; 1549 my ($self, $visible) = @_;
994 if ($visible) { 1550 return unless $visible;
995 $self->center; 1551 return if $self->{value};
996 $refresh->() 1552 $self->set_value ("intro");
997 } 1553 0
998 }; 1554 },
999
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->();
1002 $BIND_WINDOW
1003}
1004
1005sub make_help_window {
1006 my $win = new CFClient::UI::FancyFrame
1007 def_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8,
1009 title => "Documentation";
1010
1011 $win->add (my $vbox = new CFClient::UI::VBox);
1012
1013 $vbox->add (my $buttons = new CFClient::UI::HBox);
1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1015
1016 for (
1017 [intro => "Introduction"],
1018 [manual => "Manual"],
1019 [command_help => "Commands"],
1020 [skill_help => "Skills"],
1021 ) {
1022 my ($pod, $label) = @$_;
1023
1024 $buttons->add (new CFClient::UI::Button
1025 text => $label,
1026 on_activate => sub {
1027 my $parser = new Pod::POM;
1028 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1029
1030 $viewer->clear;
1031
1032 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1033 for @{ CFClient::pod_to_pango_list $pom };
1034
1035 $viewer->set_offset (0);
1036 },
1037 ); 1555 );
1038 }
1039
1040 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1041 1556
1042 $win 1557 $win
1043} 1558}
1044 1559
1045sub sdl_init { 1560sub sdl_init {
1046 CFClient::SDL_Init 1561 CFPlus::SDL_Init
1047 and die "SDL::Init failed!\n"; 1562 and die "SDL::Init failed!\n";
1048} 1563}
1049 1564
1050sub video_init { 1565sub video_init {
1051 sdl_init; 1566 sdl_init;
1056 1571
1057 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1572 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1058 $FULLSCREEN = $CFG->{fullscreen}; 1573 $FULLSCREEN = $CFG->{fullscreen};
1059 $FAST = $CFG->{fast}; 1574 $FAST = $CFG->{fast};
1060 1575
1061 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1576 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1062 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1577 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1063 1578
1064 $SDL_ACTIVE = 1; 1579 $SDL_ACTIVE = 1;
1065 $LAST_REFRESH = time - 0.01; 1580 $LAST_REFRESH = time - 0.01;
1066 1581
1067 CFClient::OpenGL::init; 1582 CFPlus::OpenGL::init;
1068 1583
1069 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1584 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1070 1585
1071 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1586 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1072 1587
1073 ############################################################################# 1588 #############################################################################
1074 1589
1075 if ($DEBUG_STATUS) { 1590 if ($DEBUG_STATUS) {
1076 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1591 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1077 } else { 1592 } else {
1078 # create the widgets 1593 # create the widgets
1079 1594
1080 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1595 $DEBUG_STATUS = new CFPlus::UI::Label
1596 padding => 0,
1597 z => 100,
1598 force_x => "max",
1599 force_y => 0;
1081 $DEBUG_STATUS->show; 1600 $DEBUG_STATUS->show;
1082 1601
1602 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1603
1083 $STATUSBOX = new CFClient::UI::Statusbox; 1604 $STATUSBOX = new CFPlus::UI::Statusbox;
1084 $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]);
1085 1606
1086 (new CFClient::UI::Frame 1607 (new CFPlus::UI::Frame
1087 bg => [0, 0, 0, 0.4], 1608 bg => [0, 0, 0, 0.4],
1088 req_y => -1, 1609 force_x => 0,
1610 force_y => "max",
1089 child => $STATUSBOX, 1611 child => $STATUSBOX,
1090 )->show; 1612 )->show;
1091 1613
1092 CFClient::UI::FancyFrame->new ( 1614 CFPlus::UI::FancyFrame->new (
1615 title => "Map",
1616 name => "mapmap",
1617 x => 0,
1618 y => $FONTSIZE + 8,
1093 border_bg => [1, 1, 1, 192/255], 1619 border_bg => [1, 1, 1, 192/255],
1094 bg => [1, 1, 1, 0], 1620 bg => [1, 1, 1, 0],
1095 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1621 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1096 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.",
1097 ), 1623 ),
1098 )->show; 1624 )->show;
1099 1625
1100 $MAPWIDGET = new CFClient::MapWidget; 1626 $MAPWIDGET = new CFPlus::MapWidget;
1101 $MAPWIDGET->connect (activate_console => sub { 1627 $MAPWIDGET->connect (activate_console => sub {
1102 my ($mapwidget, $preset) = @_; 1628 my ($mapwidget, $preset) = @_;
1103 1629
1104 if ($CONSOLE) { 1630 if ($CONSOLE) {
1105 $CONSOLE->{input}->{auto_activated} = 1; 1631 $CONSOLE->{input}->{auto_activated} = 1;
1106 $CONSOLE->{input}->focus_in; 1632 $CONSOLE->{input}->grab_focus;
1107 1633
1108 if ($preset && $CONSOLE->{input}->get_text eq '') { 1634 if ($preset && $CONSOLE->{input}->get_text eq '') {
1109 $CONSOLE->{input}->set_text ($preset); 1635 $CONSOLE->{input}->set_text ($preset);
1110 } 1636 }
1111 } 1637 }
1112 }); 1638 });
1113 $MAPWIDGET->show; 1639 $MAPWIDGET->show;
1114 $MAPWIDGET->focus_in; 1640 $MAPWIDGET->grab_focus;
1115 1641
1116 $LOGVIEW = new CFClient::UI::TextView 1642 $LOGVIEW = new CFPlus::UI::TextScroller
1117 expand => 1, 1643 expand => 1,
1118 font => $FONT_FIXED, 1644 font => $FONT_FIXED,
1119 fontsize => $::CFG->{log_fontsize}, 1645 fontsize => $::CFG->{log_fontsize},
1646 indent => -4,
1120 can_hover => 1, 1647 can_hover => 1,
1121 can_events => 1, 1648 can_events => 1,
1122 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.",
1123 ; 1650 ;
1124 1651
1125 $BUTTONBAR = new CFClient::UI::HBox; 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 ;
1126 1662
1127 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1663 $METASERVER = metaserver_dialog;
1128 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1664
1129 $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,
1130 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
1131 $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,
1132 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.");
1133 1693
1134 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
1135 1695
1136 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1137 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1138 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1696 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1139 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.");
1140 1698
1141 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFPlus::UI::Button
1142 text => "Save Config", 1700 text => "Save Config",
1143 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.",
1144 on_activate => sub { 1702 on_activate => sub {
1145 $::CFG->{layout} = CFClient::UI::get_layout; 1703 $::CFG->{layout} = CFPlus::UI::get_layout;
1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1704 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1147 status "Configuration Saved"; 1705 status "Configuration Saved";
1706 0
1148 }, 1707 },
1149 ); 1708 );
1150 1709
1151 $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,
1152 tooltip => "View Documentation"); 1711 tooltip => "View Documentation");
1153 1712
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161
1162 $BUTTONBAR->add (new CFClient::UI::Button 1713 $BUTTONBAR->add (new CFPlus::UI::Button
1163 text => "Quit", 1714 text => "Quit",
1164 tooltip => "Terminates the program", 1715 tooltip => "Terminates the program",
1165 on_activate => sub { 1716 on_activate => sub {
1166 if ($CONN) { 1717 if ($CONN) {
1167 open_quit_dialog; 1718 open_quit_dialog;
1168 } else { 1719 } else {
1169 exit; 1720 exit;
1170 } 1721 }
1722 0
1171 }, 1723 },
1172 ); 1724 );
1173 1725
1174 $BUTTONBAR->show; 1726 $BUTTONBAR->show;
1175 1727 $SETUP_DIALOG->show;
1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1177
1178 $SERVER_SETUP->show;
1179 } 1728 }
1729
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1180} 1731}
1181 1732
1182sub video_shutdown { 1733sub video_shutdown {
1734 CFPlus::OpenGL::shutdown;
1735
1183 undef $SDL_ACTIVE; 1736 undef $SDL_ACTIVE;
1184} 1737}
1185 1738
1186my @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#
1187my $bgmusic;#TODO#hack#d# 1740my $bgmusic;#TODO#hack#d#
1194 1747
1195sub audio_music_finished { 1748sub audio_music_finished {
1196 return unless $CFG->{bgm_enable}; 1749 return unless $CFG->{bgm_enable};
1197 1750
1198 # TODO: hack, do play loop and mood music 1751 # TODO: hack, do play loop and mood music
1199 $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]";
1200 $bgmusic->play (0); 1753 $bgmusic->play (0);
1201 1754
1202 push @bgmusic, shift @bgmusic; 1755 push @bgmusic, shift @bgmusic;
1203} 1756}
1204 1757
1205sub audio_init { 1758sub audio_init {
1206 if ($CFG->{audio_enable}) { 1759 if ($CFG->{audio_enable}) {
1207 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1760 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1208 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1761 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1209 1762
1210 unless ($SDL_MIXER) { 1763 unless ($SDL_MIXER) {
1211 status "Unable to open sound device: there will be no sound"; 1764 status "Unable to open sound device: there will be no sound";
1212 return; 1765 return;
1213 } 1766 }
1214 1767
1215 CFClient::Mix_AllocateChannels 8; 1768 CFPlus::Mix_AllocateChannels 8;
1216 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1769 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1217 1770
1218 audio_music_finished; 1771 audio_music_finished;
1219 1772
1220 while (<$fh>) { 1773 while (<$fh>) {
1221 next if /^\s*#/; 1774 next if /^\s*#/;
1224 my ($file, $volume, $event) = split /\s+/, $_, 3; 1777 my ($file, $volume, $event) = split /\s+/, $_, 3;
1225 1778
1226 push @SOUNDS, "$volume,$file"; 1779 push @SOUNDS, "$volume,$file";
1227 1780
1228 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1781 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1229 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";
1230 $chunk->volume ($volume * 128 / 100); 1783 $chunk->volume ($volume * 128 / 100);
1231 $chunk 1784 $chunk
1232 }; 1785 };
1233 } 1786 }
1234 } else { 1787 } else {
1236 } 1789 }
1237 } 1790 }
1238} 1791}
1239 1792
1240sub audio_shutdown { 1793sub audio_shutdown {
1241 CFClient::Mix_CloseAudio if $SDL_MIXER; 1794 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1242 undef $SDL_MIXER; 1795 undef $SDL_MIXER;
1243 @SOUNDS = (); 1796 @SOUNDS = ();
1244 %AUDIO_CHUNKS = (); 1797 %AUDIO_CHUNKS = ();
1245} 1798}
1246 1799
1251 1804
1252my %demo;#d# 1805my %demo;#d#
1253 1806
1254sub force_refresh { 1807sub force_refresh {
1255 $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;
1256 debug sprintf "%3.2f", $fps; 1809 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1257 1810
1258 $CFClient::UI::ROOT->draw; 1811 $CFPlus::UI::ROOT->draw;
1259 1812
1260 $WANT_REFRESH = 0; 1813 $WANT_REFRESH = 0;
1261 $CAN_REFRESH = 0; 1814 $CAN_REFRESH = 0;
1262 $LAST_REFRESH = $NOW; 1815 $LAST_REFRESH = $NOW;
1263 1816
12640 && do {
1265 # some weird model-drawing code, just a joke right now
1266 use CFClient::OpenGL;
1267
1268 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1269 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1270 $demo{r} ||= do {
1271 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1272 $mod->{v} = pack "f*", @{$mod->{v}};
1273 $_ = [scalar @$_, pack "S!*", @$_]
1274 for values %{$mod->{g}};
1275 $mod
1276 };
1277
1278 my $r = $demo{r} or die;
1279
1280 glDepthMask 1;
1281 glClear GL_DEPTH_BUFFER_BIT;
1282 glEnable GL_TEXTURE_2D;
1283 glEnable GL_DEPTH_TEST;
1284 glEnable GL_CULL_FACE;
1285 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1286
1287 glMatrixMode GL_PROJECTION;
1288 glLoadIdentity;
1289 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1290 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1291 glMatrixMode GL_MODELVIEW;
1292 glLoadIdentity;
1293
1294 glPushMatrix;
1295 glTranslate 0, 0, -800;
1296 glScale 1, -1, 1;
1297 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1298 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1299 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1300 glScale 50, 50, 50;
1301
1302 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1303 while (my ($k, $v) = each %{$r->{g}}) {
1304 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1305 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1306 }
1307
1308 glPopMatrix;
1309
1310 glShadeModel GL_FLAT;
1311 glDisable GL_DEPTH_TEST;
1312 glDisable GL_TEXTURE_2D;
1313 glDepthMask 0;
1314
1315 $WANT_REFRESH++;
1316};
1317
1318 CFClient::SDL_GL_SwapBuffers; 1817 CFPlus::SDL_GL_SwapBuffers;
1319} 1818}
1320 1819
1321my $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 {
1322 $NOW = time; 1821 $NOW = time;
1323 1822
1324 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1823 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1325 for CFClient::SDL_PollEvent; 1824 for CFPlus::SDL_PollEvent;
1326 1825
1327 if (%animate_object) { 1826 if (%animate_object) {
1328 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1827 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1329 $WANT_REFRESH++; 1828 $WANT_REFRESH++;
1330 } 1829 }
1354 $CONN->face_prefetch 1853 $CONN->face_prefetch
1355 if $CONN; 1854 if $CONN;
1356}); 1855});
1357 1856
1358%SDL_CB = ( 1857%SDL_CB = (
1359 CFClient::SDL_QUIT => sub { 1858 CFPlus::SDL_QUIT => sub {
1360 Event::unloop -1; 1859 Event::unloop -1;
1361 }, 1860 },
1362 CFClient::SDL_VIDEORESIZE => sub { 1861 CFPlus::SDL_VIDEORESIZE => sub {
1363 }, 1862 },
1364 CFClient::SDL_VIDEOEXPOSE => sub { 1863 CFPlus::SDL_VIDEOEXPOSE => sub {
1365 CFClient::UI::full_refresh; 1864 CFPlus::UI::full_refresh;
1366 }, 1865 },
1367 CFClient::SDL_ACTIVEEVENT => sub { 1866 CFPlus::SDL_ACTIVEEVENT => sub {
1368# 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#
1369 }, 1868 },
1370 CFClient::SDL_KEYDOWN => sub { 1869 CFPlus::SDL_KEYDOWN => sub {
1371 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1870 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1372 # alt-enter 1871 # alt-enter
1872 $FULLSCREEN_ENABLE->toggle;
1373 video_shutdown; 1873 video_shutdown;
1374 $CFG->{fullscreen} = !$CFG->{fullscreen};
1375 video_init; 1874 video_init;
1376 } else { 1875 } else {
1377 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1876 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1378 } 1877 }
1379 }, 1878 },
1380 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1879 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1381 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1880 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1382 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1881 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1383 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1882 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1384 CFClient::SDL_USEREVENT => sub { 1883 CFPlus::SDL_USEREVENT => sub {
1385 if ($_[0]{code} == 1) { 1884 if ($_[0]{code} == 1) {
1386 audio_channel_finished $_[0]{data1}; 1885 audio_channel_finished $_[0]{data1};
1387 } elsif ($_[0]{code} == 0) { 1886 } elsif ($_[0]{code} == 0) {
1388 audio_music_finished; 1887 audio_music_finished;
1389 } 1888 }
1393############################################################################# 1892#############################################################################
1394 1893
1395$SIG{INT} = $SIG{TERM} = sub { exit }; 1894$SIG{INT} = $SIG{TERM} = sub { exit };
1396 1895
1397{ 1896{
1398 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1399
1400 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1897 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1401 CFClient::UI::set_layout ($::CFG->{layout}); 1898 CFPlus::UI::set_layout ($::CFG->{layout});
1402 1899
1403 my %DEF_CFG = ( 1900 my %DEF_CFG = (
1404 sdl_mode => 0, 1901 sdl_mode => 0,
1405 width => 640, 1902 width => 640,
1406 height => 480, 1903 height => 480,
1407 fullscreen => 0, 1904 fullscreen => 0,
1408 fast => 0, 1905 fast => 0,
1409 map_scale => 1, 1906 map_scale => 1,
1410 fow_enable => 1, 1907 fow_enable => 1,
1411 fow_intensity => 0.45, 1908 fow_intensity => 0.45,
1412 fow_smooth => 0, 1909 fow_smooth => 0,
1413 gui_fontsize => 1, 1910 gui_fontsize => 1,
1414 log_fontsize => 1, 1911 log_fontsize => 0.7,
1415 gauge_fontsize=> 1, 1912 gauge_fontsize => 1,
1416 gauge_size => 0.35, 1913 gauge_size => 0.35,
1417 stat_fontsize => 1, 1914 stat_fontsize => 0.7,
1418 mapsize => 100, 1915 mapsize => 100,
1419 host => "crossfire.schmorp.de",
1420 say_command => 'say', 1916 say_command => 'say',
1421 audio_enable => 1, 1917 audio_enable => 1,
1422 bgm_enable => 1, 1918 bgm_enable => 1,
1423 bgm_volume => 0.25, 1919 bgm_volume => 0.25,
1424 face_prefetch => 0, 1920 face_prefetch => 0,
1425 output_sync => 1, 1921 output_sync => 1,
1426 output_count => 1, 1922 output_count => 1,
1923 pickup => 0,
1924 inv_sort => "mtime",
1925 default => "profile", # default profile
1926 );
1427 ); 1927
1428
1429 while (my ($k, $v) = each %DEF_CFG) { 1928 while (my ($k, $v) = each %DEF_CFG) {
1430 $CFG->{$k} = $v unless exists $CFG->{$k}; 1929 $CFG->{$k} = $v unless exists $CFG->{$k};
1431 } 1930 }
1432 1931
1932 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1933
1433 sdl_init; 1934 sdl_init;
1434 1935
1435 @SDL_MODES = reverse 1936 @SDL_MODES = reverse
1436 grep $_->[0] >= 640 && $_->[1] >= 480, 1937 grep $_->[0] >= 640 && $_->[1] >= 480,
1437 CFClient::SDL_ListModes; 1938 CFPlus::SDL_ListModes;
1438 1939
1439 @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)";
1440 1941
1441 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1942 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1442 1943
1443 { 1944 {
1444 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1945 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1445 DejaVuSans.ttf 1946 DejaVuSans.ttf
1446 DejaVuSansMono.ttf 1947 DejaVuSansMono.ttf
1447 DejaVuSans-Bold.ttf 1948 DejaVuSans-Bold.ttf
1448 DejaVuSansMono-Bold.ttf 1949 DejaVuSansMono-Bold.ttf
1449 DejaVuSans-Oblique.ttf 1950 DejaVuSans-Oblique.ttf
1450 DejaVuSansMono-Oblique.ttf 1951 DejaVuSansMono-Oblique.ttf
1451 DejaVuSans-BoldOblique.ttf 1952 DejaVuSans-BoldOblique.ttf
1452 DejaVuSansMono-BoldOblique.ttf 1953 DejaVuSansMono-BoldOblique.ttf
1453 ); 1954 );
1454 1955
1455 CFClient::add_font $_ for @fonts; 1956 CFPlus::add_font $_ for @fonts;
1456 1957
1457 CFClient::pango_init; 1958 CFPlus::pango_init;
1458 1959
1459 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1960 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1460 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1961 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1461 1962
1462 $FONT_PROP->make_default; 1963 $FONT_PROP->make_default;
1463 } 1964 }
1464 1965
1465# compare mono (ft) vs. rgba (cairo) 1966# compare mono (ft) vs. rgba (cairo)
1466# ft - 1.8s, cairo 3s, even in alpha-only mode 1967# ft - 1.8s, cairo 3s, even in alpha-only mode
1467# for my $rgba (0..1) { 1968# for my $rgba (0..1) {
1468# my $t1 = Time::HiRes::time; 1969# my $t1 = Time::HiRes::time;
1469# for (1..1000) { 1970# for (1..1000) {
1470# my $layout = CFClient::Layout->new ($rgba); 1971# my $layout = CFPlus::Layout->new ($rgba);
1471# $layout->set_text ("hallo" x 100); 1972# $layout->set_text ("hallo" x 100);
1472# $layout->render; 1973# $layout->render;
1473# } 1974# }
1474# my $t2 = Time::HiRes::time; 1975# my $t2 = Time::HiRes::time;
1475# warn $t2-$t1; 1976# warn $t2-$t1;
1478 video_init; 1979 video_init;
1479 audio_init; 1980 audio_init;
1480} 1981}
1481 1982
1482Event::loop; 1983Event::loop;
1984#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0;
1483 1986
1484END { CFClient::SDL_Quit } 1987END { CFPlus::SDL_Quit }
1485 1988
1486=head1 NAME 1989=head1 NAME
1487 1990
1488pclient - A Crossfire+ and Crossfire game client 1991cfplus - A Crossfire+ and Crossfire game client
1489 1992
1490=head1 SYNOPSIS 1993=head1 SYNOPSIS
1491 1994
1492Just run it - no commandline arguments are supported. 1995Just run it - no commandline arguments are supported.
1493 1996
1494=head1 USAGE 1997=head1 USAGE
1495 1998
1496Pclient 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
1497fullscreen and interactively. 2000fullscreen and interactively.
1498 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
1499=head1 AUTHOR 2012=head1 AUTHOR
1500 2013
1501Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2014Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1502 2015
1503 2016

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines