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.58 by root, Mon Jun 5 22:07:43 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 CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
… …
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
44$Event::DIED = sub { 43$Event::DIED = sub {
45 # TODO: display dialog box or so 44 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 46 CFClient::error $_[1];
47}; 47};
48 48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 50
… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
87
88our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK;
90our $SETUP_SERVER;
91our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
86 93
87our $FLOORBOX; 94our $FLOORBOX;
88our $GAUGES; 95our $GAUGES;
89our $STATWIDS; 96our $STATWIDS;
90 97
… …
97 104
98our $ALT_ENTER_MESSAGE; 105our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 106our $STATUSBOX;
100our $DEBUG_STATUS; 107our $DEBUG_STATUS;
101 108
102our $INVWIN; 109our $INV_WINDOW;
103our $INV; 110our $INV;
104our $INVR; 111our $INVR;
105our $INVR_LBL; 112our $INV_RIGHT_HB;
113
114our $BIND_EDITOR;
115
116our $PICKUP_CFG;
106 117
107sub status { 118sub status {
108 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
109} 120}
110 121
111sub debug { 122sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 123 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request;
114 $DEBUG_STATUS->move ($WIDTH - $w, 0);
115} 124}
116 125
117sub start_game { 126sub start_game {
118 status "logging in..."; 127 status "logging in...";
128
129 $LOGIN_BUTTON->set_text ("Logout");
130 $SETUP_DIALOG->hide;
119 131
120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 132 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121 133
122 my ($host, $port) = split /:/, $CFG->{host}; 134 my ($host, $port) = split /:/, $CFG->{host};
123 135
… …
152 }; 164 };
153 165
154 if ($CONN) { 166 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 167 CFClient::lowdelay fileno $CONN->{fh};
156 168
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 169 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 170 } else {
164 status "unable to connect"; 171 status "unable to connect";
165 stop_game(); 172 stop_game();
166 } 173 }
167} 174}
168 175
169sub stop_game { 176sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181
170 return unless $CONN; 182 return unless $CONN;
171 183
172 status "connection closed"; 184 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 185
174 $CONN->destroy; 186 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 187 $CONN = 0; # false, does not autovivify
176
177 $BUTTONBAR->{children}[1]->emit ("activate")
178 unless $BUTTONBAR->{children}[1]->{state};
179} 188}
180 189
181sub client_setup { 190sub graphics_setup {
182 my $dialog = new CFClient::UI::FancyFrame
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 191 my $vbox = new CFClient::UI::VBox;
192
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 194
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 195 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 197
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 198 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 199 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 200
193 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 202 my ($self, $value) = @_;
195 203
… …
202 210
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 211 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 212 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 213 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 214 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 215 on_changed => sub {
208 my ($self, $value) = @_; 216 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 217 $CFG->{fullscreen} = $value;
210 } 218 }
211 ); 219 );
212 220
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 221 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 222 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 223 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 224 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 225 on_changed => sub {
218 my ($self, $value) = @_; 226 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 227 $CFG->{fast} = $value;
220 } 228 }
221 ); 229 );
222 230
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 232 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 235 on_changed => sub {
228 my ($self, $value) = @_; 236 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 237 $CFG->{map_scale} = 2 ** $value;
230 } 238 }
231 ); 239 );
232 240
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 242 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 243 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 244 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 245 on_changed => sub {
238 my ($self, $value) = @_; 246 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 247 $CFG->{fow_enable} = $value;
240 } 248 }
241 ); 249 );
242 250
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 251 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 252 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 253 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.", 254 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 { 255 on_changed => sub {
248 my ($self, $value) = @_; 256 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 257 $CFG->{fow_intensity} = $value;
250 } 258 }
251 ); 259 );
252 260
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 262 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 263 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 264 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 265 on_changed => sub {
258 my ($self, $value) = @_; 266 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 267 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 269 }
262 ); 270 );
263 271
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 274 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.", 275 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] }, 276 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 277 );
270 278
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 281 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.", 282 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]) }, 283 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 284 );
277 285
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 286 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279 287
280 $table->add (1, $row++, new CFClient::UI::Slider 288 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 289 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.", 290 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 291 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 292 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 293 &set_stats_window_fontsize;
286 } 294 }
287 ); 295 );
288 296
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 297 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 298 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 299 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.", 300 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 301 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 302 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 303 &set_gauge_window_fontsize;
296 } 304 }
297 ); 305 );
298 306
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 308 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 309 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 310 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 311 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 312 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 314 }
307 ); 315 );
308 316
309 $table->add (1, $row++, new CFClient::UI::Button 317 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 318 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 319 tooltip => "Apply the video settings",
312 connect_activate => sub { 320 on_activate => sub {
313 video_shutdown (); 321 video_shutdown ();
314 video_init (); 322 video_init ();
315 } 323 }
316 ); 324 );
325
326 $vbox
327}
328
329sub audio_setup {
330 my $vbox = new CFClient::UI::VBox;
331
332 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
333
334 my $row = 0;
317 335
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 337 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 338 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.", 339 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 { 340 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 341 $CFG->{audio_enable} = $_[1];
324 } 342 }
325 ); 343 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 344# $table->add (0, 9, new CFClient::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 { 345# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 346# $CFG->{effects_volume} = $_[1];
329# }); 347# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 348 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 349 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 350 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 351 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 352 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 353 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 354 $CFG->{bgm_enable} = $_[1];
337 } 355 }
338 ); 356 );
339 $hbox->add (new CFClient::UI::Slider 357 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 358 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 359 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 360 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 361 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 362 CFClient::MixMusic::volume $_[1] * 128;
345 } 363 }
346 ); 364 );
347 365
348 $table->add (1, $row++, new CFClient::UI::Button 366 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 367 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 368 tooltip => "Apply the audio settings",
351 connect_activate => sub { 369 on_activate => sub {
352 audio_shutdown (); 370 audio_shutdown ();
353 audio_init (); 371 audio_init ();
354 } 372 }
355 ); 373 );
356 374
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 375 $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} 376}
371 377
372sub set_stats_window_fontsize { 378sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 379 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 380 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 389
384sub make_gauge_window { 390sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 391 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 392
387 my $win = new CFClient::UI::Frame ( 393 my $win = new CFClient::UI::Frame (
388 req_y => -1, 394 force_x => 0,
395 force_y => "max",
389 user_w => $WIDTH, 396 force_w => $WIDTH,
390 user_h => $gh, 397 force_h => $gh,
391 ); 398 );
392 399
393 $win->add (my $hbox = new CFClient::UI::HBox 400 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 401 children => [
395 (new CFClient::UI::HBox expand => 1), 402 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
432 439
433 $win 440 $win
434} 441}
435 442
443
436sub make_stats_window { 444sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 445 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8),
447 x => "max",
448 title => "Stats",
449 name => "stats_window";
438 450
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 453 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."); 454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
445 tooltip => "The map you are currently on (if supported by the server)."); 457 tooltip => "The map you are currently on (if supported by the server).");
446 458
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 459 $vb->add (my $hb0 = new CFClient::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 460 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 461 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 462 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, 463 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 464 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 465 tooltip => "The weight limit: you cannot carry more than this.");
454 466
455 467
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 468 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 470
… …
541 update_stats_window ({}); 553 update_stats_window ({});
542 554
543 $tgw 555 $tgw
544} 556}
545 557
546sub formsep { 558sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 560}
549 561
550sub update_stats_window { 562sub update_stats_window {
551 my ($stats) = @_; 563 my ($stats) = @_;
552 564
553 # i love text protocols!!! 565 # I love text protocols...
554 my $hp = $stats->{Crossfire::Protocol::Base::CS_STAT_HP} * 1; 566
567 my $hp = $stats->{+CS_STAT_HP} * 1;
555 my $hp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXHP} * 1; 568 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
556 my $sp = $stats->{Crossfire::Protocol::Base::CS_STAT_SP} * 1; 569 my $sp = $stats->{+CS_STAT_SP} * 1;
557 my $sp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXSP} * 1; 570 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
558 my $fo = $stats->{Crossfire::Protocol::Base::CS_STAT_FOOD} * 1; 571 my $fo = $stats->{+CS_STAT_FOOD} * 1;
559 my $fo_m = 999; 572 my $fo_m = 999;
560 my $gr = $stats->{Crossfire::Protocol::Base::CS_STAT_GRACE} * 1; 573 my $gr = $stats->{+CS_STAT_GRACE} * 1;
561 my $gr_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXGRACE} * 1; 574 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
562 575
563 $GAUGES->{hp} ->set_value ($hp, $hp_m); 576 $GAUGES->{hp} ->set_value ($hp, $hp_m);
564 $GAUGES->{mana} ->set_value ($sp, $sp_m); 577 $GAUGES->{mana} ->set_value ($sp, $sp_m);
565 $GAUGES->{food} ->set_value ($fo, $fo_m); 578 $GAUGES->{food} ->set_value ($fo, $fo_m);
566 $GAUGES->{grace} ->set_value ($gr, $gr_m); 579 $GAUGES->{grace} ->set_value ($gr, $gr_m);
567 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) 580 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
568 . " (lvl " . ($stats->{Crossfire::Protocol::Base::CS_STAT_LEVEL} * 1) . ")"); 581 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
569 my $rng = $stats->{Crossfire::Protocol::Base::CS_STAT_RANGE}; 582 my $rng = $stats->{+CS_STAT_RANGE};
570 $rng =~ s/^Range: //; # thank you so much dear server 583 $rng =~ s/^Range: //; # thank you so much dear server
571 $GAUGES->{range} ->set_text ("Rng: " . $rng); 584 $GAUGES->{range} ->set_text ("Rng: " . $rng);
572 my $title = $stats->{Crossfire::Protocol::Base::CS_STAT_TITLE}; 585 my $title = $stats->{+CS_STAT_TITLE};
573 $title =~ s/^Player: //; 586 $title =~ s/^Player: //;
574 $STATWIDS->{title} ->set_text ("Title: " . $title); 587 $STATWIDS->{title} ->set_text ("Title: " . $title);
575 588
576 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 589 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
577 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 590 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
578 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 591 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
579 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 592 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
580 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 593 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
581 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
587 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_SPEED}); 600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_WEAP_SP}); 601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
589 602
590 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::Base::CS_STAT_WEIGHT_LIM} / 1000); 603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
591 604
605 # TODO: replace by CS_STAT_RES_xxx constants
592 my %tbl = ( 606 my %tbl = (
593 phys => 100, 607 phys => 100,
594 magic => 101, 608 magic => 101,
595 fire => 102, 609 fire => 102,
596 elec => 103, 610 elec => 103,
… …
605 tund => 112, 619 tund => 112,
606 fear => 113, 620 fear => 113,
607 depl => 113, 621 depl => 113,
608 deat => 115, 622 deat => 115,
609 holyw => 116, 623 holyw => 116,
610 blind => 117 624 blind => 117,
611 ); 625 );
612 626
613 for (keys %tbl) {
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615 } 628 for keys %tbl;
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} 629}
628 630
629my $METASERVER_ATIME; 631my $METASERVER_ATIME;
630 632
631sub update_metaserver { 633sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 634 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 635 $METASERVER_ATIME = time + 60;
636 636
637 my $table = $METASERVER->{table}; 637 my $table = $METASERVER->{table};
638 $table->clear; 638 $table->clear;
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 689 $m = [$users, $host, $uptime, $version, $desc];
690 690
691 $y++; 691 $y++;
692 692
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 693 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 694 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 695 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility;
696 }), 697 }),
697 (new CFClient::UI::Empty expand => 1), 698 (new CFClient::UI::Empty expand => 1),
698 ]); 699 ]);
699 700
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 701 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
703 } 704 }
704 } 705 }
705 }); 706 });
706} 707}
707 708
709sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List",
712 name => 'metaserver_dialog',
713 x => 'center',
714 y => 'center',
715 z => 3,
716 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub {
718 update_metaserver if $_[1];
719 },
720 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
708sub server_setup { 727sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 728 my $vbox = new CFClient::UI::VBox;
712 729
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 732
716 { 733 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 735
719 $vbox->add ( 736 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
721 expand => 1, 738 expand => 1,
722 text => $CFG->{host}, 739 text => $CFG->{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 741 on_changed => sub {
725 my ($self, $value) = @_; 742 my ($self, $value) = @_;
726 $CFG->{host} = $value; 743 $CFG->{host} = $value;
727 } 744 }
728 ); 745 );
729 746
730 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
731 748
732 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
733 expand => 1, 750 expand => 1,
734 text => "Server List", 751 text => "Server List",
735 other => $METASERVER, 752 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
738 update_metaserver $HOST;
739 }
740 ); 755 );
741 } 756 }
742 757
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 760 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 761 tooltip => "The name of your character on the server",
747 connect_changed => sub { 762 on_changed => sub {
748 my ($self, $value) = @_; 763 my ($self, $value) = @_;
749 $CFG->{user} = $value; 764 $CFG->{user} = $value;
750 } 765 }
751 ); 766 );
752 767
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 769 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 770 text => $CFG->{password},
756 hidden => 1, 771 hidden => 1,
757 tooltip => "The password for your character", 772 tooltip => "The password for your character",
758 connect_changed => sub { 773 on_changed => sub {
759 my ($self, $value) = @_; 774 my ($self, $value) = @_;
760 $CFG->{password} = $value; 775 $CFG->{password} = $value;
761 } 776 }
762 ); 777 );
763 778
764 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
765 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 781 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 783 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, " 784 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
772 connect_changed => sub { 787 on_changed => sub {
773 my ($self, $value) = @_; 788 my ($self, $value) = @_;
774 789
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 791 },
777 ); 792 );
… …
784 . "This might increase or create lag, but increases the chances " 799 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 800 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 801 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 802 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 803 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 804 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 805 );
791 806
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 808 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 809 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.", 810 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] }, 811 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 812 );
798 813
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 815 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 816 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.", 817 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] }, 818 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 819 );
805 820
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 822 expand => 1,
808 align => 0, 823 align => 0,
809 text => "Login", 824 text => "Login",
810 connect_activate => sub { 825 on_activate => sub {
811 $CONN ? stop_game 826 $CONN ? stop_game
812 : start_game; 827 : start_game;
813 }, 828 },
814 ); 829 );
815 830
816 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
817} 844}
818 845
819sub message_window { 846sub message_window {
820 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
848 name => "message_window",
821 title => "Messages", 849 title => "Messages",
822 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
852 x => "max",
853 y => 0,
824 user_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
825 user_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
826 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
827 857
828 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
829 859
830 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
831 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 861 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>...). " 862 . "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). " 863 . "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.", 864 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 865 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 866 my ($input, $prev_focus) = @_;
837 867
838 delete $input->{refocus_map}; 868 delete $input->{refocus_map};
839 869
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 871 $input->{refocus_map} = 1;
842 } 872 }
843 delete $input->{auto_activated}; 873 delete $input->{auto_activated};
844 }, 874 },
845 connect_activate => sub { 875 on_activate => sub {
846 my ($input, $text) = @_; 876 my ($input, $text) = @_;
847 $input->set_text (''); 877 $input->set_text ('');
848 878
849 if ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
… …
855 if ($input->{refocus_map}) { 885 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 886 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
858 } 888 }
859 }, 889 },
860 connect_escape => sub { 890 on_escape => sub {
861 $MAPWIDGET->focus_in 891 $MAPWIDGET->focus_in
862 }, 892 },
863 ); 893 );
864 894
865 $CONSOLE = { 895 $CONSOLE = {
866 window => $window, 896 window => $window,
867 input => $input 897 input => $input,
868 }; 898 };
869 899
870 $window 900 $window
871} 901}
872 902
873sub open_quit_dialog { 903sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
875
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 z => 50,
909 title => "Really Quit?",
910 ;
877 911
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 913
880 $vb->add (new CFClient::UI::Label 914 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 915 text => "You should find a savebed and apply it first!",
… …
884 ); 918 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 920 $hb->add (new CFClient::UI::Button
887 text => "Ok", 921 text => "Ok",
888 expand => 1, 922 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 923 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 924 );
891 $hb->add (new CFClient::UI::Button 925 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 926 text => "Quit anyway",
893 expand => 1, 927 expand => 1,
894 connect_activate => sub { exit }, 928 on_activate => sub { exit },
895 ); 929 );
930 }
896 931
897 $QUIT_DIALOG->show_centered; 932 $QUIT_DIALOG->show;
898 } else { 933}
899 $QUIT_DIALOG->show_centered; 934
935sub autopickup_setup {
936 my $table = new CFClient::UI::Table;
937
938 for (
939 ["General", 0, 0,
940 ["Enable autopickup" => PICKUP_NEWMODE],
941 ["Inhibit autopickup" => PICKUP_INHIBIT],
942 ["Stop before pickup" => PICKUP_STOP],
943 ["Debug autopickup" => PICKUP_DEBUG],
944 ],
945 ["Weapons", 0, 6,
946 ["All weapons" => PICKUP_ALLWEAPON],
947 ["Missile weapons" => PICKUP_MISSILEWEAPON],
948 ["Bows" => PICKUP_BOW],
949 ["Arrows" => PICKUP_ARROW],
950 ],
951 ["Armour", 0, 12,
952 ["Helmets" => PICKUP_HELMET],
953 ["Shields" => PICKUP_SHIELD],
954 ["Body Armour" => PICKUP_ARMOUR],
955 ["Boots" => PICKUP_BOOTS],
956 ["Gloves" => PICKUP_GLOVES],
957 ["Cloaks" => PICKUP_CLOAK],
958 ],
959
960 ["Readables", 2, 2,
961 ["Spellbooks" => PICKUP_SPELLBOOK],
962 ["Skillscrolls" => PICKUP_SKILLSCROLL],
963 ["Normal Books/Scrolls" => PICKUP_READABLES],
964 ],
965 ["Misc", 2, 7,
966 ["Food" => PICKUP_FOOD],
967 ["Drinks" => PICKUP_DRINK],
968 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
969 ["Keys" => PICKUP_KEY],
970 ["Magical Items" => PICKUP_MAGICAL],
971 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => PICKUP_JEWELS],
975 ],
976 )
900 } 977 {
978 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980
981 for (@bits) {
982 ++$y;
983
984 my $mask = $_->[1];
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask,
988 on_changed => sub {
989 my ($box, $value) = @_;
990 if ($value) {
991 $::CFG->{pickup} |= $mask;
992 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
994 }
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
996 if defined $::CONN;
997 });
998 }
999 }
1000
1001 $table
901} 1002}
902 1003
903sub make_inventory_window { 1004sub make_inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 1006 x => "center",
1007 y => "center",
1008 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10,
1010 title => "Inventory",
1011 ;
906 1012
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908 1014
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
910 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 1016 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1017 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 1018
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1019 $hb->add (my $vb2 = new CFClient::UI::VBox);
1020
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 1021 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
916 $INVR_LBL->set_text ("Floor"); 1022
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1023 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 1024
1025 # XXX: Call after $INVR = ... because set_opencont sets the items
1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027
919 $invwin 1028 $invwin
1029}
1030
1031sub spell_setup {
1032 new CFClient::UI::SpellList
1033}
1034
1035sub keyboard_setup {
1036 my $binding_list = new CFClient::UI::VBox;
1037
1038 my $refresh;
1039 $refresh = sub {
1040 $binding_list->clear ();
1041
1042 for my $mod (keys %{$::CFG->{bindings}}) {
1043 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1044 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1045 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1046
1047 my $lbl = join "; ", @$cmds;
1048 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1049 $binding_list->add (my $hb = new CFClient::UI::HBox);
1050 $hb->add (new CFClient::UI::Button
1051 text => "delete",
1052 tooltip => "Deletes the binding",
1053 on_activate => sub {
1054 $binding_list->remove ($hb);
1055 delete $::CFG->{bindings}->{$mod}->{$sym};
1056 });
1057
1058 $hb->add (new CFClient::UI::Button
1059 text => "edit",
1060 tooltip => "Edits the binding",
1061 on_activate => sub {
1062 $::BIND_EDITOR->set_binding (
1063 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1064 sub {
1065 my ($nmod, $nsym, $ncmds) = @_;
1066 delete $::CFG->{bindings}->{$mod}->{$sym};
1067 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1068 $refresh->();
1069 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1070 $SETUP_DIALOG->show;
1071 },
1072 sub {
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $SETUP_DIALOG->show;
1075 });
1076 $::BIND_EDITOR->show;
1077 $SETUP_DIALOG->hide;
1078 });
1079
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 }
1083 }
1084 };
1085
1086 my $vb = new CFClient::UI::VBox;
1087 $vb->add ($binding_list);
1088 $vb->add (my $hb = new CFClient::UI::HBox);
1089
1090 $hb->add (new CFClient::UI::Button
1091 text => "record new",
1092 expand => 1,
1093 tooltip => "This button opens the binding editor with an empty binding.",
1094 on_activate => sub {
1095 $::BIND_EDITOR->set_binding (undef, undef, [],
1096 sub {
1097 my ($mod, $sym, $cmds) = @_;
1098 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1099 $refresh->();
1100 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101 $SETUP_DIALOG->show;
1102 },
1103 sub {
1104 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1105 $SETUP_DIALOG->show;
1106 },
1107 );
1108 $SETUP_DIALOG->hide;
1109 $::BIND_EDITOR->show;
1110 },
1111 );
1112
1113 $hb->add (new CFClient::UI::Button
1114 text => "close",
1115 tooltip => "Closes the binding window",
1116 expand => 1,
1117 on_activate => sub {
1118 $SETUP_DIALOG->hide;
1119 }
1120 );
1121
1122 $refresh->();
1123
1124 $vb
920} 1125}
921 1126
922sub make_help_window { 1127sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame 1128 my $win = new CFClient::UI::FancyFrame
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1129 x => 'center',
1130 y => 'center',
1131 z => 2,
1132 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation";
925 1136
926 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
927 1138
928 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
936 ) { 1147 ) {
937 my ($pod, $label) = @$_; 1148 my ($pod, $label) = @$_;
938 1149
939 $buttons->add (new CFClient::UI::Button 1150 $buttons->add (new CFClient::UI::Button
940 text => $label, 1151 text => $label,
941 connect_activate => sub { 1152 on_activate => sub {
942 my $parser = new Pod::POM; 1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
944 1155
945 $viewer->clear; 1156 $viewer->clear;
946 1157
947 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
948 for @{ CFClient::pod_to_pango_list $pom }; 1159 for @$pom;
949 1160
950 $viewer->set_offset (0); 1161 $viewer->set_offset (0);
951 }, 1162 },
952 ); 1163 );
953 } 1164 }
… …
990 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1203 } else {
993 # create the widgets 1204 # create the widgets
994 1205
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1206 $DEBUG_STATUS = new CFClient::UI::Label
1207 padding => 0,
1208 z => 100,
1209 force_x => "max",
1210 force_y => 0;
996 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
997 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
998 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
999 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1000 1217
1001 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
1004 child => $STATUSBOX, 1222 child => $STATUSBOX,
1005 )->show; 1223 )->show;
1006 1224
1007 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1011 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1234 ),
… …
1035 can_hover => 1, 1257 can_hover => 1,
1036 can_events => 1, 1258 can_events => 1,
1037 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1038 ; 1260 ;
1039 1261
1040 $BUTTONBAR = new CFClient::UI::HBox; 1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 z => 2,
1268 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6,
1270 ;
1041 1271
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1274
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1284 "Lets you define, edit and delete bindings."
1285 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1286 . "with nothing set and the recording started. After doing the actions you "
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1292
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1296 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1297
1045 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1046 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1047 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1048 1300
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 1301 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 1302
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1303 $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."); 1304 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, 1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1055 1308
1056 $BUTTONBAR->add (new CFClient::UI::Button 1309 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1310 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.", 1311 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 { 1312 on_activate => sub {
1313 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1314 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1315 status "Configuration Saved";
1062 }, 1316 },
1063 ); 1317 );
1064 1318
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066 tooltip => "View Documentation"); 1320 tooltip => "View Documentation");
1067 1321
1068 $BUTTONBAR->add (new CFClient::UI::Button 1322 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1323 text => "Quit",
1070 tooltip => "Terminates the program", 1324 tooltip => "Terminates the program",
1071 connect_activate => sub { 1325 on_activate => sub {
1072 if ($CONN) { 1326 if ($CONN) {
1073 open_quit_dialog; 1327 open_quit_dialog;
1074 } else { 1328 } else {
1075 exit; 1329 exit;
1076 } 1330 }
1077 }, 1331 },
1078 ); 1332 );
1079 1333
1080 $BUTTONBAR->show; 1334 $BUTTONBAR->show;
1335 $SETUP_DIALOG->show;
1336 }
1081 1337
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1338 $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 }
1092} 1339}
1093 1340
1094sub video_shutdown { 1341sub video_shutdown {
1095 undef $SDL_ACTIVE; 1342 undef $SDL_ACTIVE;
1096} 1343}
… …
1163 1410
1164my %demo;#d# 1411my %demo;#d#
1165 1412
1166sub force_refresh { 1413sub force_refresh {
1167 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1414 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1168 debug sprintf "%3.2f", $fps; 1415 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1416
1170 $CFClient::UI::ROOT->draw; 1417 $CFClient::UI::ROOT->draw;
1171 1418
1172 $WANT_REFRESH = 0; 1419 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1420 $CAN_REFRESH = 0;
… …
1228}; 1475};
1229 1476
1230 CFClient::SDL_GL_SwapBuffers; 1477 CFClient::SDL_GL_SwapBuffers;
1231} 1478}
1232 1479
1233my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1480my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1234 $NOW = time; 1481 $NOW = time;
1235 1482
1236 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1483 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1237 for CFClient::SDL_PollEvent; 1484 for CFClient::SDL_PollEvent;
1238 1485
… …
1305############################################################################# 1552#############################################################################
1306 1553
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1554$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1555
1309{ 1556{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1557 local $SIG{__DIE__} = sub {
1558 return unless defined $^S && !$^S;
1559 Carp::confess $_[1];#d#TODO: remove when stable
1560 CFClient::fatal $_[0];
1561 };
1311 1562
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1563 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1564 CFClient::UI::set_layout ($::CFG->{layout});
1313 1565
1314 my %DEF_CFG = ( 1566 my %DEF_CFG = (
1315 sdl_mode => 0, 1567 sdl_mode => 0,
1316 width => 640, 1568 width => 640,
1317 height => 480, 1569 height => 480,
… …
1394 1646
1395END { CFClient::SDL_Quit } 1647END { CFClient::SDL_Quit }
1396 1648
1397=head1 NAME 1649=head1 NAME
1398 1650
1399pclient - A Crossfire+ and Crossfire game client 1651cfplus - A Crossfire+ and Crossfire game client
1400 1652
1401=head1 SYNOPSIS 1653=head1 SYNOPSIS
1402 1654
1403Just run it - no commandline arguments are supported. 1655Just run it - no commandline arguments are supported.
1404 1656
1405=head1 USAGE 1657=head1 USAGE
1406 1658
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1659cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 1660fullscreen and interactively.
1409 1661
1662=head1 DEBUGGING
1663
1664
1665CFPLUS_DEBUG - environment variable
1666
1667 1 draw borders around widgets
1668 2 add low-level widget info to tooltips
1669 4 show fps
1670 8 suppress tooltips
1671
1410=head1 AUTHOR 1672=head1 AUTHOR
1411 1673
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1674Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 1675
1414 1676

Diff Legend

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