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.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),
187 name => "client_setup",
182 title => "Client Setup", 188 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 189 child => (my $vbox = new CFClient::UI::VBox);
190
184 $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]);
185 192
186 $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");
187 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
188 195
189 $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]);
190 $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");
191 198
192 $mode_slider->connect (changed => sub { 199 $mode_slider->connect (changed => sub {
193 my ($self, $value) = @_; 200 my ($self, $value) = @_;
194 201
… …
201 208
202 $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");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 210 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 211 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 212 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 213 on_changed => sub {
207 my ($self, $value) = @_; 214 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value; 215 $CFG->{fullscreen} = $value;
209 } 216 }
210 ); 217 );
211 218
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 220 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 221 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 222 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 223 on_changed => sub {
217 my ($self, $value) = @_; 224 my ($self, $value) = @_;
218 $CFG->{fast} = $value; 225 $CFG->{fast} = $value;
219 } 226 }
220 ); 227 );
221 228
222 $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");
223 $table->add (1, $row++, new CFClient::UI::Slider 230 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 233 on_changed => sub {
227 my ($self, $value) = @_; 234 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value; 235 $CFG->{map_scale} = 2 ** $value;
229 } 236 }
230 ); 237 );
231 238
232 $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");
233 $table->add (1, $row++, new CFClient::UI::CheckBox 240 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 241 state => $CFG->{fow_enable},
235 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.",
236 connect_changed => sub { 243 on_changed => sub {
237 my ($self, $value) = @_; 244 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value; 245 $CFG->{fow_enable} = $value;
239 } 246 }
240 ); 247 );
241 248
242 $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");
243 $table->add (1, $row++, new CFClient::UI::Slider 250 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 251 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.", 252 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 { 253 on_changed => sub {
247 my ($self, $value) = @_; 254 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value; 255 $CFG->{fow_intensity} = $value;
249 } 256 }
250 ); 257 );
251 258
252 $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");
253 $table->add (1, $row++, new CFClient::UI::CheckBox 260 $table->add (1, $row++, new CFClient::UI::CheckBox
254 state => $CFG->{fow_smooth}, 261 state => $CFG->{fow_smooth},
255 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.",
256 connect_changed => sub { 263 on_changed => sub {
257 my ($self, $value) = @_; 264 my ($self, $value) = @_;
258 $CFG->{fow_smooth} = $value; 265 $CFG->{fow_smooth} = $value;
259 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 266 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
260 } 267 }
261 ); 268 );
262 269
263 $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");
264 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 272 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.", 273 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] }, 274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
268 ); 275 );
269 276
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 278 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 279 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.", 280 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]) }, 281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
275 ); 282 );
276 283
277 $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");
278 285
279 $table->add (1, $row++, new CFClient::UI::Slider 286 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 287 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.", 288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
282 connect_changed => sub { 289 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 290 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 291 &set_stats_window_fontsize;
285 } 292 }
286 ); 293 );
287 294
288 $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");
289 $table->add (1, $row++, new CFClient::UI::Slider 296 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 297 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.", 298 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
292 connect_changed => sub { 299 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 300 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 301 &set_gauge_window_fontsize;
295 } 302 }
296 ); 303 );
297 304
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 306 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 307 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 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.",
302 connect_changed => sub { 309 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 310 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
305 } 312 }
306 ); 313 );
307 314
308 $table->add (1, $row++, new CFClient::UI::Button 315 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 316 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 317 tooltip => "Apply the video settings",
311 connect_activate => sub { 318 on_activate => sub {
312 video_shutdown (); 319 video_shutdown ();
313 video_init (); 320 video_init ();
314 } 321 }
315 ); 322 );
316 323
317 $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");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 325 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 326 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.", 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.",
321 connect_changed => sub { 328 on_changed => sub {
322 $CFG->{audio_enable} = $_[1]; 329 $CFG->{audio_enable} = $_[1];
323 } 330 }
324 ); 331 );
325# $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");
326# $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 {
327# $CFG->{effects_volume} = $_[1]; 334# $CFG->{effects_volume} = $_[1];
328# }); 335# });
329 $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");
330 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 338 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 339 expand => 1, state => $CFG->{bgm_enable},
333 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.",
334 connect_changed => sub { 341 on_changed => sub {
335 $CFG->{bgm_enable} = $_[1]; 342 $CFG->{bgm_enable} = $_[1];
336 } 343 }
337 ); 344 );
338 $hbox->add (new CFClient::UI::Slider 345 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 347 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 348 on_changed => sub {
342 $CFG->{bgm_volume} = $_[1]; 349 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128; 350 CFClient::MixMusic::volume $_[1] * 128;
344 } 351 }
345 ); 352 );
346 353
347 $table->add (1, $row++, new CFClient::UI::Button 354 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 355 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 356 tooltip => "Apply the audio settings",
350 connect_activate => sub { 357 on_activate => sub {
351 audio_shutdown (); 358 audio_shutdown ();
352 audio_init (); 359 audio_init ();
353 } 360 }
354 ); 361 );
355 362
… …
357 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
358 text => $CFG->{say_command}, 365 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. " 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. "
360 . "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. "
361 . "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.",
362 connect_changed => sub { 369 on_changed => sub {
363 my ($self, $value) = @_; 370 my ($self, $value) = @_;
364 $CFG->{say_command} = $value; 371 $CFG->{say_command} = $value;
365 } 372 }
366 ); 373 );
367 374
… …
382 389
383sub make_gauge_window { 390sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 391 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 392
386 my $win = new CFClient::UI::Frame ( 393 my $win = new CFClient::UI::Frame (
387 req_y => -1, 394 force_x => 0,
395 force_y => "max",
388 user_w => $WIDTH, 396 force_w => $WIDTH,
389 user_h => $gh, 397 force_h => $gh,
390 ); 398 );
391 399
392 $win->add (my $hbox = new CFClient::UI::HBox 400 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 401 children => [
394 (new CFClient::UI::HBox expand => 1), 402 (new CFClient::UI::HBox expand => 1),
… …
430 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
431 439
432 $win 440 $win
433} 441}
434 442
443
435sub make_stats_window { 444sub make_stats_window {
436 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 445 my $tgw = new CFClient::UI::FancyFrame
446 y => $HEIGHT * (2/8),
447 x => "max",
448 title => "Stats",
449 name => "stats_window";
437 450
438 $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);
439 $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,
440 can_hover => 1, can_events => 1, 453 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."); 454 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)."); 457 tooltip => "The map you are currently on (if supported by the server).");
445 458
446 $vb->add (my $hb0 = new CFClient::UI::HBox); 459 $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, 460 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
448 can_hover => 1, can_events => 1, 461 can_hover => 1, can_events => 1,
449 tooltip => "This is the amount the Player weights."); 462 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, 463 $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, 464 can_hover => 1, can_events => 1,
452 tooltip => "The weight limit, you can't carry more than this."); 465 tooltip => "The weight limit: you cannot carry more than this.");
453 466
454 467
455 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 468 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
456 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
457 470
… …
688 $m = [$users, $host, $uptime, $version, $desc]; 701 $m = [$users, $host, $uptime, $version, $desc];
689 702
690 $y++; 703 $y++;
691 704
692 $table->add (0, $y, new CFClient::UI::VBox children => [ 705 $table->add (0, $y, new CFClient::UI::VBox children => [
693 (new CFClient::UI::Button text => "Use", connect_activate => sub { 706 (new CFClient::UI::Button text => "Use", on_activate => sub {
694 $HOST->set_text ($CFG->{host} = $host); 707 $HOST->set_text ($CFG->{host} = $host);
695 }), 708 }),
696 (new CFClient::UI::Empty expand => 1), 709 (new CFClient::UI::Empty expand => 1),
697 ]); 710 ]);
698 711
… …
703 } 716 }
704 }); 717 });
705} 718}
706 719
707sub server_setup { 720sub server_setup {
708 my $dialog = new CFClient::UI::FancyFrame 721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
724 name => "server_setup",
709 title => "Server Setup", 725 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 726 child => (my $vbox = new CFClient::UI::VBox),
711 727 ;
728
712 $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]);
713 $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");
714 731
715 { 732 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
718 $vbox->add ( 735 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 736 my $HOST = new CFClient::UI::Entry
720 expand => 1, 737 expand => 1,
721 text => $CFG->{host}, 738 text => $CFG->{host},
722 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",
723 connect_changed => sub { 740 on_changed => sub {
724 my ($self, $value) = @_; 741 my ($self, $value) = @_;
725 $CFG->{host} = $value; 742 $CFG->{host} = $value;
726 } 743 }
727 ); 744 );
728 745
… …
731 $vbox->add (new CFClient::UI::Flopper 748 $vbox->add (new CFClient::UI::Flopper
732 expand => 1, 749 expand => 1,
733 text => "Server List", 750 text => "Server List",
734 other => $METASERVER, 751 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 752 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 753 on_open => sub {
737 update_metaserver $HOST; 754 update_metaserver $HOST;
738 } 755 }
739 ); 756 );
740 } 757 }
741 758
742 $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");
743 $table->add (1, 4, new CFClient::UI::Entry 760 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 761 text => $CFG->{user},
745 tooltip => "The name of your character on the server", 762 tooltip => "The name of your character on the server",
746 connect_changed => sub { 763 on_changed => sub {
747 my ($self, $value) = @_; 764 my ($self, $value) = @_;
748 $CFG->{user} = $value; 765 $CFG->{user} = $value;
749 } 766 }
750 ); 767 );
751 768
752 $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");
753 $table->add (1, 5, new CFClient::UI::Entry 770 $table->add (1, 5, new CFClient::UI::Entry
754 text => $CFG->{password}, 771 text => $CFG->{password},
755 hidden => 1, 772 hidden => 1,
756 tooltip => "The password for your character", 773 tooltip => "The password for your character",
757 connect_changed => sub { 774 on_changed => sub {
758 my ($self, $value) = @_; 775 my ($self, $value) = @_;
759 $CFG->{password} = $value; 776 $CFG->{password} = $value;
760 } 777 }
761 ); 778 );
762 779
763 $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");
764 $table->add (1, 7, new CFClient::UI::Slider 781 $table->add (1, 7, new CFClient::UI::Slider
765 req_w => 100, 782 force_w => 100,
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 783 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 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. "
768 . "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, "
769 . "but you also increase bandwidth requirements and latency. " 786 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 787 . "This option is only used once at log-in.",
771 connect_changed => sub { 788 on_changed => sub {
772 my ($self, $value) = @_; 789 my ($self, $value) = @_;
773 790
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 791 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 }, 792 },
776 ); 793 );
… …
783 . "This might increase or create lag, but increases the chances " 800 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 801 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 802 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 803 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 804 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 805 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
789 ); 806 );
790 807
791 $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");
792 $table->add (1, 9, new CFClient::UI::Entry 809 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 810 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.", 811 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] }, 812 on_changed => sub { $CFG->{output_count} = $_[1] },
796 ); 813 );
797 814
798 $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");
799 $table->add (1, 10, new CFClient::UI::Entry 816 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 817 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.", 818 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] }, 819 on_changed => sub { $CFG->{output_sync} = $_[1] },
803 ); 820 );
804 821
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 822 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 823 expand => 1,
807 align => 0, 824 align => 0,
808 text => "Login", 825 text => "Login",
809 connect_activate => sub { 826 on_activate => sub {
810 $CONN ? stop_game 827 $CONN ? stop_game
811 : start_game; 828 : start_game;
812 }, 829 },
813 ); 830 );
814 831
815 $dialog 832 $dialog
816} 833}
817 834
818sub message_window { 835sub message_window {
819 my $window = new CFClient::UI::FancyFrame 836 my $window = new CFClient::UI::FancyFrame
837 name => "message_window",
820 title => "Messages", 838 title => "Messages",
821 border_bg => [1, 1, 1, 1], 839 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 840 bg => [0, 0, 0, 0.75],
841 x => "max",
842 y => 0,
823 user_w => int $::WIDTH / 3, 843 force_w => $::WIDTH / 3,
824 user_h => int $::HEIGHT / 5, 844 force_h => $::HEIGHT / 5,
825 child => (my $vbox = new CFClient::UI::VBox); 845 child => (my $vbox = new CFClient::UI::VBox);
826 846
827 $vbox->add ($LOGVIEW); 847 $vbox->add ($LOGVIEW);
828 848
829 $vbox->add (my $input = new CFClient::UI::Entry 849 $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> " 850 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>...). " 851 . "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). " 852 . "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.", 853 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
834 connect_focus_in => sub { 854 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 855 my ($input, $prev_focus) = @_;
836 856
837 delete $input->{refocus_map}; 857 delete $input->{refocus_map};
838 858
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 859 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 860 $input->{refocus_map} = 1;
841 } 861 }
842 delete $input->{auto_activated}; 862 delete $input->{auto_activated};
843 }, 863 },
844 connect_activate => sub { 864 on_activate => sub {
845 my ($input, $text) = @_; 865 my ($input, $text) = @_;
846 $input->set_text (''); 866 $input->set_text ('');
847 867
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
848 if ($text =~ /^\/(.*)/) { 873 } elsif ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 874 $::CONN->user_send ($1);
850 } else { 875 } else {
851 my $say_cmd = $::CFG->{say_command} || 'say'; 876 my $say_cmd = $::CFG->{say_command} || 'say';
852 $::CONN->user_send ("$say_cmd $text"); 877 $::CONN->user_send ("$say_cmd $text");
853 } 878 }
854 if ($input->{refocus_map}) { 879 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 880 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 881 $MAPWIDGET->focus_in
857 } 882 }
858 }, 883 },
859 connect_escape => sub { 884 on_escape => sub {
860 $MAPWIDGET->focus_in 885 $MAPWIDGET->focus_in
861 }, 886 },
862 ); 887 );
863 888
864 $CONSOLE = { 889 $CONSOLE = {
865 window => $window, 890 window => $window,
866 input => $input 891 input => $input,
867 }; 892 };
868 893
869 $window 894 $window
870} 895}
871 896
872sub open_quit_dialog { 897sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 898 unless ($QUIT_DIALOG) {
874
875 $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 ;
876 904
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 906
879 $vb->add (new CFClient::UI::Label 907 $vb->add (new CFClient::UI::Label
880 text => "You should find a savebed and apply it first!", 908 text => "You should find a savebed and apply it first!",
… …
883 ); 911 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 912 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 913 $hb->add (new CFClient::UI::Button
886 text => "Ok", 914 text => "Ok",
887 expand => 1, 915 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 916 on_activate => sub { $QUIT_DIALOG->hide },
889 ); 917 );
890 $hb->add (new CFClient::UI::Button 918 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 919 text => "Quit anyway",
892 expand => 1, 920 expand => 1,
893 connect_activate => sub { exit }, 921 on_activate => sub { exit },
894 ); 922 );
923 }
895 924
896 $QUIT_DIALOG->show_centered; 925 $QUIT_DIALOG->show;
897 } else {
898 $QUIT_DIALOG->show_centered;
899 }
900} 926}
901 927
902sub make_inventory_window { 928sub make_inventory_window {
903 my $invwin = new CFClient::UI::FancyFrame 929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
904 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 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 ;
905 937
906 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
907 939
908 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 940 $hb->add (my $vb1 = new CFClient::UI::VBox);
909 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 941 $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); 942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
912 943
913 $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);
914 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1018 $vb->add (my $hb = new CFClient::UI::HBox);
915 $hb2->add (new CFClient::UI::Button 1019 $hb->add (new CFClient::UI::Button
916 text => "Close", 1020 text => "record new",
917 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.",
918 connect_activate => sub { 1023 on_activate => sub {
919 $CONN->send ("apply $CONN->{open_container}") 1024 $::BIND_EDITOR->set_binding (undef, undef, [],
920 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;
921 }, 1036 },
922 ); 1037 );
923 $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 );
924 1046
925 $INVR_LBL->set_text ("Floor"); 1047 $refresh->();
926 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1048 $BIND_WINDOW
927
928 $invwin
929} 1049}
930 1050
931sub make_help_window { 1051sub make_help_window {
932 my $win = new CFClient::UI::FancyFrame 1052 my $win = new CFClient::UI::FancyFrame
933 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";
934 1056
935 $win->add (my $vbox = new CFClient::UI::VBox); 1057 $win->add (my $vbox = new CFClient::UI::VBox);
936 1058
937 $vbox->add (my $buttons = new CFClient::UI::HBox); 1059 $vbox->add (my $buttons = new CFClient::UI::HBox);
938 $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);
… …
945 ) { 1067 ) {
946 my ($pod, $label) = @$_; 1068 my ($pod, $label) = @$_;
947 1069
948 $buttons->add (new CFClient::UI::Button 1070 $buttons->add (new CFClient::UI::Button
949 text => $label, 1071 text => $label,
950 connect_activate => sub { 1072 on_activate => sub {
951 my $parser = new Pod::POM; 1073 my $parser = new Pod::POM;
952 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1074 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
953 1075
954 $viewer->clear; 1076 $viewer->clear;
955 1077
… …
999 if ($DEBUG_STATUS) { 1121 if ($DEBUG_STATUS) {
1000 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1122 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1001 } else { 1123 } else {
1002 # create the widgets 1124 # create the widgets
1003 1125
1004 $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;
1005 $DEBUG_STATUS->show; 1131 $DEBUG_STATUS->show;
1006 1132
1133 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1134
1007 $STATUSBOX = new CFClient::UI::Statusbox; 1135 $STATUSBOX = new CFClient::UI::Statusbox;
1008 $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]);
1009 1137
1010 (new CFClient::UI::Frame 1138 (new CFClient::UI::Frame
1011 bg => [0, 0, 0, 0.4], 1139 bg => [0, 0, 0, 0.4],
1012 req_y => -1, 1140 force_x => 0,
1141 force_y => "max",
1013 child => $STATUSBOX, 1142 child => $STATUSBOX,
1014 )->show; 1143 )->show;
1015 1144
1016 CFClient::UI::FancyFrame->new ( 1145 CFClient::UI::FancyFrame->new (
1146 x => 0,
1147 y => $FONTSIZE + 8,
1017 border_bg => [1, 1, 1, 192/255], 1148 border_bg => [1, 1, 1, 192/255],
1018 bg => [1, 1, 1, 0], 1149 bg => [1, 1, 1, 0],
1019 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1150 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1020 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.",
1021 ), 1152 ),
… …
1044 can_hover => 1, 1175 can_hover => 1,
1045 can_events => 1, 1176 can_events => 1,
1046 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.",
1047 ; 1178 ;
1048 1179
1049 $BUTTONBAR = new CFClient::UI::HBox; 1180 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1050 1181
1051 $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,
1052 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.");
1053 $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,
1054 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.");
… …
1058 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
1059 1190
1060 $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,
1061 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.");
1062 $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,
1063 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.");
1064 1196
1065 $BUTTONBAR->add (new CFClient::UI::Button 1197 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1198 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.", 1199 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 { 1200 on_activate => sub {
1201 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1202 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1070 status "Configuration Saved"; 1203 status "Configuration Saved";
1071 }, 1204 },
1072 ); 1205 );
1073 1206
1074 $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,
1075 tooltip => "View Documentation"); 1208 tooltip => "View Documentation");
1076 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
1077 $BUTTONBAR->add (new CFClient::UI::Button 1222 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1223 text => "Quit",
1079 tooltip => "Terminates the program", 1224 tooltip => "Terminates the program",
1080 connect_activate => sub { 1225 on_activate => sub {
1081 if ($CONN) { 1226 if ($CONN) {
1082 open_quit_dialog; 1227 open_quit_dialog;
1083 } else { 1228 } else {
1084 exit; 1229 exit;
1085 } 1230 }
1086 }, 1231 },
1087 ); 1232 );
1088 1233
1089 $BUTTONBAR->show; 1234 $BUTTONBAR->show;
1235 $SERVER_SETUP->show;
1090 1236
1091 $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]);
1092
1093 # delay till geometry is constant
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 } 1238 }
1101} 1239}
1102 1240
1103sub video_shutdown { 1241sub video_shutdown {
1104 undef $SDL_ACTIVE; 1242 undef $SDL_ACTIVE;
… …
1172 1310
1173my %demo;#d# 1311my %demo;#d#
1174 1312
1175sub force_refresh { 1313sub force_refresh {
1176 $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;
1177 debug sprintf "%3.2f", $fps; 1315 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1178 1316
1179 $CFClient::UI::ROOT->draw; 1317 $CFClient::UI::ROOT->draw;
1180 1318
1181 $WANT_REFRESH = 0; 1319 $WANT_REFRESH = 0;
1182 $CAN_REFRESH = 0; 1320 $CAN_REFRESH = 0;
… …
1314############################################################################# 1452#############################################################################
1315 1453
1316$SIG{INT} = $SIG{TERM} = sub { exit }; 1454$SIG{INT} = $SIG{TERM} = sub { exit };
1317 1455
1318{ 1456{
1319 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1457 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1320 1458
1321 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1459 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1460 CFClient::UI::set_layout ($::CFG->{layout});
1322 1461
1323 my %DEF_CFG = ( 1462 my %DEF_CFG = (
1324 sdl_mode => 0, 1463 sdl_mode => 0,
1325 width => 640, 1464 width => 640,
1326 height => 480, 1465 height => 480,
… …
1403 1542
1404END { CFClient::SDL_Quit } 1543END { CFClient::SDL_Quit }
1405 1544
1406=head1 NAME 1545=head1 NAME
1407 1546
1408pclient - A Crossfire+ and Crossfire game client 1547cfplus - A Crossfire+ and Crossfire game client
1409 1548
1410=head1 SYNOPSIS 1549=head1 SYNOPSIS
1411 1550
1412Just run it - no commandline arguments are supported. 1551Just run it - no commandline arguments are supported.
1413 1552
1414=head1 USAGE 1553=head1 USAGE
1415 1554
1416Pclient 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
1417fullscreen and interactively. 1556fullscreen and interactively.
1418 1557
1419=head1 AUTHOR 1558=head1 AUTHOR
1420 1559
1421Marc 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