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.13 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC

97 97
98our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 99our $STATUSBOX;
100our $DEBUG_STATUS; 100our $DEBUG_STATUS;
101 101
102our $INVWIN;
103our $INV; 102our $INV;
104our $INVR; 103our $INVR;
105our $INVR_LBL; 104our $INVR_LBL;
106 105
107sub status { 106sub status {
178 unless $BUTTONBAR->{children}[1]->{state}; 177 unless $BUTTONBAR->{children}[1]->{state};
179} 178}
180 179
181sub client_setup { 180sub client_setup {
182 my $dialog = new CFClient::UI::FancyFrame 181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
183 title => "Client Setup", 185 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 186 child => (my $vbox = new CFClient::UI::VBox);
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 188
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
202 204
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 206 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 207 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 208 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 209 on_changed => sub {
208 my ($self, $value) = @_; 210 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 211 $CFG->{fullscreen} = $value;
210 } 212 }
211 ); 213 );
212 214
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 215 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 216 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 217 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 218 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 219 on_changed => sub {
218 my ($self, $value) = @_; 220 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 221 $CFG->{fast} = $value;
220 } 222 }
221 ); 223 );
222 224
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 225 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 226 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 227 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 228 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 229 on_changed => sub {
228 my ($self, $value) = @_; 230 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 231 $CFG->{map_scale} = 2 ** $value;
230 } 232 }
231 ); 233 );
232 234
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 235 $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 236 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 237 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 238 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 239 on_changed => sub {
238 my ($self, $value) = @_; 240 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 241 $CFG->{fow_enable} = $value;
240 } 242 }
241 ); 243 );
242 244
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 245 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 247 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.", 248 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 { 249 on_changed => sub {
248 my ($self, $value) = @_; 250 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 251 $CFG->{fow_intensity} = $value;
250 } 252 }
251 ); 253 );
252 254
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 255 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 256 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 257 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 258 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 259 on_changed => sub {
258 my ($self, $value) = @_; 260 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 261 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 262 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 263 }
262 ); 264 );
263 265
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 266 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 267 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 268 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.", 269 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] }, 270 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 271 );
270 272
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 274 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 275 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.", 276 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]) }, 277 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 278 );
277 279
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279 281
280 $table->add (1, $row++, new CFClient::UI::Slider 282 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 283 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.", 284 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 285 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 286 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 287 &set_stats_window_fontsize;
286 } 288 }
287 ); 289 );
288 290
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 291 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 292 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 293 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.", 294 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 295 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 296 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 297 &set_gauge_window_fontsize;
296 } 298 }
297 ); 299 );
298 300
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 301 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 302 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 303 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 304 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 305 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 306 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 307 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 308 }
307 ); 309 );
308 310
309 $table->add (1, $row++, new CFClient::UI::Button 311 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 312 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 313 tooltip => "Apply the video settings",
312 connect_activate => sub { 314 on_activate => sub {
313 video_shutdown (); 315 video_shutdown ();
314 video_init (); 316 video_init ();
315 } 317 }
316 ); 318 );
317 319
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 321 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 322 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.", 323 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 { 324 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 325 $CFG->{audio_enable} = $_[1];
324 } 326 }
325 ); 327 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 328# $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 { 329# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 330# $CFG->{effects_volume} = $_[1];
329# }); 331# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 332 $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); 333 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 334 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 335 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 336 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 337 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 338 $CFG->{bgm_enable} = $_[1];
337 } 339 }
338 ); 340 );
339 $hbox->add (new CFClient::UI::Slider 341 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 342 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 343 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 344 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 345 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 346 CFClient::MixMusic::volume $_[1] * 128;
345 } 347 }
346 ); 348 );
347 349
348 $table->add (1, $row++, new CFClient::UI::Button 350 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 351 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 352 tooltip => "Apply the audio settings",
351 connect_activate => sub { 353 on_activate => sub {
352 audio_shutdown (); 354 audio_shutdown ();
353 audio_init (); 355 audio_init ();
354 } 356 }
355 ); 357 );
356 358
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command}, 361 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. " 362 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. " 363 . "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.", 364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub { 365 on_changed => sub {
364 my ($self, $value) = @_; 366 my ($self, $value) = @_;
365 $CFG->{say_command} = $value; 367 $CFG->{say_command} = $value;
366 } 368 }
367 ); 369 );
368 370
432 434
433 $win 435 $win
434} 436}
435 437
436sub make_stats_window { 438sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 439 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8),
441 req_x => -1,
442 title => "Stats",
443 name => "stats_window";
438 444
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 445 $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, 446 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 447 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."); 448 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)."); 451 tooltip => "The map you are currently on (if supported by the server).");
446 452
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 453 $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, 454 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 455 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 456 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, 457 $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, 458 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 459 tooltip => "The weight limit: you cannot carry more than this.");
454 460
455 461
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 462 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 463 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 464
689 $m = [$users, $host, $uptime, $version, $desc]; 695 $m = [$users, $host, $uptime, $version, $desc];
690 696
691 $y++; 697 $y++;
692 698
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 699 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 700 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 701 $HOST->set_text ($CFG->{host} = $host);
696 }), 702 }),
697 (new CFClient::UI::Empty expand => 1), 703 (new CFClient::UI::Empty expand => 1),
698 ]); 704 ]);
699 705
705 }); 711 });
706} 712}
707 713
708sub server_setup { 714sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 715 my $dialog = new CFClient::UI::FancyFrame
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
710 title => "Server Setup", 719 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 720 child => (my $vbox = new CFClient::UI::VBox),
712 721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 725 $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"); 726 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 727
716 { 728 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 $vbox->add ( 731 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 732 my $HOST = new CFClient::UI::Entry
721 expand => 1, 733 expand => 1,
722 text => $CFG->{host}, 734 text => $CFG->{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 735 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 736 on_changed => sub {
725 my ($self, $value) = @_; 737 my ($self, $value) = @_;
726 $CFG->{host} = $value; 738 $CFG->{host} = $value;
727 } 739 }
728 ); 740 );
729 741
732 $vbox->add (new CFClient::UI::Flopper 744 $vbox->add (new CFClient::UI::Flopper
733 expand => 1, 745 expand => 1,
734 text => "Server List", 746 text => "Server List",
735 other => $METASERVER, 747 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 748 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 749 on_open => sub {
738 update_metaserver $HOST; 750 update_metaserver $HOST;
739 } 751 }
740 ); 752 );
741 } 753 }
742 754
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 755 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 756 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 757 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 758 tooltip => "The name of your character on the server",
747 connect_changed => sub { 759 on_changed => sub {
748 my ($self, $value) = @_; 760 my ($self, $value) = @_;
749 $CFG->{user} = $value; 761 $CFG->{user} = $value;
750 } 762 }
751 ); 763 );
752 764
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 765 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 766 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 767 text => $CFG->{password},
756 hidden => 1, 768 hidden => 1,
757 tooltip => "The password for your character", 769 tooltip => "The password for your character",
758 connect_changed => sub { 770 on_changed => sub {
759 my ($self, $value) = @_; 771 my ($self, $value) = @_;
760 $CFG->{password} = $value; 772 $CFG->{password} = $value;
761 } 773 }
762 ); 774 );
763 775
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 779 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 780 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, " 781 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 782 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 783 . "This option is only used once at log-in.",
772 connect_changed => sub { 784 on_changed => sub {
773 my ($self, $value) = @_; 785 my ($self, $value) = @_;
774 786
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 787 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 788 },
777 ); 789 );
784 . "This might increase or create lag, but increases the chances " 796 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 797 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 798 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 799 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 800 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 801 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 802 );
791 803
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 804 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 805 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 806 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.", 807 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] }, 808 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 809 );
798 810
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 811 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 812 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 813 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.", 814 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] }, 815 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 816 );
805 817
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 818 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 819 expand => 1,
808 align => 0, 820 align => 0,
809 text => "Login", 821 text => "Login",
810 connect_activate => sub { 822 on_activate => sub {
811 $CONN ? stop_game 823 $CONN ? stop_game
812 : start_game; 824 : start_game;
813 }, 825 },
814 ); 826 );
815 827
816 $dialog 828 $dialog
817} 829}
818 830
819sub message_window { 831sub message_window {
820 my $window = new CFClient::UI::FancyFrame 832 my $window = new CFClient::UI::FancyFrame
833 name => "message_window",
821 title => "Messages", 834 title => "Messages",
822 border_bg => [1, 1, 1, 1], 835 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 836 bg => [0, 0, 0, 0.75],
837 req_x => -1,
824 user_w => int $::WIDTH / 3, 838 user_w => int $::WIDTH / 3,
825 user_h => int $::HEIGHT / 5, 839 user_h => int $::HEIGHT / 5,
826 child => (my $vbox = new CFClient::UI::VBox); 840 child => (my $vbox = new CFClient::UI::VBox);
827 841
828 $vbox->add ($LOGVIEW); 842 $vbox->add ($LOGVIEW);
830 $vbox->add (my $input = new CFClient::UI::Entry 844 $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> " 845 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>...). " 846 . "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). " 847 . "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.", 848 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 849 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 850 my ($input, $prev_focus) = @_;
837 851
838 delete $input->{refocus_map}; 852 delete $input->{refocus_map};
839 853
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 854 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 855 $input->{refocus_map} = 1;
842 } 856 }
843 delete $input->{auto_activated}; 857 delete $input->{auto_activated};
844 }, 858 },
845 connect_activate => sub { 859 on_activate => sub {
846 my ($input, $text) = @_; 860 my ($input, $text) = @_;
847 $input->set_text (''); 861 $input->set_text ('');
848 862
849 if ($text =~ /^\/(.*)/) { 863 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 864 $::CONN->user_send ($1);
855 if ($input->{refocus_map}) { 869 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 870 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 871 $MAPWIDGET->focus_in
858 } 872 }
859 }, 873 },
860 connect_escape => sub { 874 on_escape => sub {
861 $MAPWIDGET->focus_in 875 $MAPWIDGET->focus_in
862 }, 876 },
863 ); 877 );
864 878
865 $CONSOLE = { 879 $CONSOLE = {
884 ); 898 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 899 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 900 $hb->add (new CFClient::UI::Button
887 text => "Ok", 901 text => "Ok",
888 expand => 1, 902 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 903 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 904 );
891 $hb->add (new CFClient::UI::Button 905 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 906 text => "Quit anyway",
893 expand => 1, 907 expand => 1,
894 connect_activate => sub { exit }, 908 on_activate => sub { exit },
895 ); 909 );
896 910
897 $QUIT_DIALOG->show_centered; 911 $QUIT_DIALOG->show_centered;
898 } else { 912 } else {
899 $QUIT_DIALOG->show_centered; 913 $QUIT_DIALOG->show_centered;
900 } 914 }
901} 915}
902 916
903sub make_inventory_window { 917sub make_inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 918 my $invwin = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 919 user_w => $WIDTH * (7/8),
920 user_h => $HEIGHT * (7/8),
921 title => "Inventory",
922 name => "inventory_window",
923 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1]
925 };
906 926
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
908 928
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
910 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
911 $lbl->set_text ("Player"); 931 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 933
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
935
936 $vb2->add (my $hb2 = new CFClient::UI::HBox);
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label align => 0); 937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938 $hb2->add (new CFClient::UI::Button
939 text => "Close",
940 tooltip => "Close the currently open container (if one is open)",
941 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}")
943 if $CONN->{open_container} != 0;
944 },
945 );
946
916 $INVR_LBL->set_text ("Floor"); 947 $INVR_LBL->set_text ("Floor");
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 949
919 $invwin 950 $invwin
920} 951}
936 ) { 967 ) {
937 my ($pod, $label) = @$_; 968 my ($pod, $label) = @$_;
938 969
939 $buttons->add (new CFClient::UI::Button 970 $buttons->add (new CFClient::UI::Button
940 text => $label, 971 text => $label,
941 connect_activate => sub { 972 on_activate => sub {
942 my $parser = new Pod::POM; 973 my $parser = new Pod::POM;
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
944 975
945 $viewer->clear; 976 $viewer->clear;
946 977
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1085 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1055 1086
1056 $BUTTONBAR->add (new CFClient::UI::Button 1087 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1088 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.", 1089 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 { 1090 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
1061 status "Configuration Saved"; 1093 status "Configuration Saved";
1062 }, 1094 },
1063 ); 1095 );
1064 1096
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1097 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066 tooltip => "View Documentation"); 1098 tooltip => "View Documentation");
1067 1099
1068 $BUTTONBAR->add (new CFClient::UI::Button 1100 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1101 text => "Quit",
1070 tooltip => "Terminates the program", 1102 tooltip => "Terminates the program",
1071 connect_activate => sub { 1103 on_activate => sub {
1072 if ($CONN) { 1104 if ($CONN) {
1073 open_quit_dialog; 1105 open_quit_dialog;
1074 } else { 1106 } else {
1075 exit; 1107 exit;
1076 } 1108 }
1308 1340
1309{ 1341{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1311 1343
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1345 CFClient::UI::set_layout ($::CFG->{layout});
1313 1346
1314 my %DEF_CFG = ( 1347 my %DEF_CFG = (
1315 sdl_mode => 0, 1348 sdl_mode => 0,
1316 width => 640, 1349 width => 640,
1317 height => 480, 1350 height => 480,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines