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.15 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines