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

Diff Legend

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