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.14 by elmex, Sat May 27 08:45:24 2006 UTC vs.
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC

81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $SERVER_SETUP;
86 87
87our $FLOORBOX; 88our $FLOORBOX;
88our $GAUGES; 89our $GAUGES;
89our $STATWIDS; 90our $STATWIDS;
90 91
97 98
98our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
103our $INV_WINDOW;
102our $INV; 104our $INV;
103our $INVR; 105our $INVR;
104our $INVR_LBL; 106our $INVR_LBL;
105 107
106sub status { 108sub status {
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 115 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 116}
115 117
116sub start_game { 118sub start_game {
117 status "logging in..."; 119 status "logging in...";
120
121 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide;
118 123
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 125
121 my ($host, $port) = split /:/, $CFG->{host}; 126 my ($host, $port) = split /:/, $CFG->{host};
122 127
151 }; 156 };
152 157
153 if ($CONN) { 158 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 159 CFClient::lowdelay fileno $CONN->{fh};
155 160
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 161 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 162 } else {
163 status "unable to connect"; 163 status "unable to connect";
164 stop_game(); 164 stop_game();
165 } 165 }
166} 166}
167 167
168sub stop_game { 168sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show;
171 $INV_WINDOW->hide;
172 $LOGVIEW->hide;
173
169 return unless $CONN; 174 return unless $CONN;
170 175
171 status "connection closed"; 176 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 177
173 $CONN->destroy; 178 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 179 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 180}
179 181
180sub client_setup { 182sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 183 my $dialog = new CFClient::UI::FancyFrame
184 req_x => 1,
185 req_y => $HEIGHT * (1/8),
186 name => "client_setup",
182 title => "Client Setup", 187 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 188 child => (my $vbox = new CFClient::UI::VBox);
184 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 189 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
185 190
186 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 191 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
201 206
202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 207 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 208 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 209 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 210 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 211 on_changed => sub {
207 my ($self, $value) = @_; 212 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value; 213 $CFG->{fullscreen} = $value;
209 } 214 }
210 ); 215 );
211 216
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 217 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 218 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 219 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 220 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 221 on_changed => sub {
217 my ($self, $value) = @_; 222 my ($self, $value) = @_;
218 $CFG->{fast} = $value; 223 $CFG->{fast} = $value;
219 } 224 }
220 ); 225 );
221 226
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 227 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
223 $table->add (1, $row++, new CFClient::UI::Slider 228 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 229 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 230 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 231 on_changed => sub {
227 my ($self, $value) = @_; 232 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value; 233 $CFG->{map_scale} = 2 ** $value;
229 } 234 }
230 ); 235 );
231 236
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 237 $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 238 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 239 state => $CFG->{fow_enable},
235 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 240 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
236 connect_changed => sub { 241 on_changed => sub {
237 my ($self, $value) = @_; 242 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value; 243 $CFG->{fow_enable} = $value;
239 } 244 }
240 ); 245 );
241 246
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
243 $table->add (1, $row++, new CFClient::UI::Slider 248 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 249 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.", 250 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 { 251 on_changed => sub {
247 my ($self, $value) = @_; 252 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value; 253 $CFG->{fow_intensity} = $value;
249 } 254 }
250 ); 255 );
251 256
252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 257 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
253 $table->add (1, $row++, new CFClient::UI::CheckBox 258 $table->add (1, $row++, new CFClient::UI::CheckBox
254 state => $CFG->{fow_smooth}, 259 state => $CFG->{fow_smooth},
255 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 260 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
256 connect_changed => sub { 261 on_changed => sub {
257 my ($self, $value) = @_; 262 my ($self, $value) = @_;
258 $CFG->{fow_smooth} = $value; 263 $CFG->{fow_smooth} = $value;
259 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 264 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
260 } 265 }
261 ); 266 );
262 267
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
264 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 270 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.", 271 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] }, 272 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
268 ); 273 );
269 274
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 275 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 276 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 277 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.", 278 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]) }, 279 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
275 ); 280 );
276 281
277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 282 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
278 283
279 $table->add (1, $row++, new CFClient::UI::Slider 284 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 285 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.", 286 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
282 connect_changed => sub { 287 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 288 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 289 &set_stats_window_fontsize;
285 } 290 }
286 ); 291 );
287 292
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 293 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
289 $table->add (1, $row++, new CFClient::UI::Slider 294 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 295 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.", 296 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
292 connect_changed => sub { 297 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 298 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 299 &set_gauge_window_fontsize;
295 } 300 }
296 ); 301 );
297 302
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 303 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
299 $table->add (1, $row++, new CFClient::UI::Slider 304 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 305 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 306 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
302 connect_changed => sub { 307 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 308 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 309 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
305 } 310 }
306 ); 311 );
307 312
308 $table->add (1, $row++, new CFClient::UI::Button 313 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 314 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 315 tooltip => "Apply the video settings",
311 connect_activate => sub { 316 on_activate => sub {
312 video_shutdown (); 317 video_shutdown ();
313 video_init (); 318 video_init ();
314 } 319 }
315 ); 320 );
316 321
317 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 322 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 323 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 324 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.", 325 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 { 326 on_changed => sub {
322 $CFG->{audio_enable} = $_[1]; 327 $CFG->{audio_enable} = $_[1];
323 } 328 }
324 ); 329 );
325# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 330# $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 { 331# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
327# $CFG->{effects_volume} = $_[1]; 332# $CFG->{effects_volume} = $_[1];
328# }); 333# });
329 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 334 $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); 335 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 336 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 337 expand => 1, state => $CFG->{bgm_enable},
333 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 338 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
334 connect_changed => sub { 339 on_changed => sub {
335 $CFG->{bgm_enable} = $_[1]; 340 $CFG->{bgm_enable} = $_[1];
336 } 341 }
337 ); 342 );
338 $hbox->add (new CFClient::UI::Slider 343 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 344 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 345 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 346 on_changed => sub {
342 $CFG->{bgm_volume} = $_[1]; 347 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128; 348 CFClient::MixMusic::volume $_[1] * 128;
344 } 349 }
345 ); 350 );
346 351
347 $table->add (1, $row++, new CFClient::UI::Button 352 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 353 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 354 tooltip => "Apply the audio settings",
350 connect_activate => sub { 355 on_activate => sub {
351 audio_shutdown (); 356 audio_shutdown ();
352 audio_init (); 357 audio_init ();
353 } 358 }
354 ); 359 );
355 360
357 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 362 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
358 text => $CFG->{say_command}, 363 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. " 364 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. " 365 . "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.", 366 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
362 connect_changed => sub { 367 on_changed => sub {
363 my ($self, $value) = @_; 368 my ($self, $value) = @_;
364 $CFG->{say_command} = $value; 369 $CFG->{say_command} = $value;
365 } 370 }
366 ); 371 );
367 372
382 387
383sub make_gauge_window { 388sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 389 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 390
386 my $win = new CFClient::UI::Frame ( 391 my $win = new CFClient::UI::Frame (
392 req_x => 0,
387 req_y => -1, 393 req_y => -1,
388 user_w => $WIDTH, 394 def_w => $WIDTH,
389 user_h => $gh, 395 def_h => $gh,
390 ); 396 );
391 397
392 $win->add (my $hbox = new CFClient::UI::HBox 398 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 399 children => [
394 (new CFClient::UI::HBox expand => 1), 400 (new CFClient::UI::HBox expand => 1),
431 437
432 $win 438 $win
433} 439}
434 440
435sub make_stats_window { 441sub make_stats_window {
436 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 442 my $tgw = new CFClient::UI::FancyFrame
443 req_y => $HEIGHT * (2/8),
444 req_x => -1,
445 title => "Stats",
446 name => "stats_window";
437 447
438 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 448 $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, 449 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
440 can_hover => 1, can_events => 1, 450 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."); 451 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
444 tooltip => "The map you are currently on (if supported by the server)."); 454 tooltip => "The map you are currently on (if supported by the server).");
445 455
446 $vb->add (my $hb0 = new CFClient::UI::HBox); 456 $vb->add (my $hb0 = new CFClient::UI::HBox);
447 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 457 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
448 can_hover => 1, can_events => 1, 458 can_hover => 1, can_events => 1,
449 tooltip => "This is the amount the Player weights."); 459 tooltip => "The weight of the player including all inventory items.");
450 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 460 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
451 can_hover => 1, can_events => 1, 461 can_hover => 1, can_events => 1,
452 tooltip => "The weight limit, you can't carry more than this."); 462 tooltip => "The weight limit: you cannot carry more than this.");
453 463
454 464
455 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 465 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
456 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 466 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
457 467
688 $m = [$users, $host, $uptime, $version, $desc]; 698 $m = [$users, $host, $uptime, $version, $desc];
689 699
690 $y++; 700 $y++;
691 701
692 $table->add (0, $y, new CFClient::UI::VBox children => [ 702 $table->add (0, $y, new CFClient::UI::VBox children => [
693 (new CFClient::UI::Button text => "Use", connect_activate => sub { 703 (new CFClient::UI::Button text => "Use", on_activate => sub {
694 $HOST->set_text ($CFG->{host} = $host); 704 $HOST->set_text ($CFG->{host} = $host);
695 }), 705 }),
696 (new CFClient::UI::Empty expand => 1), 706 (new CFClient::UI::Empty expand => 1),
697 ]); 707 ]);
698 708
703 } 713 }
704 }); 714 });
705} 715}
706 716
707sub server_setup { 717sub server_setup {
708 my $dialog = new CFClient::UI::FancyFrame 718 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
719 x => $WIDTH * (1/3),
720 y => $HEIGHT * (1/8),
721 name => "server_setup",
709 title => "Server Setup", 722 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 723 child => (my $vbox = new CFClient::UI::VBox),
724 on_visibility_change => sub {
725 my ($self, $visible) = @_;
726 $self->center if $visible;
727 },
711 728 ;
729
712 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
713 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
714 732
715 { 733 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 $vbox->add ( 736 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 737 my $HOST = new CFClient::UI::Entry
720 expand => 1, 738 expand => 1,
721 text => $CFG->{host}, 739 text => $CFG->{host},
722 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
723 connect_changed => sub { 741 on_changed => sub {
724 my ($self, $value) = @_; 742 my ($self, $value) = @_;
725 $CFG->{host} = $value; 743 $CFG->{host} = $value;
726 } 744 }
727 ); 745 );
728 746
731 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Flopper
732 expand => 1, 750 expand => 1,
733 text => "Server List", 751 text => "Server List",
734 other => $METASERVER, 752 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 754 on_open => sub {
737 update_metaserver $HOST; 755 update_metaserver $HOST;
738 } 756 }
739 ); 757 );
740 } 758 }
741 759
742 $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");
743 $table->add (1, 4, new CFClient::UI::Entry 761 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 762 text => $CFG->{user},
745 tooltip => "The name of your character on the server", 763 tooltip => "The name of your character on the server",
746 connect_changed => sub { 764 on_changed => sub {
747 my ($self, $value) = @_; 765 my ($self, $value) = @_;
748 $CFG->{user} = $value; 766 $CFG->{user} = $value;
749 } 767 }
750 ); 768 );
751 769
752 $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");
753 $table->add (1, 5, new CFClient::UI::Entry 771 $table->add (1, 5, new CFClient::UI::Entry
754 text => $CFG->{password}, 772 text => $CFG->{password},
755 hidden => 1, 773 hidden => 1,
756 tooltip => "The password for your character", 774 tooltip => "The password for your character",
757 connect_changed => sub { 775 on_changed => sub {
758 my ($self, $value) = @_; 776 my ($self, $value) = @_;
759 $CFG->{password} = $value; 777 $CFG->{password} = $value;
760 } 778 }
761 ); 779 );
762 780
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 784 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 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. "
768 . "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, "
769 . "but you also increase bandwidth requirements and latency. " 787 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 788 . "This option is only used once at log-in.",
771 connect_changed => sub { 789 on_changed => sub {
772 my ($self, $value) = @_; 790 my ($self, $value) = @_;
773 791
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 }, 793 },
776 ); 794 );
783 . "This might increase or create lag, but increases the chances " 801 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 802 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 803 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 804 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 805 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 806 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
789 ); 807 );
790 808
791 $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");
792 $table->add (1, 9, new CFClient::UI::Entry 810 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 811 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.", 812 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] }, 813 on_changed => sub { $CFG->{output_count} = $_[1] },
796 ); 814 );
797 815
798 $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");
799 $table->add (1, 10, new CFClient::UI::Entry 817 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 818 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.", 819 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] }, 820 on_changed => sub { $CFG->{output_sync} = $_[1] },
803 ); 821 );
804 822
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 824 expand => 1,
807 align => 0, 825 align => 0,
808 text => "Login", 826 text => "Login",
809 connect_activate => sub { 827 on_activate => sub {
810 $CONN ? stop_game 828 $CONN ? stop_game
811 : start_game; 829 : start_game;
812 }, 830 },
813 ); 831 );
814 832
815 $dialog 833 $dialog
816} 834}
817 835
818sub message_window { 836sub message_window {
819 my $window = new CFClient::UI::FancyFrame 837 my $window = new CFClient::UI::FancyFrame
838 name => "message_window",
820 title => "Messages", 839 title => "Messages",
821 border_bg => [1, 1, 1, 1], 840 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 841 bg => [0, 0, 0, 0.75],
842 req_x => -1,
843 req_y => 0,
823 user_w => int $::WIDTH / 3, 844 def_w => int $::WIDTH / 3,
824 user_h => int $::HEIGHT / 5, 845 def_h => int $::HEIGHT / 5,
825 child => (my $vbox = new CFClient::UI::VBox); 846 child => (my $vbox = new CFClient::UI::VBox);
826 847
827 $vbox->add ($LOGVIEW); 848 $vbox->add ($LOGVIEW);
828 849
829 $vbox->add (my $input = new CFClient::UI::Entry 850 $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> " 851 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>...). " 852 . "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). " 853 . "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.", 854 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
834 connect_focus_in => sub { 855 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 856 my ($input, $prev_focus) = @_;
836 857
837 delete $input->{refocus_map}; 858 delete $input->{refocus_map};
838 859
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 860 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 861 $input->{refocus_map} = 1;
841 } 862 }
842 delete $input->{auto_activated}; 863 delete $input->{auto_activated};
843 }, 864 },
844 connect_activate => sub { 865 on_activate => sub {
845 my ($input, $text) = @_; 866 my ($input, $text) = @_;
846 $input->set_text (''); 867 $input->set_text ('');
847 868
848 if ($text =~ /^\/(.*)/) { 869 if ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 870 $::CONN->user_send ($1);
854 if ($input->{refocus_map}) { 875 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 876 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 877 $MAPWIDGET->focus_in
857 } 878 }
858 }, 879 },
859 connect_escape => sub { 880 on_escape => sub {
860 $MAPWIDGET->focus_in 881 $MAPWIDGET->focus_in
861 }, 882 },
862 ); 883 );
863 884
864 $CONSOLE = { 885 $CONSOLE = {
869 $window 890 $window
870} 891}
871 892
872sub open_quit_dialog { 893sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 894 unless ($QUIT_DIALOG) {
874
875 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 895 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
876 896
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 897 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 898
879 $vb->add (new CFClient::UI::Label 899 $vb->add (new CFClient::UI::Label
883 ); 903 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 904 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 905 $hb->add (new CFClient::UI::Button
886 text => "Ok", 906 text => "Ok",
887 expand => 1, 907 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 908 on_activate => sub { $QUIT_DIALOG->hide },
889 ); 909 );
890 $hb->add (new CFClient::UI::Button 910 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 911 text => "Quit anyway",
892 expand => 1, 912 expand => 1,
893 connect_activate => sub { exit }, 913 on_activate => sub { exit },
894 ); 914 );
915 }
895 916
917 $QUIT_DIALOG->show;
896 $QUIT_DIALOG->show_centered; 918 $QUIT_DIALOG->center;
897 } else {
898 $QUIT_DIALOG->show_centered;
899 }
900} 919}
901 920
902sub make_inventory_window { 921sub make_inventory_window {
903 my $invwin = new CFClient::UI::FancyFrame 922 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
904 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 923 def_w => $WIDTH * 7/8,
924 def_h => $HEIGHT * 7/8,
925 title => "Inventory",
926 name => "inventory_window",
927 on_visibility_change => sub {
928 my ($self, $visible) = @_;
929 $self->center if $visible;
930 },
931 ;
905 932
906 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 933 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
907 934
908 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 935 $hb->add (my $vb1 = new CFClient::UI::VBox);
909 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 936 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
910 $lbl->set_text ("Player");
911 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 937 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
912 938
913 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 939 $hb->add (my $vb2 = new CFClient::UI::VBox);
940
914 $vb2->add (my $hb2 = new CFClient::UI::HBox); 941 $vb2->add (my $hb2 = new CFClient::UI::HBox);
942 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
915 $hb2->add (new CFClient::UI::Button 943 $hb2->add (new CFClient::UI::Button
916 text => "Close", 944 text => "Close",
917 tooltip => "Close the currently open container (if one is open)", 945 tooltip => "Close the currently open container (if one is open)",
918 connect_activate => sub { 946 on_activate => sub {
919 $CONN->send ("apply $CONN->{open_container}") 947 $CONN->send ("apply $CONN->{open_container}")
920 if $CONN->{open_container} != 0; 948 if $CONN->{open_container} != 0;
921 }, 949 },
922 ); 950 );
923 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
924 951
925 $INVR_LBL->set_text ("Floor");
926 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 952 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
927 953
928 $invwin 954 $invwin
929} 955}
930 956
931sub make_help_window { 957sub make_help_window {
932 my $win = new CFClient::UI::FancyFrame 958 my $win = new CFClient::UI::FancyFrame
933 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 959 def_w => int $WIDTH * 7/8,
960 def_h => int $HEIGHT * 7/8,
961 title => "Documentation";
934 962
935 $win->add (my $vbox = new CFClient::UI::VBox); 963 $win->add (my $vbox = new CFClient::UI::VBox);
936 964
937 $vbox->add (my $buttons = new CFClient::UI::HBox); 965 $vbox->add (my $buttons = new CFClient::UI::HBox);
938 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 966 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
945 ) { 973 ) {
946 my ($pod, $label) = @$_; 974 my ($pod, $label) = @$_;
947 975
948 $buttons->add (new CFClient::UI::Button 976 $buttons->add (new CFClient::UI::Button
949 text => $label, 977 text => $label,
950 connect_activate => sub { 978 on_activate => sub {
951 my $parser = new Pod::POM; 979 my $parser = new Pod::POM;
952 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 980 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
953 981
954 $viewer->clear; 982 $viewer->clear;
955 983
1063 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1091 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1064 1092
1065 $BUTTONBAR->add (new CFClient::UI::Button 1093 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1094 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.", 1095 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 { 1096 on_activate => sub {
1097 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1098 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
1070 status "Configuration Saved"; 1099 status "Configuration Saved";
1071 }, 1100 },
1072 ); 1101 );
1073 1102
1074 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1103 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1075 tooltip => "View Documentation"); 1104 tooltip => "View Documentation");
1076 1105
1077 $BUTTONBAR->add (new CFClient::UI::Button 1106 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1107 text => "Quit",
1079 tooltip => "Terminates the program", 1108 tooltip => "Terminates the program",
1080 connect_activate => sub { 1109 on_activate => sub {
1081 if ($CONN) { 1110 if ($CONN) {
1082 open_quit_dialog; 1111 open_quit_dialog;
1083 } else { 1112 } else {
1084 exit; 1113 exit;
1085 } 1114 }
1088 1117
1089 $BUTTONBAR->show; 1118 $BUTTONBAR->show;
1090 1119
1091 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1120 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1092 1121
1093 # delay till geometry is constant 1122 $SERVER_SETUP->show;
1094 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1095 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1096 my $widget = $GAUGES->{win};
1097 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1098 });
1099 force_refresh ();
1100 } 1123 }
1101} 1124}
1102 1125
1103sub video_shutdown { 1126sub video_shutdown {
1104 undef $SDL_ACTIVE; 1127 undef $SDL_ACTIVE;
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