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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.36 by elmex, Tue May 30 14:59:26 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 $INV_RIGHT_HB;
107
108our $BIND_WINDOW;
109our $BIND_EDITOR;
105 110
106sub status { 111sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 112 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 113}
109 114
110sub debug { 115sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 116 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 117}
115 118
116sub start_game { 119sub start_game {
117 status "logging in..."; 120 status "logging in...";
121
122 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide;
118 124
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 125 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 126
121 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
122 128
… …
151 }; 157 };
152 158
153 if ($CONN) { 159 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 160 CFClient::lowdelay fileno $CONN->{fh};
155 161
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 162 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 163 } else {
163 status "unable to connect"; 164 status "unable to connect";
164 stop_game(); 165 stop_game();
165 } 166 }
166} 167}
167 168
168sub stop_game { 169sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show;
172 $INV_WINDOW->hide;
173 $LOGVIEW->hide;
174
169 return unless $CONN; 175 return unless $CONN;
170 176
171 status "connection closed"; 177 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 178
173 $CONN->destroy; 179 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 180 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 181}
179 182
180sub client_setup { 183sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 184 my $dialog = new CFClient::UI::FancyFrame
185 x => 1,
186 y => $HEIGHT * (1/8),
182 name => "client_setup", 187 name => "client_setup",
183 title => "Client Setup", 188 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 189 child => (my $vbox = new CFClient::UI::VBox);
190
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 192
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 195
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 196 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 198
193 $mode_slider->connect (changed => sub { 199 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 200 my ($self, $value) = @_;
195 201
… …
202 208
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 209 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 210 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 211 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 212 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 213 on_changed => sub {
208 my ($self, $value) = @_; 214 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 215 $CFG->{fullscreen} = $value;
210 } 216 }
211 ); 217 );
212 218
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 219 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 220 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 221 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 222 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 223 on_changed => sub {
218 my ($self, $value) = @_; 224 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 225 $CFG->{fast} = $value;
220 } 226 }
221 ); 227 );
222 228
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 229 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 230 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 233 on_changed => sub {
228 my ($self, $value) = @_; 234 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 235 $CFG->{map_scale} = 2 ** $value;
230 } 236 }
231 ); 237 );
232 238
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 239 $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 240 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 241 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 242 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 243 on_changed => sub {
238 my ($self, $value) = @_; 244 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 245 $CFG->{fow_enable} = $value;
240 } 246 }
241 ); 247 );
242 248
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 250 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 251 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.", 252 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 { 253 on_changed => sub {
248 my ($self, $value) = @_; 254 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 255 $CFG->{fow_intensity} = $value;
250 } 256 }
251 ); 257 );
252 258
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 259 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 260 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 261 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 262 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 263 on_changed => sub {
258 my ($self, $value) = @_; 264 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 265 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 266 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 267 }
262 ); 268 );
263 269
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 272 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.", 273 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] }, 274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 275 );
270 276
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 278 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 279 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.", 280 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]) }, 281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 282 );
277 283
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 284 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279 285
280 $table->add (1, $row++, new CFClient::UI::Slider 286 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 287 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.", 288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 289 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 290 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 291 &set_stats_window_fontsize;
286 } 292 }
287 ); 293 );
288 294
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 295 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 296 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 297 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.", 298 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 299 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 300 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 301 &set_gauge_window_fontsize;
296 } 302 }
297 ); 303 );
298 304
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 305 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 306 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 307 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 308 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 309 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 310 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 312 }
307 ); 313 );
308 314
309 $table->add (1, $row++, new CFClient::UI::Button 315 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 316 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 317 tooltip => "Apply the video settings",
312 connect_activate => sub { 318 on_activate => sub {
313 video_shutdown (); 319 video_shutdown ();
314 video_init (); 320 video_init ();
315 } 321 }
316 ); 322 );
317 323
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 325 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 326 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.", 327 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 { 328 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 329 $CFG->{audio_enable} = $_[1];
324 } 330 }
325 ); 331 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 332# $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 { 333# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 334# $CFG->{effects_volume} = $_[1];
329# }); 335# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 336 $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); 337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 338 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 339 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 340 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 341 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 342 $CFG->{bgm_enable} = $_[1];
337 } 343 }
338 ); 344 );
339 $hbox->add (new CFClient::UI::Slider 345 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 347 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 348 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 349 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 350 CFClient::MixMusic::volume $_[1] * 128;
345 } 351 }
346 ); 352 );
347 353
348 $table->add (1, $row++, new CFClient::UI::Button 354 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 355 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 356 tooltip => "Apply the audio settings",
351 connect_activate => sub { 357 on_activate => sub {
352 audio_shutdown (); 358 audio_shutdown ();
353 audio_init (); 359 audio_init ();
354 } 360 }
355 ); 361 );
356 362
… …
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command}, 365 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. " 366 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. " 367 . "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.", 368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub { 369 on_changed => sub {
364 my ($self, $value) = @_; 370 my ($self, $value) = @_;
365 $CFG->{say_command} = $value; 371 $CFG->{say_command} = $value;
366 } 372 }
367 ); 373 );
368 374
… …
383 389
384sub make_gauge_window { 390sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 391 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 392
387 my $win = new CFClient::UI::Frame ( 393 my $win = new CFClient::UI::Frame (
388 req_y => -1, 394 force_x => 0,
395 force_y => "max",
389 user_w => $WIDTH, 396 force_w => $WIDTH,
390 user_h => $gh, 397 force_h => $gh,
391 ); 398 );
392 399
393 $win->add (my $hbox = new CFClient::UI::HBox 400 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 401 children => [
395 (new CFClient::UI::HBox expand => 1), 402 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
432 439
433 $win 440 $win
434} 441}
435 442
443
436sub make_stats_window { 444sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 445 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8),
447 x => "max",
448 title => "Stats",
449 name => "stats_window";
438 450
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 453 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 701 $m = [$users, $host, $uptime, $version, $desc];
690 702
691 $y++; 703 $y++;
692 704
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 705 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 706 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 707 $HOST->set_text ($CFG->{host} = $host);
696 }), 708 }),
697 (new CFClient::UI::Empty expand => 1), 709 (new CFClient::UI::Empty expand => 1),
698 ]); 710 ]);
699 711
… …
704 } 716 }
705 }); 717 });
706} 718}
707 719
708sub server_setup { 720sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
710 name => "server_setup", 724 name => "server_setup",
711 title => "Server Setup", 725 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 726 child => (my $vbox = new CFClient::UI::VBox),
713 727 ;
728
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 729 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 730 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716 731
717 { 732 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
720 $vbox->add ( 735 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 736 my $HOST = new CFClient::UI::Entry
722 expand => 1, 737 expand => 1,
723 text => $CFG->{host}, 738 text => $CFG->{host},
724 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 739 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725 connect_changed => sub { 740 on_changed => sub {
726 my ($self, $value) = @_; 741 my ($self, $value) = @_;
727 $CFG->{host} = $value; 742 $CFG->{host} = $value;
728 } 743 }
729 ); 744 );
730 745
… …
733 $vbox->add (new CFClient::UI::Flopper 748 $vbox->add (new CFClient::UI::Flopper
734 expand => 1, 749 expand => 1,
735 text => "Server List", 750 text => "Server List",
736 other => $METASERVER, 751 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 752 tooltip => "Show a list of available crossfire servers",
738 connect_open => sub { 753 on_open => sub {
739 update_metaserver $HOST; 754 update_metaserver $HOST;
740 } 755 }
741 ); 756 );
742 } 757 }
743 758
744 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 759 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
745 $table->add (1, 4, new CFClient::UI::Entry 760 $table->add (1, 4, new CFClient::UI::Entry
746 text => $CFG->{user}, 761 text => $CFG->{user},
747 tooltip => "The name of your character on the server", 762 tooltip => "The name of your character on the server",
748 connect_changed => sub { 763 on_changed => sub {
749 my ($self, $value) = @_; 764 my ($self, $value) = @_;
750 $CFG->{user} = $value; 765 $CFG->{user} = $value;
751 } 766 }
752 ); 767 );
753 768
754 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 769 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
755 $table->add (1, 5, new CFClient::UI::Entry 770 $table->add (1, 5, new CFClient::UI::Entry
756 text => $CFG->{password}, 771 text => $CFG->{password},
757 hidden => 1, 772 hidden => 1,
758 tooltip => "The password for your character", 773 tooltip => "The password for your character",
759 connect_changed => sub { 774 on_changed => sub {
760 my ($self, $value) = @_; 775 my ($self, $value) = @_;
761 $CFG->{password} = $value; 776 $CFG->{password} = $value;
762 } 777 }
763 ); 778 );
764 779
765 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 780 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766 $table->add (1, 7, new CFClient::UI::Slider 781 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 782 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 783 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 tooltip => "This is the size of the portion of the map update the server sends you. " 784 tooltip => "This is the size of the portion of the map update the server sends you. "
770 . "If you set this to a high value you will be able to see further, " 785 . "If you set this to a high value you will be able to see further, "
771 . "but you also increase bandwidth requirements and latency. " 786 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 787 . "This option is only used once at log-in.",
773 connect_changed => sub { 788 on_changed => sub {
774 my ($self, $value) = @_; 789 my ($self, $value) = @_;
775 790
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 791 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 }, 792 },
778 ); 793 );
… …
785 . "This might increase or create lag, but increases the chances " 800 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 801 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 802 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 803 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 804 . "This option can be set and unset any time.",
790 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 805 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
791 ); 806 );
792 807
793 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 808 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
794 $table->add (1, 9, new CFClient::UI::Entry 809 $table->add (1, 9, new CFClient::UI::Entry
795 text => $CFG->{output_count}, 810 text => $CFG->{output_count},
796 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 811 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
797 connect_changed => sub { $CFG->{output_count} = $_[1] }, 812 on_changed => sub { $CFG->{output_count} = $_[1] },
798 ); 813 );
799 814
800 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 815 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
801 $table->add (1, 10, new CFClient::UI::Entry 816 $table->add (1, 10, new CFClient::UI::Entry
802 text => $CFG->{output_sync}, 817 text => $CFG->{output_sync},
803 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 818 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
804 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 819 on_changed => sub { $CFG->{output_sync} = $_[1] },
805 ); 820 );
806 821
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 822 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
808 expand => 1, 823 expand => 1,
809 align => 0, 824 align => 0,
810 text => "Login", 825 text => "Login",
811 connect_activate => sub { 826 on_activate => sub {
812 $CONN ? stop_game 827 $CONN ? stop_game
813 : start_game; 828 : start_game;
814 }, 829 },
815 ); 830 );
816 831
… …
821 my $window = new CFClient::UI::FancyFrame 836 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 837 name => "message_window",
823 title => "Messages", 838 title => "Messages",
824 border_bg => [1, 1, 1, 1], 839 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 840 bg => [0, 0, 0, 0.75],
841 x => "max",
842 y => 0,
826 user_w => int $::WIDTH / 3, 843 force_w => $::WIDTH / 3,
827 user_h => int $::HEIGHT / 5, 844 force_h => $::HEIGHT / 5,
828 child => (my $vbox = new CFClient::UI::VBox); 845 child => (my $vbox = new CFClient::UI::VBox);
829 846
830 $vbox->add ($LOGVIEW); 847 $vbox->add ($LOGVIEW);
831 848
832 $vbox->add (my $input = new CFClient::UI::Entry 849 $vbox->add (my $input = new CFClient::UI::Entry
833 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 850 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
834 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 851 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
835 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 852 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
836 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 853 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
837 connect_focus_in => sub { 854 on_focus_in => sub {
838 my ($input, $prev_focus) = @_; 855 my ($input, $prev_focus) = @_;
839 856
840 delete $input->{refocus_map}; 857 delete $input->{refocus_map};
841 858
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 859 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 860 $input->{refocus_map} = 1;
844 } 861 }
845 delete $input->{auto_activated}; 862 delete $input->{auto_activated};
846 }, 863 },
847 connect_activate => sub { 864 on_activate => sub {
848 my ($input, $text) = @_; 865 my ($input, $text) = @_;
849 $input->set_text (''); 866 $input->set_text ('');
850 867
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
851 if ($text =~ /^\/(.*)/) { 873 } elsif ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 874 $::CONN->user_send ($1);
853 } else { 875 } else {
854 my $say_cmd = $::CFG->{say_command} || 'say'; 876 my $say_cmd = $::CFG->{say_command} || 'say';
855 $::CONN->user_send ("$say_cmd $text"); 877 $::CONN->user_send ("$say_cmd $text");
856 } 878 }
857 if ($input->{refocus_map}) { 879 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 880 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 881 $MAPWIDGET->focus_in
860 } 882 }
861 }, 883 },
862 connect_escape => sub { 884 on_escape => sub {
863 $MAPWIDGET->focus_in 885 $MAPWIDGET->focus_in
864 }, 886 },
865 ); 887 );
866 888
867 $CONSOLE = { 889 $CONSOLE = {
868 window => $window, 890 window => $window,
869 input => $input 891 input => $input,
870 }; 892 };
871 893
872 $window 894 $window
873} 895}
874 896
875sub open_quit_dialog { 897sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 898 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 899 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center",
901 y => "center",
902 title => "Really Quit?",
903 ;
879 904
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 906
882 $vb->add (new CFClient::UI::Label 907 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 908 text => "You should find a savebed and apply it first!",
… …
886 ); 911 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 912 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 913 $hb->add (new CFClient::UI::Button
889 text => "Ok", 914 text => "Ok",
890 expand => 1, 915 expand => 1,
891 connect_activate => sub { $QUIT_DIALOG->hide }, 916 on_activate => sub { $QUIT_DIALOG->hide },
892 ); 917 );
893 $hb->add (new CFClient::UI::Button 918 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 919 text => "Quit anyway",
895 expand => 1, 920 expand => 1,
896 connect_activate => sub { exit }, 921 on_activate => sub { exit },
897 ); 922 );
923 }
898 924
899 $QUIT_DIALOG->show_centered; 925 $QUIT_DIALOG->show;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 }
903} 926}
904 927
905sub make_inventory_window { 928sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 930 x => "center",
931 y => "center",
932 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10,
934 title => "Inventory",
935 name => "inventory_window",
936 ;
908 937
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 939
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 940 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 943
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 944 $hb->add (my $vb2 = new CFClient::UI::VBox);
945
946 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
947
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
949
950 # XXX: Call after $INVR = ... because set_opencont sets the items
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952
953 $invwin
954}
955
956sub make_binding_window {
957 my $binding_list = new CFClient::UI::VBox;
958
959 my $refresh;
960 $refresh = sub {
961 $binding_list->clear ();
962
963 for my $mod (keys %{$::CFG->{bindings}}) {
964 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
965 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
966 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
967
968 my $lbl = join "; ", @$cmds;
969 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
970 $binding_list->add (my $hb = new CFClient::UI::HBox);
971 $hb->add (new CFClient::UI::Button
972 text => "delete",
973 tooltip => "Deletes the binding",
974 on_activate => sub {
975 $binding_list->remove ($hb);
976 delete $::CFG->{bindings}->{$mod}->{$sym};
977 });
978
979 $hb->add (new CFClient::UI::Button
980 text => "edit",
981 tooltip => "Edits the binding",
982 on_activate => sub {
983 $::BIND_EDITOR->set_binding (
984 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
985 sub {
986 my ($nmod, $nsym, $ncmds) = @_;
987 delete $::CFG->{bindings}->{$mod}->{$sym};
988 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
989 $refresh->();
990 $::BIND_WINDOW->show;
991 },
992 sub {
993 $::BIND_WINDOW->show;
994 });
995 $::BIND_EDITOR->show;
996 $::BIND_WINDOW->hide;
997 });
998
999 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1000 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1001 }
1002 }
1003 };
1004
1005 $BIND_WINDOW = new CFClient::UI::FancyFrame
1006 title => "Bindings",
1007 x => "center",
1008 y => "center",
1009 def_w => int $WIDTH * 9/10,
1010 def_h => int $HEIGHT * 9/10,
1011 on_visibility_change => sub {
1012 my ($self, $visible) = @_;
1013 $refresh->() if $visible;
1014 };
1015
1016 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1017 $vb->add ($binding_list);
917 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1018 $vb->add (my $hb = new CFClient::UI::HBox);
918 $hb2->add (new CFClient::UI::Button 1019 $hb->add (new CFClient::UI::Button
919 text => "Close", 1020 text => "record new",
920 tooltip => "Close the currently open container (if one is open)", 1021 expand => 1,
1022 tooltip => "This button opens the binding editor with an empty binding.",
921 connect_activate => sub { 1023 on_activate => sub {
922 $CONN->send ("apply $CONN->{open_container}") 1024 $::BIND_EDITOR->set_binding (undef, undef, [],
923 if $CONN->{open_container} != 0; 1025 sub {
1026 my ($mod, $sym, $cmds) = @_;
1027 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1028 $refresh->();
1029 $::BIND_WINDOW->show;
1030 },
1031 sub {
1032 $::BIND_WINDOW->show;
1033 });
1034 $::BIND_WINDOW->hide;
1035 $::BIND_EDITOR->show;
924 }, 1036 },
925 ); 1037 );
926 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0); 1038 $hb->add (new CFClient::UI::Button
1039 text => "close",
1040 tooltip => "Closes the binding window",
1041 expand => 1,
1042 on_activate => sub {
1043 $::BIND_WINDOW->hide;
1044 }
1045 );
927 1046
928 $INVR_LBL->set_text ("Floor"); 1047 $refresh->();
929 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1048 $BIND_WINDOW
930
931 $invwin
932} 1049}
933 1050
934sub make_help_window { 1051sub make_help_window {
935 my $win = new CFClient::UI::FancyFrame 1052 my $win = new CFClient::UI::FancyFrame
936 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1053 def_w => int $WIDTH * 7/8,
1054 def_h => int $HEIGHT * 7/8,
1055 title => "Documentation";
937 1056
938 $win->add (my $vbox = new CFClient::UI::VBox); 1057 $win->add (my $vbox = new CFClient::UI::VBox);
939 1058
940 $vbox->add (my $buttons = new CFClient::UI::HBox); 1059 $vbox->add (my $buttons = new CFClient::UI::HBox);
941 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1060 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
948 ) { 1067 ) {
949 my ($pod, $label) = @$_; 1068 my ($pod, $label) = @$_;
950 1069
951 $buttons->add (new CFClient::UI::Button 1070 $buttons->add (new CFClient::UI::Button
952 text => $label, 1071 text => $label,
953 connect_activate => sub { 1072 on_activate => sub {
954 my $parser = new Pod::POM; 1073 my $parser = new Pod::POM;
955 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1074 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
956 1075
957 $viewer->clear; 1076 $viewer->clear;
958 1077
… …
1002 if ($DEBUG_STATUS) { 1121 if ($DEBUG_STATUS) {
1003 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1122 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1004 } else { 1123 } else {
1005 # create the widgets 1124 # create the widgets
1006 1125
1007 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1126 $DEBUG_STATUS = new CFClient::UI::Label
1127 padding => 0,
1128 z => 100,
1129 force_x => "max",
1130 force_y => 0;
1008 $DEBUG_STATUS->show; 1131 $DEBUG_STATUS->show;
1009 1132
1133 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1134
1010 $STATUSBOX = new CFClient::UI::Statusbox; 1135 $STATUSBOX = new CFClient::UI::Statusbox;
1011 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1136 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1012 1137
1013 (new CFClient::UI::Frame 1138 (new CFClient::UI::Frame
1014 bg => [0, 0, 0, 0.4], 1139 bg => [0, 0, 0, 0.4],
1015 req_y => -1, 1140 force_x => 0,
1141 force_y => "max",
1016 child => $STATUSBOX, 1142 child => $STATUSBOX,
1017 )->show; 1143 )->show;
1018 1144
1019 CFClient::UI::FancyFrame->new ( 1145 CFClient::UI::FancyFrame->new (
1146 x => 0,
1147 y => $FONTSIZE + 8,
1020 border_bg => [1, 1, 1, 192/255], 1148 border_bg => [1, 1, 1, 192/255],
1021 bg => [1, 1, 1, 0], 1149 bg => [1, 1, 1, 0],
1022 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1150 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1023 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1151 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1024 ), 1152 ),
… …
1047 can_hover => 1, 1175 can_hover => 1,
1048 can_events => 1, 1176 can_events => 1,
1049 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1177 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1050 ; 1178 ;
1051 1179
1052 $BUTTONBAR = new CFClient::UI::HBox; 1180 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1053 1181
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1182 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1055 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1183 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1056 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1184 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1057 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1185 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1061 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1189 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1062 1190
1063 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1191 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1064 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1192 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1193 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1066 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1194 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1195 ."You can also hit the Tab-key to show/hide the Inventory.");
1067 1196
1068 $BUTTONBAR->add (new CFClient::UI::Button 1197 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Save Config", 1198 text => "Save Config",
1070 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1199 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1071 connect_activate => sub { 1200 on_activate => sub {
1072 $::CFG->{layout} = CFClient::UI::get_layout; 1201 $::CFG->{layout} = CFClient::UI::get_layout;
1073 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1202 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1074 status "Configuration Saved"; 1203 status "Configuration Saved";
1075 }, 1204 },
1076 ); 1205 );
1077 1206
1078 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1079 tooltip => "View Documentation"); 1208 tooltip => "View Documentation");
1080 1209
1210 $BUTTONBAR->add (new CFClient::UI::Flopper
1211 text => "Bindings",
1212 other => make_binding_window,
1213 tooltip =>
1214 "Lets you define, edit and delete bindings."
1215 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1216 ."with nothing set and the recording started. After doing the actions you "
1217 ."want to record press Insert and you will be asked to press a key-combo."
1218 ."After pressing the combo the binding will be saved automatically and the "
1219 ."binding editor closes"
1220 );
1221
1081 $BUTTONBAR->add (new CFClient::UI::Button 1222 $BUTTONBAR->add (new CFClient::UI::Button
1082 text => "Quit", 1223 text => "Quit",
1083 tooltip => "Terminates the program", 1224 tooltip => "Terminates the program",
1084 connect_activate => sub { 1225 on_activate => sub {
1085 if ($CONN) { 1226 if ($CONN) {
1086 open_quit_dialog; 1227 open_quit_dialog;
1087 } else { 1228 } else {
1088 exit; 1229 exit;
1089 } 1230 }
1090 }, 1231 },
1091 ); 1232 );
1092 1233
1093 $BUTTONBAR->show; 1234 $BUTTONBAR->show;
1235 $SERVER_SETUP->show;
1094 1236
1095 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1237 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1096
1097 # delay till geometry is constant
1098 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1099 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1100 my $widget = $GAUGES->{win};
1101 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1102 });
1103 force_refresh ();
1104 } 1238 }
1105} 1239}
1106 1240
1107sub video_shutdown { 1241sub video_shutdown {
1108 undef $SDL_ACTIVE; 1242 undef $SDL_ACTIVE;
… …
1176 1310
1177my %demo;#d# 1311my %demo;#d#
1178 1312
1179sub force_refresh { 1313sub force_refresh {
1180 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1314 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1181 debug sprintf "%3.2f", $fps; 1315 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1182 1316
1183 $CFClient::UI::ROOT->draw; 1317 $CFClient::UI::ROOT->draw;
1184 1318
1185 $WANT_REFRESH = 0; 1319 $WANT_REFRESH = 0;
1186 $CAN_REFRESH = 0; 1320 $CAN_REFRESH = 0;
… …
1318############################################################################# 1452#############################################################################
1319 1453
1320$SIG{INT} = $SIG{TERM} = sub { exit }; 1454$SIG{INT} = $SIG{TERM} = sub { exit };
1321 1455
1322{ 1456{
1323 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1457 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1324 1458
1325 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1459 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1326 CFClient::UI::set_layout ($::CFG->{layout}); 1460 CFClient::UI::set_layout ($::CFG->{layout});
1327 1461
1328 my %DEF_CFG = ( 1462 my %DEF_CFG = (
1329 sdl_mode => 0, 1463 sdl_mode => 0,
1330 width => 640, 1464 width => 640,
… …
1408 1542
1409END { CFClient::SDL_Quit } 1543END { CFClient::SDL_Quit }
1410 1544
1411=head1 NAME 1545=head1 NAME
1412 1546
1413pclient - A Crossfire+ and Crossfire game client 1547cfplus - A Crossfire+ and Crossfire game client
1414 1548
1415=head1 SYNOPSIS 1549=head1 SYNOPSIS
1416 1550
1417Just run it - no commandline arguments are supported. 1551Just run it - no commandline arguments are supported.
1418 1552
1419=head1 USAGE 1553=head1 USAGE
1420 1554
1421Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1555cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1422fullscreen and interactively. 1556fullscreen and interactively.
1423 1557
1424=head1 AUTHOR 1558=head1 AUTHOR
1425 1559
1426Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1560Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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