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.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.105 by elmex, Sun Jul 30 13:40:18 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines