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.33 by root, Tue May 30 07:13:09 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;
105 109
106sub status { 110sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 112}
109 113
110sub debug { 114sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 116}
115 117
116sub start_game { 118sub start_game {
117 status "logging in..."; 119 status "logging in...";
120
121 $LOGIN_BUTTON->set_text ("Logout");
122 $SERVER_SETUP->hide;
118 123
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 124 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 125
121 my ($host, $port) = split /:/, $CFG->{host}; 126 my ($host, $port) = split /:/, $CFG->{host};
122 127
… …
151 }; 156 };
152 157
153 if ($CONN) { 158 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 159 CFClient::lowdelay fileno $CONN->{fh};
155 160
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 161 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 162 } else {
163 status "unable to connect"; 163 status "unable to connect";
164 stop_game(); 164 stop_game();
165 } 165 }
166} 166}
167 167
168sub stop_game { 168sub stop_game {
169 $LOGIN_BUTTON->set_text ("Login");
170 $SERVER_SETUP->show;
171 $INV_WINDOW->hide;
172 $LOGVIEW->hide;
173
169 return unless $CONN; 174 return unless $CONN;
170 175
171 status "connection closed"; 176 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 177
173 $CONN->destroy; 178 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 179 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 180}
179 181
180sub client_setup { 182sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 183 my $dialog = new CFClient::UI::FancyFrame
184 x => 1,
185 y => $HEIGHT * (1/8),
186 name => "client_setup",
182 title => "Client Setup", 187 title => "Client Setup",
183 child => (my $vbox = new CFClient::UI::VBox); 188 child => (my $vbox = new CFClient::UI::VBox);
189
184 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 190 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
185 191
186 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 192 $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); 193 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
188 194
189 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 195 $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"); 196 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
191 197
192 $mode_slider->connect (changed => sub { 198 $mode_slider->connect (changed => sub {
193 my ($self, $value) = @_; 199 my ($self, $value) = @_;
194 200
… …
201 207
202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
203 $table->add (1, $row++, new CFClient::UI::CheckBox 209 $table->add (1, $row++, new CFClient::UI::CheckBox
204 state => $CFG->{fullscreen}, 210 state => $CFG->{fullscreen},
205 tooltip => "Bring the client into fullscreen mode.", 211 tooltip => "Bring the client into fullscreen mode.",
206 connect_changed => sub { 212 on_changed => sub {
207 my ($self, $value) = @_; 213 my ($self, $value) = @_;
208 $CFG->{fullscreen} = $value; 214 $CFG->{fullscreen} = $value;
209 } 215 }
210 ); 216 );
211 217
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 219 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fast}, 220 state => $CFG->{fast},
215 tooltip => "Lower the visual quality considerably to speed up rendering.", 221 tooltip => "Lower the visual quality considerably to speed up rendering.",
216 connect_changed => sub { 222 on_changed => sub {
217 my ($self, $value) = @_; 223 my ($self, $value) = @_;
218 $CFG->{fast} = $value; 224 $CFG->{fast} = $value;
219 } 225 }
220 ); 226 );
221 227
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
223 $table->add (1, $row++, new CFClient::UI::Slider 229 $table->add (1, $row++, new CFClient::UI::Slider
224 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 230 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
225 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 231 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
226 connect_changed => sub { 232 on_changed => sub {
227 my ($self, $value) = @_; 233 my ($self, $value) = @_;
228 $CFG->{map_scale} = 2 ** $value; 234 $CFG->{map_scale} = 2 ** $value;
229 } 235 }
230 ); 236 );
231 237
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 238 $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 239 $table->add (1, $row++, new CFClient::UI::CheckBox
234 state => $CFG->{fow_enable}, 240 state => $CFG->{fow_enable},
235 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 241 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
236 connect_changed => sub { 242 on_changed => sub {
237 my ($self, $value) = @_; 243 my ($self, $value) = @_;
238 $CFG->{fow_enable} = $value; 244 $CFG->{fow_enable} = $value;
239 } 245 }
240 ); 246 );
241 247
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
243 $table->add (1, $row++, new CFClient::UI::Slider 249 $table->add (1, $row++, new CFClient::UI::Slider
244 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 250 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.", 251 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 { 252 on_changed => sub {
247 my ($self, $value) = @_; 253 my ($self, $value) = @_;
248 $CFG->{fow_intensity} = $value; 254 $CFG->{fow_intensity} = $value;
249 } 255 }
250 ); 256 );
251 257
252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
253 $table->add (1, $row++, new CFClient::UI::CheckBox 259 $table->add (1, $row++, new CFClient::UI::CheckBox
254 state => $CFG->{fow_smooth}, 260 state => $CFG->{fow_smooth},
255 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 261 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
256 connect_changed => sub { 262 on_changed => sub {
257 my ($self, $value) = @_; 263 my ($self, $value) = @_;
258 $CFG->{fow_smooth} = $value; 264 $CFG->{fow_smooth} = $value;
259 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 265 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
260 } 266 }
261 ); 267 );
262 268
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 269 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
264 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
265 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 271 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.", 272 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] }, 273 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
268 ); 274 );
269 275
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 276 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider 277 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 278 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.", 279 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]) }, 280 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
275 ); 281 );
276 282
277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 283 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
278 284
279 $table->add (1, $row++, new CFClient::UI::Slider 285 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 286 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.", 287 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
282 connect_changed => sub { 288 on_changed => sub {
283 $CFG->{stat_fontsize} = $_[1]; 289 $CFG->{stat_fontsize} = $_[1];
284 &set_stats_window_fontsize; 290 &set_stats_window_fontsize;
285 } 291 }
286 ); 292 );
287 293
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 294 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
289 $table->add (1, $row++, new CFClient::UI::Slider 295 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 296 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.", 297 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
292 connect_changed => sub { 298 on_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 299 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 300 &set_gauge_window_fontsize;
295 } 301 }
296 ); 302 );
297 303
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 304 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
299 $table->add (1, $row++, new CFClient::UI::Slider 305 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_size}, 0.2, 0.8], 306 range => [$CFG->{gauge_size}, 0.2, 0.8],
301 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 307 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
302 connect_changed => sub { 308 on_changed => sub {
303 $CFG->{gauge_size} = $_[1]; 309 $CFG->{gauge_size} = $_[1];
304 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 310 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
305 } 311 }
306 ); 312 );
307 313
308 $table->add (1, $row++, new CFClient::UI::Button 314 $table->add (1, $row++, new CFClient::UI::Button
309 expand => 1, align => 0, text => "Apply", 315 expand => 1, align => 0, text => "Apply",
310 tooltip => "Apply the video settings", 316 tooltip => "Apply the video settings",
311 connect_activate => sub { 317 on_activate => sub {
312 video_shutdown (); 318 video_shutdown ();
313 video_init (); 319 video_init ();
314 } 320 }
315 ); 321 );
316 322
317 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 323 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
318 $table->add (1, $row++, new CFClient::UI::CheckBox 324 $table->add (1, $row++, new CFClient::UI::CheckBox
319 state => $CFG->{audio_enable}, 325 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.", 326 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 { 327 on_changed => sub {
322 $CFG->{audio_enable} = $_[1]; 328 $CFG->{audio_enable} = $_[1];
323 } 329 }
324 ); 330 );
325# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 331# $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 { 332# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
327# $CFG->{effects_volume} = $_[1]; 333# $CFG->{effects_volume} = $_[1];
328# }); 334# });
329 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 335 $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); 336 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
331 $hbox->add (new CFClient::UI::CheckBox 337 $hbox->add (new CFClient::UI::CheckBox
332 expand => 1, state => $CFG->{bgm_enable}, 338 expand => 1, state => $CFG->{bgm_enable},
333 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 339 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
334 connect_changed => sub { 340 on_changed => sub {
335 $CFG->{bgm_enable} = $_[1]; 341 $CFG->{bgm_enable} = $_[1];
336 } 342 }
337 ); 343 );
338 $hbox->add (new CFClient::UI::Slider 344 $hbox->add (new CFClient::UI::Slider
339 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 345 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
340 tooltip => "The volume of the background music. Changes are instant.", 346 tooltip => "The volume of the background music. Changes are instant.",
341 connect_changed => sub { 347 on_changed => sub {
342 $CFG->{bgm_volume} = $_[1]; 348 $CFG->{bgm_volume} = $_[1];
343 CFClient::MixMusic::volume $_[1] * 128; 349 CFClient::MixMusic::volume $_[1] * 128;
344 } 350 }
345 ); 351 );
346 352
347 $table->add (1, $row++, new CFClient::UI::Button 353 $table->add (1, $row++, new CFClient::UI::Button
348 expand => 1, align => 0, text => "Apply", 354 expand => 1, align => 0, text => "Apply",
349 tooltip => "Apply the audio settings", 355 tooltip => "Apply the audio settings",
350 connect_activate => sub { 356 on_activate => sub {
351 audio_shutdown (); 357 audio_shutdown ();
352 audio_init (); 358 audio_init ();
353 } 359 }
354 ); 360 );
355 361
… …
357 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 363 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
358 text => $CFG->{say_command}, 364 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. " 365 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. " 366 . "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.", 367 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
362 connect_changed => sub { 368 on_changed => sub {
363 my ($self, $value) = @_; 369 my ($self, $value) = @_;
364 $CFG->{say_command} = $value; 370 $CFG->{say_command} = $value;
365 } 371 }
366 ); 372 );
367 373
… …
382 388
383sub make_gauge_window { 389sub make_gauge_window {
384 my $gh = int $HEIGHT * $CFG->{gauge_size}; 390 my $gh = int $HEIGHT * $CFG->{gauge_size};
385 391
386 my $win = new CFClient::UI::Frame ( 392 my $win = new CFClient::UI::Frame (
387 req_y => -1, 393 force_x => 0,
394 force_y => "max",
388 user_w => $WIDTH, 395 force_w => $WIDTH,
389 user_h => $gh, 396 force_h => $gh,
390 ); 397 );
391 398
392 $win->add (my $hbox = new CFClient::UI::HBox 399 $win->add (my $hbox = new CFClient::UI::HBox
393 children => [ 400 children => [
394 (new CFClient::UI::HBox expand => 1), 401 (new CFClient::UI::HBox expand => 1),
… …
430 &set_gauge_window_fontsize; 437 &set_gauge_window_fontsize;
431 438
432 $win 439 $win
433} 440}
434 441
442
435sub make_stats_window { 443sub make_stats_window {
436 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 444 my $tgw = new CFClient::UI::FancyFrame
445 y => $HEIGHT * (2/8),
446 x => "max",
447 title => "Stats",
448 name => "stats_window";
437 449
438 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 450 $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, 451 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
440 can_hover => 1, can_events => 1, 452 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."); 453 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)."); 456 tooltip => "The map you are currently on (if supported by the server).");
445 457
446 $vb->add (my $hb0 = new CFClient::UI::HBox); 458 $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, 459 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
448 can_hover => 1, can_events => 1, 460 can_hover => 1, can_events => 1,
449 tooltip => "This is the amount the Player weights."); 461 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, 462 $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, 463 can_hover => 1, can_events => 1,
452 tooltip => "The weight limit, you can't carry more than this."); 464 tooltip => "The weight limit: you cannot carry more than this.");
453 465
454 466
455 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 467 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
456 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 468 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
457 469
… …
688 $m = [$users, $host, $uptime, $version, $desc]; 700 $m = [$users, $host, $uptime, $version, $desc];
689 701
690 $y++; 702 $y++;
691 703
692 $table->add (0, $y, new CFClient::UI::VBox children => [ 704 $table->add (0, $y, new CFClient::UI::VBox children => [
693 (new CFClient::UI::Button text => "Use", connect_activate => sub { 705 (new CFClient::UI::Button text => "Use", on_activate => sub {
694 $HOST->set_text ($CFG->{host} = $host); 706 $HOST->set_text ($CFG->{host} = $host);
695 }), 707 }),
696 (new CFClient::UI::Empty expand => 1), 708 (new CFClient::UI::Empty expand => 1),
697 ]); 709 ]);
698 710
… …
703 } 715 }
704 }); 716 });
705} 717}
706 718
707sub server_setup { 719sub server_setup {
708 my $dialog = new CFClient::UI::FancyFrame 720 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
721 x => "center",
722 y => "center",
723 name => "server_setup",
709 title => "Server Setup", 724 title => "Server Setup",
710 child => (my $vbox = new CFClient::UI::VBox); 725 child => (my $vbox = new CFClient::UI::VBox),
711 726 ;
727
712 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 728 $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"); 729 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
714 730
715 { 731 {
716 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 732 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
718 $vbox->add ( 734 $vbox->add (
719 my $HOST = new CFClient::UI::Entry 735 my $HOST = new CFClient::UI::Entry
720 expand => 1, 736 expand => 1,
721 text => $CFG->{host}, 737 text => $CFG->{host},
722 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 738 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
723 connect_changed => sub { 739 on_changed => sub {
724 my ($self, $value) = @_; 740 my ($self, $value) = @_;
725 $CFG->{host} = $value; 741 $CFG->{host} = $value;
726 } 742 }
727 ); 743 );
728 744
… …
731 $vbox->add (new CFClient::UI::Flopper 747 $vbox->add (new CFClient::UI::Flopper
732 expand => 1, 748 expand => 1,
733 text => "Server List", 749 text => "Server List",
734 other => $METASERVER, 750 other => $METASERVER,
735 tooltip => "Show a list of available crossfire servers", 751 tooltip => "Show a list of available crossfire servers",
736 connect_open => sub { 752 on_open => sub {
737 update_metaserver $HOST; 753 update_metaserver $HOST;
738 } 754 }
739 ); 755 );
740 } 756 }
741 757
742 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
743 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
744 text => $CFG->{user}, 760 text => $CFG->{user},
745 tooltip => "The name of your character on the server", 761 tooltip => "The name of your character on the server",
746 connect_changed => sub { 762 on_changed => sub {
747 my ($self, $value) = @_; 763 my ($self, $value) = @_;
748 $CFG->{user} = $value; 764 $CFG->{user} = $value;
749 } 765 }
750 ); 766 );
751 767
752 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
753 $table->add (1, 5, new CFClient::UI::Entry 769 $table->add (1, 5, new CFClient::UI::Entry
754 text => $CFG->{password}, 770 text => $CFG->{password},
755 hidden => 1, 771 hidden => 1,
756 tooltip => "The password for your character", 772 tooltip => "The password for your character",
757 connect_changed => sub { 773 on_changed => sub {
758 my ($self, $value) = @_; 774 my ($self, $value) = @_;
759 $CFG->{password} = $value; 775 $CFG->{password} = $value;
760 } 776 }
761 ); 777 );
762 778
763 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
764 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
765 req_w => 100, 781 force_w => 100,
766 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
767 tooltip => "This is the size of the portion of the map update the server sends you. " 783 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, " 784 . "If you set this to a high value you will be able to see further, "
769 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
770 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
771 connect_changed => sub { 787 on_changed => sub {
772 my ($self, $value) = @_; 788 my ($self, $value) = @_;
773 789
774 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
775 }, 791 },
776 ); 792 );
… …
783 . "This might increase or create lag, but increases the chances " 799 . "This might increase or create lag, but increases the chances "
784 . "of faces being ready for display when you encounter them. " 800 . "of faces being ready for display when you encounter them. "
785 . "It also uses up server bandwidth on every connect, " 801 . "It also uses up server bandwidth on every connect, "
786 . "so only set it if you really need to prefetch images. " 802 . "so only set it if you really need to prefetch images. "
787 . "This option can be set and unset any time.", 803 . "This option can be set and unset any time.",
788 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 804 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
789 ); 805 );
790 806
791 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
792 $table->add (1, 9, new CFClient::UI::Entry 808 $table->add (1, 9, new CFClient::UI::Entry
793 text => $CFG->{output_count}, 809 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.", 810 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] }, 811 on_changed => sub { $CFG->{output_count} = $_[1] },
796 ); 812 );
797 813
798 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
799 $table->add (1, 10, new CFClient::UI::Entry 815 $table->add (1, 10, new CFClient::UI::Entry
800 text => $CFG->{output_sync}, 816 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.", 817 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] }, 818 on_changed => sub { $CFG->{output_sync} = $_[1] },
803 ); 819 );
804 820
805 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
806 expand => 1, 822 expand => 1,
807 align => 0, 823 align => 0,
808 text => "Login", 824 text => "Login",
809 connect_activate => sub { 825 on_activate => sub {
810 $CONN ? stop_game 826 $CONN ? stop_game
811 : start_game; 827 : start_game;
812 }, 828 },
813 ); 829 );
814 830
815 $dialog 831 $dialog
816} 832}
817 833
818sub message_window { 834sub message_window {
819 my $window = new CFClient::UI::FancyFrame 835 my $window = new CFClient::UI::FancyFrame
836 name => "message_window",
820 title => "Messages", 837 title => "Messages",
821 border_bg => [1, 1, 1, 1], 838 border_bg => [1, 1, 1, 1],
822 bg => [0, 0, 0, 0.75], 839 bg => [0, 0, 0, 0.75],
840 x => "max",
841 y => 0,
823 user_w => int $::WIDTH / 3, 842 force_w => $::WIDTH / 3,
824 user_h => int $::HEIGHT / 5, 843 force_h => $::HEIGHT / 5,
825 child => (my $vbox = new CFClient::UI::VBox); 844 child => (my $vbox = new CFClient::UI::VBox);
826 845
827 $vbox->add ($LOGVIEW); 846 $vbox->add ($LOGVIEW);
828 847
829 $vbox->add (my $input = new CFClient::UI::Entry 848 $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> " 849 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>...). " 850 . "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). " 851 . "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.", 852 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
834 connect_focus_in => sub { 853 on_focus_in => sub {
835 my ($input, $prev_focus) = @_; 854 my ($input, $prev_focus) = @_;
836 855
837 delete $input->{refocus_map}; 856 delete $input->{refocus_map};
838 857
839 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 858 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
840 $input->{refocus_map} = 1; 859 $input->{refocus_map} = 1;
841 } 860 }
842 delete $input->{auto_activated}; 861 delete $input->{auto_activated};
843 }, 862 },
844 connect_activate => sub { 863 on_activate => sub {
845 my ($input, $text) = @_; 864 my ($input, $text) = @_;
846 $input->set_text (''); 865 $input->set_text ('');
847 866
867 if ($text =~ /^\/bind\s+(.*)$/) {
868 CFClient::Recorder::open_binding_dialog ([$1]);
848 if ($text =~ /^\/(.*)/) { 869 } elsif ($text =~ /^\/(.*)/) {
849 $::CONN->user_send ($1); 870 $::CONN->user_send ($1);
850 } else { 871 } else {
851 my $say_cmd = $::CFG->{say_command} || 'say'; 872 my $say_cmd = $::CFG->{say_command} || 'say';
852 $::CONN->user_send ("$say_cmd $text"); 873 $::CONN->user_send ("$say_cmd $text");
853 } 874 }
854 if ($input->{refocus_map}) { 875 if ($input->{refocus_map}) {
855 delete $input->{refocus_map}; 876 delete $input->{refocus_map};
856 $MAPWIDGET->focus_in 877 $MAPWIDGET->focus_in
857 } 878 }
858 }, 879 },
859 connect_escape => sub { 880 on_escape => sub {
860 $MAPWIDGET->focus_in 881 $MAPWIDGET->focus_in
861 }, 882 },
862 ); 883 );
863 884
864 $CONSOLE = { 885 $CONSOLE = {
865 window => $window, 886 window => $window,
866 input => $input 887 input => $input,
867 }; 888 };
868 889
869 $window 890 $window
870} 891}
871 892
872sub open_quit_dialog { 893sub open_quit_dialog {
873 unless ($QUIT_DIALOG) { 894 unless ($QUIT_DIALOG) {
874
875 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 895 $QUIT_DIALOG = new CFClient::UI::FancyFrame
896 x => "center",
897 y => "center",
898 title => "Really Quit?",
899 ;
876 900
877 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 901 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
878 902
879 $vb->add (new CFClient::UI::Label 903 $vb->add (new CFClient::UI::Label
880 text => "You should find a savebed and apply it first!", 904 text => "You should find a savebed and apply it first!",
… …
883 ); 907 );
884 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 908 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
885 $hb->add (new CFClient::UI::Button 909 $hb->add (new CFClient::UI::Button
886 text => "Ok", 910 text => "Ok",
887 expand => 1, 911 expand => 1,
888 connect_activate => sub { $QUIT_DIALOG->hide }, 912 on_activate => sub { $QUIT_DIALOG->hide },
889 ); 913 );
890 $hb->add (new CFClient::UI::Button 914 $hb->add (new CFClient::UI::Button
891 text => "Quit anyway", 915 text => "Quit anyway",
892 expand => 1, 916 expand => 1,
893 connect_activate => sub { exit }, 917 on_activate => sub { exit },
894 ); 918 );
919 }
895 920
896 $QUIT_DIALOG->show_centered; 921 $QUIT_DIALOG->show;
897 } else {
898 $QUIT_DIALOG->show_centered;
899 }
900} 922}
901 923
902sub make_inventory_window { 924sub make_inventory_window {
903 my $invwin = new CFClient::UI::FancyFrame 925 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
904 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 926 x => "center",
927 y => "center",
928 force_w => $WIDTH * 9/10,
929 force_h => $HEIGHT * 9/10,
930 title => "Inventory",
931 name => "inventory_window",
932 ;
905 933
906 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 934 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
907 935
908 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 936 $hb->add (my $vb1 = new CFClient::UI::VBox);
909 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 937 $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); 938 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
912 939
913 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
914 $vb2->add (my $hb2 = new CFClient::UI::HBox); 940 $hb->add (my $vb2 = new CFClient::UI::VBox);
915 $hb2->add (new CFClient::UI::Button
916 text => "Close",
917 tooltip => "Close the currently open container (if one is open)",
918 connect_activate => sub {
919 $CONN->send ("apply $CONN->{open_container}")
920 if $CONN->{open_container} != 0;
921 },
922 );
923 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
924 941
925 $INVR_LBL->set_text ("Floor"); 942 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
943
926 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 944 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
927 945
946 # XXX: Call after $INVR = ... because set_opencont sets the items
947 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
948
928 $invwin 949 $invwin
950}
951
952sub make_binding_window {
953 my $binding_list = new CFClient::UI::VBox;
954
955 my $refresh = sub {
956 $binding_list->clear ();
957
958 for my $mod (keys %{$::CFG->{bindings}}) {
959 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
960 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
961 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
962
963 my $lbl = join "; ", @$cmds;
964 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
965 $binding_list->add (my $hb = new CFClient::UI::HBox);
966 $hb->add (new CFClient::UI::Button
967 text => "delete",
968 on_activate => sub {
969 $binding_list->remove ($hb);
970 delete $::CFG->{bindings}->{$mod}->{$sym};
971 });
972 $hb->add (new CFClient::UI::Label text => "($nam)");
973 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
974 }
975 }
976 };
977
978 $BIND_WINDOW = new CFClient::UI::FancyFrame
979 title => "Bindings",
980 x => "center",
981 y => "center",
982 def_w => int $WIDTH * 9/10,
983 def_h => int $HEIGHT * 9/10,
984 on_visibility_change => sub {
985 my ($self, $visible) = @_;
986 $refresh->() if $visible;
987 };
988
989 $BIND_WINDOW->add ($binding_list);
990 $refresh->();
991 $BIND_WINDOW
929} 992}
930 993
931sub make_help_window { 994sub make_help_window {
932 my $win = new CFClient::UI::FancyFrame 995 my $win = new CFClient::UI::FancyFrame
933 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 996 def_w => int $WIDTH * 7/8,
997 def_h => int $HEIGHT * 7/8,
998 title => "Documentation";
934 999
935 $win->add (my $vbox = new CFClient::UI::VBox); 1000 $win->add (my $vbox = new CFClient::UI::VBox);
936 1001
937 $vbox->add (my $buttons = new CFClient::UI::HBox); 1002 $vbox->add (my $buttons = new CFClient::UI::HBox);
938 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1003 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
945 ) { 1010 ) {
946 my ($pod, $label) = @$_; 1011 my ($pod, $label) = @$_;
947 1012
948 $buttons->add (new CFClient::UI::Button 1013 $buttons->add (new CFClient::UI::Button
949 text => $label, 1014 text => $label,
950 connect_activate => sub { 1015 on_activate => sub {
951 my $parser = new Pod::POM; 1016 my $parser = new Pod::POM;
952 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1017 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
953 1018
954 $viewer->clear; 1019 $viewer->clear;
955 1020
… …
999 if ($DEBUG_STATUS) { 1064 if ($DEBUG_STATUS) {
1000 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1065 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1001 } else { 1066 } else {
1002 # create the widgets 1067 # create the widgets
1003 1068
1004 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1069 $DEBUG_STATUS = new CFClient::UI::Label
1070 padding => 0,
1071 z => 100,
1072 force_x => "max",
1073 force_y => 0;
1005 $DEBUG_STATUS->show; 1074 $DEBUG_STATUS->show;
1006 1075
1007 $STATUSBOX = new CFClient::UI::Statusbox; 1076 $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]); 1077 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1009 1078
1010 (new CFClient::UI::Frame 1079 (new CFClient::UI::Frame
1011 bg => [0, 0, 0, 0.4], 1080 bg => [0, 0, 0, 0.4],
1012 req_y => -1, 1081 force_x => 0,
1082 force_y => "max",
1013 child => $STATUSBOX, 1083 child => $STATUSBOX,
1014 )->show; 1084 )->show;
1015 1085
1016 CFClient::UI::FancyFrame->new ( 1086 CFClient::UI::FancyFrame->new (
1087 x => 0,
1088 y => $FONTSIZE + 8,
1017 border_bg => [1, 1, 1, 192/255], 1089 border_bg => [1, 1, 1, 192/255],
1018 bg => [1, 1, 1, 0], 1090 bg => [1, 1, 1, 0],
1019 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1091 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.", 1092 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1021 ), 1093 ),
… …
1044 can_hover => 1, 1116 can_hover => 1,
1045 can_events => 1, 1117 can_events => 1,
1046 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1118 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1047 ; 1119 ;
1048 1120
1049 $BUTTONBAR = new CFClient::UI::HBox; 1121 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1050 1122
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1123 $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."); 1124 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, 1125 $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."); 1126 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1063 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1135 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1064 1136
1065 $BUTTONBAR->add (new CFClient::UI::Button 1137 $BUTTONBAR->add (new CFClient::UI::Button
1066 text => "Save Config", 1138 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.", 1139 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 { 1140 on_activate => sub {
1141 $::CFG->{layout} = CFClient::UI::get_layout;
1069 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1142 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1070 status "Configuration Saved"; 1143 status "Configuration Saved";
1071 }, 1144 },
1072 ); 1145 );
1073 1146
1074 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1147 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1075 tooltip => "View Documentation"); 1148 tooltip => "View Documentation");
1076 1149
1150 $BUTTONBAR->add (new CFClient::UI::Flopper
1151 text => "Bindings",
1152 other => make_binding_window,
1153 tooltip => "Lets you delete bindings you have made with the recorder"
1154 );
1155 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1156 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1157
1077 $BUTTONBAR->add (new CFClient::UI::Button 1158 $BUTTONBAR->add (new CFClient::UI::Button
1078 text => "Quit", 1159 text => "Quit",
1079 tooltip => "Terminates the program", 1160 tooltip => "Terminates the program",
1080 connect_activate => sub { 1161 on_activate => sub {
1081 if ($CONN) { 1162 if ($CONN) {
1082 open_quit_dialog; 1163 open_quit_dialog;
1083 } else { 1164 } else {
1084 exit; 1165 exit;
1085 } 1166 }
1086 }, 1167 },
1087 ); 1168 );
1088 1169
1089 $BUTTONBAR->show; 1170 $BUTTONBAR->show;
1171 $SERVER_SETUP->show;
1090 1172
1091 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1173 $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 } 1174 }
1101} 1175}
1102 1176
1103sub video_shutdown { 1177sub video_shutdown {
1104 undef $SDL_ACTIVE; 1178 undef $SDL_ACTIVE;
… …
1172 1246
1173my %demo;#d# 1247my %demo;#d#
1174 1248
1175sub force_refresh { 1249sub force_refresh {
1176 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1250 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1177 debug sprintf "%3.2f", $fps; 1251 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1178 1252
1179 $CFClient::UI::ROOT->draw; 1253 $CFClient::UI::ROOT->draw;
1180 1254
1181 $WANT_REFRESH = 0; 1255 $WANT_REFRESH = 0;
1182 $CAN_REFRESH = 0; 1256 $CAN_REFRESH = 0;
… …
1314############################################################################# 1388#############################################################################
1315 1389
1316$SIG{INT} = $SIG{TERM} = sub { exit }; 1390$SIG{INT} = $SIG{TERM} = sub { exit };
1317 1391
1318{ 1392{
1319 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1393 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1320 1394
1321 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1395 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1396 CFClient::UI::set_layout ($::CFG->{layout});
1322 1397
1323 my %DEF_CFG = ( 1398 my %DEF_CFG = (
1324 sdl_mode => 0, 1399 sdl_mode => 0,
1325 width => 640, 1400 width => 640,
1326 height => 480, 1401 height => 480,
… …
1403 1478
1404END { CFClient::SDL_Quit } 1479END { CFClient::SDL_Quit }
1405 1480
1406=head1 NAME 1481=head1 NAME
1407 1482
1408pclient - A Crossfire+ and Crossfire game client 1483cfplus - A Crossfire+ and Crossfire game client
1409 1484
1410=head1 SYNOPSIS 1485=head1 SYNOPSIS
1411 1486
1412Just run it - no commandline arguments are supported. 1487Just run it - no commandline arguments are supported.
1413 1488
1414=head1 USAGE 1489=head1 USAGE
1415 1490
1416Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1491cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1417fullscreen and interactively. 1492fullscreen and interactively.
1418 1493
1419=head1 AUTHOR 1494=head1 AUTHOR
1420 1495
1421Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1496Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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