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

Diff Legend

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