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.40 by root, Fri Jun 2 02:12:04 2006 UTC

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

Diff Legend

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