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

Diff Legend

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