ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC

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

Diff Legend

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