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

Diff Legend

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