[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC

…		…
36		36
37	use CFClient;	37	use CFClient;
38	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
39	use CFClient::Protocol;	39	use CFClient::Protocol;
40	use CFClient::UI;	40	use CFClient::UI;
		41	use CFClient::BindingEditor;
41	use CFClient::MapWidget;	42	use CFClient::MapWidget;
42		43
43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	44	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44		45
45	$Event::DIED = sub {	46	$Event::DIED = sub {
…		…
84	our $CONSOLE;	85	our $CONSOLE;
85	our $METASERVER;	86	our $METASERVER;
86	our $LOGIN_BUTTON;	87	our $LOGIN_BUTTON;
87	our $QUIT_DIALOG;	88	our $QUIT_DIALOG;
88	our $HOST_ENTRY;	89	our $HOST_ENTRY;
		90	our $SERVER_INFO;
89		91
90	our $SETUP_DIALOG;	92	our $SETUP_DIALOG;
91	our $SETUP_NOTEBOOK;	93	our $SETUP_NOTEBOOK;
92	our $SETUP_SERVER;	94	our $SETUP_SERVER;
93	our $SETUP_KEYBOARD;	95	our $SETUP_KEYBOARD;
…		…
108		110
109	our $ALT_ENTER_MESSAGE;	111	our $ALT_ENTER_MESSAGE;
110	our $STATUSBOX;	112	our $STATUSBOX;
111	our $DEBUG_STATUS;	113	our $DEBUG_STATUS;
112		114
113	our $INV_WINDOW;
114	our $INV;	115	our $INV;
115	our $INVR;	116	our $INVR;
116	our $INV_RIGHT_HB;	117	our $INV_RIGHT_HB;
117		118
		119	our $PL_NOTEBOOK;
		120	our $PL_WINDOW;
		121
118	our $BIND_EDITOR;	122	our $BIND_EDITOR;
		123	our $BIND_UPD_CB;
119		124
120	our $PICKUP_CFG;	125	our $PICKUP_CFG;
121		126
122	sub status {	127	sub status {
123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	128	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
…		…
154	$hbox->add (new CFClient::UI::Button	159	$hbox->add (new CFClient::UI::Button
155	text => "No",	160	text => "No",
156	on_activate => sub {	161	on_activate => sub {
157	$conn->send ("reply n");	162	$conn->send ("reply n");
158	$dialog->destroy;	163	$dialog->destroy;
		164	0
159	}	165	}
160	);	166	);
161	$hbox->add (new CFClient::UI::Button	167	$hbox->add (new CFClient::UI::Button
162	text => "Yes",	168	text => "Yes",
163	on_activate => sub {	169	on_activate => sub {
164	$conn->send ("reply y");	170	$conn->send ("reply y");
165	destroy_query_dialog $conn;	171	destroy_query_dialog $conn;
		172	0
166	},	173	},
167	);	174	);
168		175
169	$dialog->focus_in;	176	$dialog->grab_focus;
170		177
171	} elsif ($flags & CS_QUERY_SINGLECHAR) {	178	} elsif ($flags & CS_QUERY_SINGLECHAR) {
172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	179	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173		180
174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {	181	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
…		…
184	$table->add (0, 0, new CFClient::UI::Button	191	$table->add (0, 0, new CFClient::UI::Button
185	text => "Next Race",	192	text => "Next Race",
186	on_activate => sub {	193	on_activate => sub {
187	$conn->send ("reply n");	194	$conn->send ("reply n");
188	destroy_query_dialog $conn;	195	destroy_query_dialog $conn;
		196	0
189	},	197	},
190	);	198	);
191	$table->add (2, 0, new CFClient::UI::Button	199	$table->add (2, 0, new CFClient::UI::Button
192	text => "Accept",	200	text => "Accept",
193	on_activate => sub {	201	on_activate => sub {
194	$conn->send ("reply d");	202	$conn->send ("reply d");
195	destroy_query_dialog $conn;	203	destroy_query_dialog $conn;
		204	0
196	},	205	},
197	);	206	);
198		207
199	unshift @dialog, new CFClient::UI::Label	208	unshift @dialog, new CFClient::UI::Label
200	max_w => $::WIDTH * 0.4,	209	max_w => $::WIDTH * 0.4,
…		…
230	$table->add (0, 0, new CFClient::UI::Button	239	$table->add (0, 0, new CFClient::UI::Button
231	text => "Roll Again",	240	text => "Roll Again",
232	on_activate => sub {	241	on_activate => sub {
233	$conn->send ("reply y");	242	$conn->send ("reply y");
234	destroy_query_dialog $conn;	243	destroy_query_dialog $conn;
		244	0
235	},	245	},
236	);	246	);
237		247
238	# center: swap stats	248	# center: swap stats
239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	249	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240	value => $_,	250	value => $_,
241	options => [	251	options => [
242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],	252	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	253	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],	254	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],	255	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],	256	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],	257	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	258	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249	],	259	],
250	), 1 .. 2;	260	), 1 .. 2;
251		261
252	$table->add (2, 0, new CFClient::UI::Button	262	$table->add (2, 0, new CFClient::UI::Button
253	text => "Swap Stats",	263	text => "Swap Stats",
254	on_activate => sub {	264	on_activate => sub {
255	$conn->{stat_change_with} = $sw2->{value};	265	$conn->{stat_change_with} = $sw2->{value};
256	$conn->send ("reply $sw1->{value}");	266	$conn->send ("reply $sw1->{value}");
257	destroy_query_dialog $conn;	267	destroy_query_dialog $conn;
		268	0
258	},	269	},
259	);	270	);
260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	271	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261		272
262	# right: accept	273	# right: accept
…		…
264	text => "Accept",	275	text => "Accept",
265	on_activate => sub {	276	on_activate => sub {
266	$conn->send ("reply n");	277	$conn->send ("reply n");
267	$STATS_WINDOW->hide;	278	$STATS_WINDOW->hide;
268	destroy_query_dialog $conn;	279	destroy_query_dialog $conn;
		280	0
269	},	281	},
270	);	282	);
271		283
272	unshift @dialog, new CFClient::UI::Label	284	unshift @dialog, new CFClient::UI::Label
273	max_w => $::WIDTH * 0.4,	285	max_w => $::WIDTH * 0.4,
…		…
283		295
284	push @dialog, my $entry = new CFClient::UI::Entry	296	push @dialog, my $entry = new CFClient::UI::Entry
285	on_changed => sub {	297	on_changed => sub {
286	$conn->send ("reply $_[1]");	298	$conn->send ("reply $_[1]");
287	destroy_query_dialog $conn;	299	destroy_query_dialog $conn;
		300	0
288	},	301	},
289	;	302	;
290		303
291	$entry->focus_in;	304	$entry->grab_focus;
292		305
293	} else {	306	} else {
294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	307	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295		308
296	push @dialog, my $entry = new CFClient::UI::Entry	309	push @dialog, my $entry = new CFClient::UI::Entry
297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	310	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298	on_activate => sub {	311	on_activate => sub {
299	$conn->send ("reply $_[1]");	312	$conn->send ("reply $_[1]");
300	destroy_query_dialog $conn;	313	destroy_query_dialog $conn;
		314	0
301	},	315	},
302	;	316	;
303		317
304	$entry->focus_in;	318	$entry->grab_focus;
305	}	319	}
306		320
307	$vbox->add (@dialog);	321	$vbox->add (@dialog);
308	$dialog->show;	322	$dialog->show;
309	}	323	}
…		…
314	$LOGIN_BUTTON->set_text ("Logout");	328	$LOGIN_BUTTON->set_text ("Logout");
315	$SETUP_DIALOG->hide;	329	$SETUP_DIALOG->hide;
316		330
317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	331	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318		332
319	my ($host, $port) = split /:/, $CFG->{host};	333	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320		334
321	$MAP = new CFClient::Map $mapsize, $mapsize;	335	$MAP = new CFClient::Map $mapsize, $mapsize;
322		336
323	$CONN = eval {	337	$CONN = eval {
324	new CFClient::Protocol	338	new CFClient::Protocol
325	host => $host,	339	host => $host,
326	port => $port \|\| 13327,	340	port => $port \|\| 13327,
327	user => $CFG->{user},	341	user => $CFG->{profile}{default}{user},
328	pass => $CFG->{password},	342	pass => $CFG->{profile}{default}{password},
329	mapw => $mapsize,	343	mapw => $mapsize,
330	maph => $mapsize,	344	maph => $mapsize,
331		345
332	map_widget => $MAPWIDGET,	346	map_widget => $MAPWIDGET,
333	logview => $LOGVIEW,	347	logview => $LOGVIEW,
…		…
361		375
362	sub stop_game {	376	sub stop_game {
363	$LOGIN_BUTTON->set_text ("Login");	377	$LOGIN_BUTTON->set_text ("Login");
364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	378	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365	$SETUP_DIALOG->show;	379	$SETUP_DIALOG->show;
366	$INV_WINDOW->hide;	380	$PL_WINDOW->hide;
		381	$SETUP_SPELLS->clear_spells;
367		382
368	return unless $CONN;	383	return unless $CONN;
369		384
370	status "connection closed";	385	status "connection closed";
371		386
372	destroy_query_dialog $CONN;	387	destroy_query_dialog $CONN;
373	$CONN->destroy;	388	$CONN->destroy;
374	$CONN = 0; # false, does not autovivify	389	$CONN = 0; # false, does not autovivify
		390
		391	undef $MAP;
375	}	392	}
376		393
377	sub graphics_setup {	394	sub graphics_setup {
378	my $vbox = new CFClient::UI::VBox;	395	my $vbox = new CFClient::UI::VBox;
379		396
…		…
397		414
398	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	415	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399	$table->add (1, $row++, new CFClient::UI::CheckBox	416	$table->add (1, $row++, new CFClient::UI::CheckBox
400	state => $CFG->{fullscreen},	417	state => $CFG->{fullscreen},
401	tooltip => "Bring the client into fullscreen mode.",	418	tooltip => "Bring the client into fullscreen mode.",
402	on_changed => sub {	419	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403	my ($self, $value) = @_;
404	$CFG->{fullscreen} = $value;
405	}
406	);	420	);
407		421
408	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	422	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409	$table->add (1, $row++, new CFClient::UI::CheckBox	423	$table->add (1, $row++, new CFClient::UI::CheckBox
410	state => $CFG->{fast},	424	state => $CFG->{fast},
411	tooltip => "Lower the visual quality considerably to speed up rendering.",	425	tooltip => "Lower the visual quality considerably to speed up rendering.",
412	on_changed => sub {	426	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413	my ($self, $value) = @_;
414	$CFG->{fast} = $value;
415	}
416	);	427	);
417		428
418	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	429	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419	$table->add (1, $row++, new CFClient::UI::Slider	430	$table->add (1, $row++, new CFClient::UI::Slider
420	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	431	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	432	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422	on_changed => sub {	433	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423	my ($self, $value) = @_;
424	$CFG->{map_scale} = 2 ** $value;
425	}
426	);	434	);
427		435
428	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	436	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429	$table->add (1, $row++, new CFClient::UI::CheckBox	437	$table->add (1, $row++, new CFClient::UI::CheckBox
430	state => $CFG->{fow_enable},	438	state => $CFG->{fow_enable},
431	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	439	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432	on_changed => sub {	440	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433	my ($self, $value) = @_;
434	$CFG->{fow_enable} = $value;
435	}
436	);	441	);
437		442
438	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	443	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439	$table->add (1, $row++, new CFClient::UI::Slider	444	$table->add (1, $row++, new CFClient::UI::Slider
440	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	445	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	446	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442	on_changed => sub {	447	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443	my ($self, $value) = @_;
444	$CFG->{fow_intensity} = $value;
445	}
446	);	448	);
447		449
448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	450	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449	$table->add (1, $row++, new CFClient::UI::CheckBox	451	$table->add (1, $row++, new CFClient::UI::CheckBox
450	state => $CFG->{fow_smooth},	452	state => $CFG->{fow_smooth},
451	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	453	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452	on_changed => sub {	454	on_changed => sub {
453	my ($self, $value) = @_;	455	my ($self, $value) = @_;
454	$CFG->{fow_smooth} = $value;	456	$CFG->{fow_smooth} = $value;
455	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	457	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		458	0
456	}	459	}
457	);	460	);
458		461
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	462	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460	$table->add (1, $row++, new CFClient::UI::Slider	463	$table->add (1, $row++, new CFClient::UI::Slider
461	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	464	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	465	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	466	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464	);	467	);
465		468
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	469	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467	$table->add (1, $row++, new CFClient::UI::Slider	470	$table->add (1, $row++, new CFClient::UI::Slider
468	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	471	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	472	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	473	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471	);	474	);
472		475
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	476	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474		477
475	$table->add (1, $row++, new CFClient::UI::Slider	478	$table->add (1, $row++, new CFClient::UI::Slider
476	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	479	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	480	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478	on_changed => sub {	481	on_changed => sub {
479	$CFG->{stat_fontsize} = $_[1];	482	$CFG->{stat_fontsize} = $_[1];
480	&set_stats_window_fontsize;	483	&set_stats_window_fontsize;
		484	0
481	}	485	}
482	);	486	);
483		487
484	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	488	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485	$table->add (1, $row++, new CFClient::UI::Slider	489	$table->add (1, $row++, new CFClient::UI::Slider
486	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	490	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	491	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488	on_changed => sub {	492	on_changed => sub {
489	$CFG->{gauge_fontsize} = $_[1];	493	$CFG->{gauge_fontsize} = $_[1];
490	&set_gauge_window_fontsize;	494	&set_gauge_window_fontsize;
		495	0
491	}	496	}
492	);	497	);
493		498
494	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495	$table->add (1, $row++, new CFClient::UI::Slider	500	$table->add (1, $row++, new CFClient::UI::Slider
496	range => [$CFG->{gauge_size}, 0.2, 0.8],	501	range => [$CFG->{gauge_size}, 0.2, 0.8],
497	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	502	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498	on_changed => sub {	503	on_changed => sub {
499	$CFG->{gauge_size} = $_[1];	504	$CFG->{gauge_size} = $_[1];
500	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	505	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		506	0
501	}	507	}
502	);	508	);
503		509
504	$table->add (1, $row++, new CFClient::UI::Button	510	$table->add (1, $row++, new CFClient::UI::Button
505	expand => 1, align => 0, text => "Apply",	511	expand => 1, align => 0, text => "Apply",
506	tooltip => "Apply the video settings",	512	tooltip => "Apply the video settings",
507	on_activate => sub {	513	on_activate => sub {
508	video_shutdown ();	514	video_shutdown ();
509	video_init ();	515	video_init ();
		516	0
510	}	517	}
511	);	518	);
512		519
513	$vbox	520	$vbox
514	}	521	}
…		…
522		529
523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	530	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524	$table->add (1, $row++, new CFClient::UI::CheckBox	531	$table->add (1, $row++, new CFClient::UI::CheckBox
525	state => $CFG->{audio_enable},	532	state => $CFG->{audio_enable},
526	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.",	533	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.",
527	on_changed => sub {	534	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528	$CFG->{audio_enable} = $_[1];
529	}
530	);	535	);
531	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	536	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	537	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533	# $CFG->{effects_volume} = $_[1];	538	# $CFG->{effects_volume} = $_[1];
534	# });	539	# });
535	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	540	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	541	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537	$hbox->add (new CFClient::UI::CheckBox	542	$hbox->add (new CFClient::UI::CheckBox
538	expand => 1, state => $CFG->{bgm_enable},	543	expand => 1, state => $CFG->{bgm_enable},
539	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	544	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540	on_changed => sub {	545	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541	$CFG->{bgm_enable} = $_[1];
542	}
543	);	546	);
544	$hbox->add (new CFClient::UI::Slider	547	$hbox->add (new CFClient::UI::Slider
545	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	548	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546	tooltip => "The volume of the background music. Changes are instant.",	549	tooltip => "The volume of the background music. Changes are instant.",
547	on_changed => sub {	550	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548	$CFG->{bgm_volume} = $_[1];
549	CFClient::MixMusic::volume $_[1] * 128;
550	}
551	);	551	);
552		552
553	$table->add (1, $row++, new CFClient::UI::Button	553	$table->add (1, $row++, new CFClient::UI::Button
554	expand => 1, align => 0, text => "Apply",	554	expand => 1, align => 0, text => "Apply",
555	tooltip => "Apply the audio settings",	555	tooltip => "Apply the audio settings",
556	on_activate => sub {	556	on_activate => sub {
557	audio_shutdown ();	557	audio_shutdown ();
558	audio_init ();	558	audio_init ();
		559	0
559	}	560	}
560	);	561	);
561		562
562	$vbox	563	$vbox
563	}	564	}
…		…
625	&set_gauge_window_fontsize;	626	&set_gauge_window_fontsize;
626		627
627	$win	628	$win
628	}	629	}
629		630
		631	sub debug_setup {
		632	my $table = new CFClient::UI::Table;
		633
		634	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		635	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		636	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		637	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		638	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		639	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		640	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		641	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		642
		643	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		644
		645	for my $x (0..2) {
		646	for my $y (0 .. 2) {
		647	$table->add ($x + 3, $y,
		648	new CFClient::UI::Entry
		649	text => $default_smooth[$x * 3 + $y],
		650	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		651	);
		652	}
		653	}
		654
		655
		656	$table
		657	}
630		658
631	sub stats_window {	659	sub stats_window {
632	my $tgw = new CFClient::UI::FancyFrame	660	my $tgw =
633	y => $HEIGHT * (2/8),	661	new CFClient::UI::Window
634	x => "max",	662	child => my $vb = new CFClient::UI::VBox;
635	title => "Stats",
636	name => "stats_window";
637		663
638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	664	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640	can_hover => 1, can_events => 1,	665	can_hover => 1, can_events => 1,
641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	666	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
642	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	667	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
643	can_hover => 1, can_events => 1,	668	can_hover => 1, can_events => 1,
…		…
667	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	692	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
668		693
669	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	694	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
670	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	695	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
671	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	696	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
672	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],	697	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
673	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	698	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
674	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	699	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
675	) {	700	) {
676	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	701	my ($col, $row, $id, $label, $template, $tooltip) = @$_;
677		702
…		…
696	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	721	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
697	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	722	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
698	pois => "<b>Poison</b> (resistance to getting poisoned)",	723	pois => "<b>Poison</b> (resistance to getting poisoned)",
699	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	724	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
700	deat => "<b>Death</b> (resistance against death spells)",	725	deat => "<b>Death</b> (resistance against death spells)",
701	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	726	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
702	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	727	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
703	fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",	728	fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
704	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	729	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
705	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	730	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
706	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	731	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
…		…
723	);	748	);
724	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	749	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
725	font => $FONT_FIXED,	750	font => $FONT_FIXED,
726	can_hover => 1,	751	can_hover => 1,
727	can_events => 1,	752	can_events => 1,
728	image => "ui/resist/resist_$_.png",	753	path => "ui/resist/resist_$_.png",
729	tooltip => $resist_names{$_},	754	tooltip => $resist_names{$_},
730	);	755	);
731		756
732	$row++;	757	$row++;
733	if ($row % 6 == 0) {	758	if ($row % 6 == 0) {
…		…
781	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});	806	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
782	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});	807	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
783	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});	808	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
784	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});	809	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
785	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});	810	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
786	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});	811	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
787	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	812	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	813	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789		814
790	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);	815	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791		816
792	# TODO: replace by CS_STAT_RES_xxx constants
793	my %tbl = (	817	my %tbl = (
794	phys => 100,	818	phys => CS_STAT_RES_PHYS,
795	magic => 101,	819	magic => CS_STAT_RES_MAG,
796	fire => 102,	820	fire => CS_STAT_RES_FIRE,
797	elec => 103,	821	elec => CS_STAT_RES_ELEC,
798	cold => 104,	822	cold => CS_STAT_RES_COLD,
799	conf => 105,	823	conf => CS_STAT_RES_CONF,
800	acid => 106,	824	acid => CS_STAT_RES_ACID,
801	drain => 107,	825	drain => CS_STAT_RES_DRAIN,
802	ghit => 108,	826	ghit => CS_STAT_RES_GHOSTHIT,
803	pois => 109,	827	pois => CS_STAT_RES_POISON,
804	slow => 110,	828	slow => CS_STAT_RES_SLOW,
805	para => 111,	829	para => CS_STAT_RES_PARA,
806	tund => 112,	830	tund => CS_STAT_TURN_UNDEAD,
807	fear => 113,	831	fear => CS_STAT_RES_FEAR,
808	depl => 113,	832	depl => CS_STAT_RES_DEPLETE,
809	deat => 115,	833	deat => CS_STAT_RES_DEATH,
810	holyw => 116,	834	holyw => CS_STAT_RES_HOLYWORD,
811	blind => 117,	835	blind => CS_STAT_RES_BLIND,
812	);	836	);
813		837
814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	838	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815	for keys %tbl;	839	for keys %tbl;
816	}	840	}
817		841
818	my $METASERVER_ATIME;	842	my $METASERVER_ATIME;
819		843
820	sub update_metaserver {	844	sub update_metaserver {
		845	my ($metaserver_dialog) = @_;
		846
		847	$METASERVER = $metaserver_dialog
		848	if defined $metaserver_dialog;
		849
821	return if $METASERVER_ATIME > time;	850	return if $METASERVER_ATIME > time;
822	$METASERVER_ATIME = time + 60;	851	$METASERVER_ATIME = time + 60;
823		852
824	my $table = $METASERVER->{table};	853	my $table = $METASERVER->{table};
825	$table->clear;	854	$table->clear;
…		…
846		875
847	utf8::decode $buf if utf8::valid $buf;	876	utf8::decode $buf if utf8::valid $buf;
848		877
849	$table->clear;	878	$table->clear;
850		879
		880	my @tip = (
		881	"The current number of users logged in on the server.",
		882	"The hostname of the server.",
		883	"The time this server has been running without being restarted.",
		884	"The server software version - a '+' indicates a Crossfire+ server.",
		885	"Short information about this server provided by its admins.",
		886	);
851	my @col = qw(Use #Users Host Uptime Version Description);	887	my @col = qw(#Users Host Uptime Version Description);
852	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	888	$table->add ($_, 0, new CFClient::UI::Label
		889	can_hover => 1, can_events => 1,
		890	align => 0, fg => [1, 1, 0],
		891	text => $col[$_], tooltip => $tip[$_])
853	for 0 .. $#col;	892	for 0 .. $#col;
854		893
855	my @align = qw(1 0 1 1 -1);	894	my @align = qw(1 0 1 1 -1);
856		895
857	my $y = 0;	896	my $y = 0;
858	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	897	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
875		914
876	$m = [$users, $host, $uptime, $version, $desc];	915	$m = [$users, $host, $uptime, $version, $desc];
877		916
878	$y++;	917	$y++;
879		918
880	$table->add (0, $y, new CFClient::UI::VBox children => [	919	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
881	(new CFClient::UI::Button text => "Use", on_activate => sub {	920	(new CFClient::UI::Button
		921	text => "Use",
		922	tooltip => "Put this server into the <b>Host:Port</b> field",
		923	on_activate => sub {
882	$HOST_ENTRY->set_text ($CFG->{host} = $host);	924	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883	$METASERVER->toggle_visibility;	925	$METASERVER->hide;
		926	0
		927	},
884	}),	928	),
885	(new CFClient::UI::Empty expand => 1),	929	(new CFClient::UI::Empty expand => 1),
886	]);	930	]);
887		931
888	$table->add ($_ + 1, $y, new CFClient::UI::Label	932	$table->add ($_, $y, new CFClient::UI::Label
889	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	933	ellipsise => 0,
		934	align => $align[$_],
		935	text => $m->[$_],
		936	tooltip => $tip[$_],
		937	can_hover => 1,
		938	can_events => 1,
		939	fontsize => 0.8)
890	for 0 .. $#$m;	940	for 0 .. $#$m;
891	}	941	}
892	}	942	}
893	});	943	});
894	}	944	}
895		945
896	sub metaserver_dialog {	946	sub metaserver_dialog {
		947	my $vbox = new CFClient::UI::VBox;
		948	my $table = new CFClient::UI::Table;
		949	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
		950
897	my $dialog = new CFClient::UI::FancyFrame	951	my $dialog = new CFClient::UI::FancyFrame
898	title => "Server List",	952	title => "Server List",
899	name => 'metaserver_dialog',	953	name => 'metaserver_dialog',
900	x => 'center',	954	x => 'center',
901	y => 'center',	955	y => 'center',
902	z => 3,	956	z => 3,
903	child => (my $vbox = new CFClient::UI::VBox),	957	force_h => $::HEIGHT * 0.4,
		958	child => $vbox,
		959	has_close_button => 1,
		960	table => $table,
904	on_visibility_change => sub {	961	on_visibility_change => sub {
905	update_metaserver if $_[1];	962	update_metaserver ($_[0]) if $_[1];
		963	0
906	},	964	},
907	;	965	;
908
909	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
910		966
911	$dialog	967	$dialog
912	}	968	}
913		969
914	sub server_setup {	970	sub server_setup {
…		…
921	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	977	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
922		978
923	$vbox->add (	979	$vbox->add (
924	$HOST_ENTRY = new CFClient::UI::Entry	980	$HOST_ENTRY = new CFClient::UI::Entry
925	expand => 1,	981	expand => 1,
926	text => $CFG->{host},	982	text => $CFG->{profile}{default}{host},
927	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	983	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
928	on_changed => sub {	984	on_changed => sub {
929	my ($self, $value) = @_;	985	my ($self, $value) = @_;
930	$CFG->{host} = $value;	986	$CFG->{profile}{default}{host} = $value;
		987	0
931	}	988	}
932	);	989	);
933
934	$METASERVER = metaserver_dialog;
935		990
936	$vbox->add (new CFClient::UI::Button	991	$vbox->add (new CFClient::UI::Button
937	expand => 1,	992	expand => 1,
938	text => "Server List",	993	text => "Server List",
939	other => $METASERVER,	994	other => $METASERVER,
940	tooltip => "Show a list of available crossfire servers",	995	tooltip => "Show a list of available crossfire servers",
941	on_activate => sub { $METASERVER->toggle_visibility },	996	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		997	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942	);	998	);
943	}	999	}
944		1000
945	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1001	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
946	$table->add (1, 4, new CFClient::UI::Entry	1002	$table->add (1, 4, new CFClient::UI::Entry
947	text => $CFG->{user},	1003	text => $CFG->{profile}{default}{user},
948	tooltip => "The name of your character on the server",	1004	tooltip => "The name of your character on the server",
949	on_changed => sub {	1005	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950	my ($self, $value) = @_;
951	$CFG->{user} = $value;
952	}
953	);	1006	);
954		1007
955	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1008	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
956	$table->add (1, 5, new CFClient::UI::Entry	1009	$table->add (1, 5, new CFClient::UI::Entry
957	text => $CFG->{password},	1010	text => $CFG->{profile}{default}{password},
958	hidden => 1,	1011	hidden => 1,
959	tooltip => "The password for your character",	1012	tooltip => "The password for your character",
960	on_changed => sub {	1013	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961	my ($self, $value) = @_;
962	$CFG->{password} = $value;
963	}
964	);	1014	);
965		1015
966	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1016	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
967	$table->add (1, 7, new CFClient::UI::Slider	1017	$table->add (1, 7, new CFClient::UI::Slider
968	force_w => 100,	1018	force_w => 100,
969	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1019	range => [$CFG->{mapsize}, 10, 100, 0, 1],
970	tooltip => "This is the size of the portion of the map update the server sends you. "	1020	tooltip => "This is the size of the portion of the map update the server sends you. "
971	. "If you set this to a high value you will be able to see further, "	1021	. "If you set this to a high value you will be able to see further, "
972	. "but you also increase bandwidth requirements and latency. "	1022	. "but you also increase bandwidth requirements and latency. "
973	. "This option is only used once at log-in.",	1023	. "This option is only used once at log-in.",
974	on_changed => sub {	1024	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975	my ($self, $value) = @_;
976
977	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978	},
979	);	1025	);
980		1026
981	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1027	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
982	$table->add (1, 8, new CFClient::UI::CheckBox	1028	$table->add (1, 8, new CFClient::UI::CheckBox
983	state => $CFG->{face_prefetch},	1029	state => $CFG->{face_prefetch},
…		…
986	. "This might increase or create lag, but increases the chances "	1032	. "This might increase or create lag, but increases the chances "
987	. "of faces being ready for display when you encounter them. "	1033	. "of faces being ready for display when you encounter them. "
988	. "It also uses up server bandwidth on every connect, "	1034	. "It also uses up server bandwidth on every connect, "
989	. "so only set it if you really need to prefetch images. "	1035	. "so only set it if you really need to prefetch images. "
990	. "This option can be set and unset any time.",	1036	. "This option can be set and unset any time.",
991	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1037	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992	);	1038	);
993		1039
994	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1040	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
995	$table->add (1, 9, new CFClient::UI::Entry	1041	$table->add (1, 9, new CFClient::UI::Entry
996	text => $CFG->{output_count},	1042	text => $CFG->{output_count},
997	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1043	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
998	on_changed => sub { $CFG->{output_count} = $_[1] },	1044	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999	);	1045	);
1000		1046
1001	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1047	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1002	$table->add (1, 10, new CFClient::UI::Entry	1048	$table->add (1, 10, new CFClient::UI::Entry
1003	text => $CFG->{output_sync},	1049	text => $CFG->{output_sync},
1004	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1050	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1005	on_changed => sub { $CFG->{output_sync} = $_[1] },	1051	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006	);	1052	);
1007		1053
1008	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1054	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1009	expand => 1,	1055	expand => 1,
1010	align => 0,	1056	align => 0,
1011	text => "Login",	1057	text => "Login",
1012	on_activate => sub {	1058	on_activate => sub {
1013	$CONN ? stop_game	1059	$CONN ? stop_game
1014	: start_game;	1060	: start_game;
		1061	0
1015	},	1062	},
1016	);	1063	);
1017		1064
1018	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1065	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1066	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
1022	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1069	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1070	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024	on_changed => sub {	1071	on_changed => sub {
1025	my ($self, $value) = @_;	1072	my ($self, $value) = @_;
1026	$CFG->{say_command} = $value;	1073	$CFG->{say_command} = $value;
		1074	0
1027	}	1075	}
1028	);	1076	);
		1077
		1078	$vbox->add (new CFClient::UI::Label
		1079	text => "Server Info",
		1080	fontsize => 1.2,
		1081	padding_y => 8,
		1082	fg => [1, 1, 0, 1],
		1083	);
		1084
		1085	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1029		1086
1030	$vbox	1087	$vbox
1031	}	1088	}
1032		1089
1033	sub message_window {	1090	sub message_window {
…		…
1038	bg => [0, 0, 0, 0.75],	1095	bg => [0, 0, 0, 0.75],
1039	x => "max",	1096	x => "max",
1040	y => 0,	1097	y => 0,
1041	force_w => $::WIDTH * 0.4,	1098	force_w => $::WIDTH * 0.4,
1042	force_h => $::HEIGHT * 0.5,	1099	force_h => $::HEIGHT * 0.5,
1043	child => (my $vbox = new CFClient::UI::VBox);	1100	child => (my $vbox = new CFClient::UI::VBox),
		1101	has_close_button => 1;
1044		1102
1045	$vbox->add ($LOGVIEW);	1103	$vbox->add ($LOGVIEW);
1046		1104
1047	$vbox->add (my $input = new CFClient::UI::Entry	1105	$vbox->add (my $input = new CFClient::UI::Entry
1048	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1106	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
1056		1114
1057	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1115	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058	$input->{refocus_map} = 1;	1116	$input->{refocus_map} = 1;
1059	}	1117	}
1060	delete $input->{auto_activated};	1118	delete $input->{auto_activated};
		1119
		1120	0
1061	},	1121	},
1062	on_activate => sub {	1122	on_activate => sub {
1063	my ($input, $text) = @_;	1123	my ($input, $text) = @_;
1064	$input->set_text ('');	1124	$input->set_text ('');
1065		1125
…		…
1071	}	1131	}
1072	if ($input->{refocus_map}) {	1132	if ($input->{refocus_map}) {
1073	delete $input->{refocus_map};	1133	delete $input->{refocus_map};
1074	$MAPWIDGET->focus_in	1134	$MAPWIDGET->focus_in
1075	}	1135	}
		1136
		1137	0
1076	},	1138	},
1077	on_escape => sub {	1139	on_escape => sub {
1078	$MAPWIDGET->focus_in	1140	$MAPWIDGET->grab_focus;
		1141
		1142	0
1079	},	1143	},
1080	);	1144	);
1081		1145
1082	$CONSOLE = {	1146	$CONSOLE = {
1083	window => $window,	1147	window => $window,
…		…
1105	);	1169	);
1106	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1170	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107	$hb->add (new CFClient::UI::Button	1171	$hb->add (new CFClient::UI::Button
1108	text => "Ok",	1172	text => "Ok",
1109	expand => 1,	1173	expand => 1,
1110	on_activate => sub { $QUIT_DIALOG->hide },	1174	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111	);	1175	);
1112	$hb->add (new CFClient::UI::Button	1176	$hb->add (new CFClient::UI::Button
1113	text => "Quit anyway",	1177	text => "Quit anyway",
1114	expand => 1,	1178	expand => 1,
1115	on_activate => sub { exit },	1179	on_activate => sub { exit },
…		…
1158	["Potions" => PICKUP_POTION],	1222	["Potions" => PICKUP_POTION],
1159	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1223	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160	["Ignore cursed" => PICKUP_NOT_CURSED],	1224	["Ignore cursed" => PICKUP_NOT_CURSED],
1161	["Jewelery" => PICKUP_JEWELS],	1225	["Jewelery" => PICKUP_JEWELS],
1162	],	1226	],
		1227	["Weight/Value ratio", 2, 17]
1163	)	1228	)
1164	{	1229	{
1165	my ($title, $x, $y, @bits) = @$_;	1230	my ($title, $x, $y, @bits) = @$_;
1166	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1231	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167		1232
…		…
1169	++$y;	1234	++$y;
1170		1235
1171	my $mask = $_->[1];	1236	my $mask = $_->[1];
1172	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1237	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1238	$table->add ($x+1, $y, new CFClient::UI::CheckBox
1174	state => $CFG->{pickup} & $mask,	1239	state => $::CFG->{pickup} & $mask,
1175	on_changed => sub {	1240	on_changed => sub {
1176	my ($box, $value) = @_;	1241	my ($box, $value) = @_;
		1242
1177	if ($value) {	1243	if ($value) {
1178	$::CFG->{pickup} \|= $mask;	1244	$::CFG->{pickup} \|= $mask;
1179	} else {	1245	} else {
1180	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1246	$::CFG->{pickup} &= ~$mask;
1181	}	1247	}
		1248
1182	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1249	$::CONN->send_command ("pickup $::CFG->{pickup}")
1183	if defined $::CONN;	1250	if defined $::CONN;
		1251
		1252	0
1184	});	1253	});
1185	}	1254	}
1186	}	1255	}
1187		1256
		1257	$table->add (2, 18, new CFClient::UI::ValSlider
		1258	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1259	template => ">= 99",
		1260	to_value => sub { ">= " . 5 * $_[0] },
		1261	on_changed => sub {
		1262	my ($slider, $value) = @_;
		1263
		1264	$::CFG->{pickup} &= ~0xF;
		1265	$::CFG->{pickup} \|= int $value
		1266	if $value;
		1267	1;
		1268	});
		1269
		1270	$table->add (3, 18, new CFClient::UI::Button
		1271	text => "set",
		1272	on_activate => sub {
		1273	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1274	if defined $::CONN;
		1275	0
		1276	});
		1277
1188	$table	1278	$table
1189	}	1279	}
1190		1280
1191	sub inventory_window {	1281	sub inventory_widget {
		1282	my $hb = new CFClient::UI::HBox homogeneous => 1;
		1283
		1284	$hb->add (my $vb1 = new CFClient::UI::VBox);
		1285	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		1286	$vb1->add ($INV = new CFClient::UI::Inventory);
		1287
		1288	$hb->add (my $vb2 = new CFClient::UI::VBox);
		1289
		1290	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1291
		1292	$vb2->add ($INVR = new CFClient::UI::Inventory);
		1293
		1294	# XXX: Call after $INVR = ... because set_opencont sets the items
		1295	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1296
		1297	$hb
		1298	}
		1299
		1300	sub player_window {
1192	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1301	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1193	x => "center",	1302	x => "center",
1194	y => "center",	1303	y => "center",
1195	force_w => $WIDTH * 9/10,	1304	force_w => $WIDTH * 9/10,
1196	force_h => $HEIGHT * 9/10,	1305	force_h => $HEIGHT * 9/10,
1197	title => "Inventory",	1306	title => "Player",
		1307	has_close_button => 1
1198	;	1308	;
1199		1309
1200	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1310	my $ntb =
		1311	$PL_NOTEBOOK =
		1312	new CFClient::UI::Notebook
		1313	expand => 1,
		1314	debug => 1,
		1315	filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
		1316	;
		1317	$ntb->add (
		1318	Inventory => inventory_widget,
		1319	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1320	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1321	);
1201		1322
1202	$hb->add (my $vb1 = new CFClient::UI::VBox);	1323	$ntb->add (
1203	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1324	Stats => $STATS_WINDOW = stats_window,
1204	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1325	"Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
		1326	);
		1327	$ntb->add (
		1328	Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
		1329	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1330	);
1205		1331
1206	$hb->add (my $vb2 = new CFClient::UI::VBox);	1332	$plwin->add ($ntb);
1207		1333	$plwin
1208	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1209
1210	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1211
1212	# XXX: Call after $INVR = ... because set_opencont sets the items
1213	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1214
1215	$invwin
1216	}	1334	}
1217		1335
1218	sub spell_setup {	1336	sub update_bindings {
1219	new CFClient::UI::SpellList	1337	$BIND_UPD_CB->() if $BIND_UPD_CB;
1220	}	1338	}
1221		1339
1222	sub keyboard_setup {	1340	sub keyboard_setup {
1223	my $binding_list = new CFClient::UI::VBox;	1341	my $binding_list = new CFClient::UI::VBox;
1224		1342
1225	my $refresh;	1343	my $refresh;
1226	$refresh = sub {	1344	$refresh = $BIND_UPD_CB = sub {
1227	$binding_list->clear ();	1345	$binding_list->clear ();
1228		1346
1229	for my $mod (keys %{$::CFG->{bindings}}) {	1347	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1348	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1349	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1350	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233		1351
1234	my $lbl = join "; ", @$cmds;	1352	my $lbl = join "; ", @$cmds;
1235	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1353	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1236	$binding_list->add (my $hb = new CFClient::UI::HBox);	1354	$binding_list->add (my $hb = new CFClient::UI::HBox);
1237	$hb->add (new CFClient::UI::Button	1355	$hb->add (new CFClient::UI::Button
1238	text => "delete",	1356	text => "delete",
1239	tooltip => "Deletes the binding",	1357	tooltip => "Deletes the binding",
1240	on_activate => sub {	1358	on_activate => sub {
1241	$binding_list->remove ($hb);	1359	$binding_list->remove ($hb);
1242	delete $::CFG->{bindings}->{$mod}->{$sym};	1360	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1361	0
1243	});	1362	});
1244		1363
1245	$hb->add (new CFClient::UI::Button	1364	$hb->add (new CFClient::UI::Button
1246	text => "edit",	1365	text => "edit",
1247	tooltip => "Edits the binding",	1366	tooltip => "Edits the binding",
1248	on_activate => sub {	1367	on_activate => sub {
1249	$::BIND_EDITOR->set_binding (	1368	$::BIND_EDITOR->set_binding (
1250	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1369	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251	sub {	1370	sub {
1252	my ($nmod, $nsym, $ncmds) = @_;	1371	my ($nmod, $nsym, $ncmds) = @_;
1253	delete $::CFG->{bindings}->{$mod}->{$sym};	1372	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1373	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255	$refresh->();	1374	$refresh->();
1256	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1375	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257	$SETUP_DIALOG->show;	1376	$SETUP_DIALOG->show;
1258	},	1377	},
1259	sub {	1378	sub {
1260	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1379	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261	$SETUP_DIALOG->show;	1380	$SETUP_DIALOG->show;
1262	});	1381	});
1263	$::BIND_EDITOR->show;	1382	$::BIND_EDITOR->show;
1264	$SETUP_DIALOG->hide;	1383	$SETUP_DIALOG->hide;
		1384	0
1265	});	1385	});
1266		1386
1267	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1387	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1388	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269	}	1389	}
1270	}	1390	}
1271	};	1391	};
1272		1392
1273	my $vb = new CFClient::UI::VBox;	1393	my $vb = new CFClient::UI::VBox;
		1394	$vb->add (my $hb = new CFClient::UI::HBox);
		1395	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1396	$hb->add (new CFClient::UI::CheckBox
		1397	expand => 1,
		1398	state => $CFG->{shift_fire_stop},
		1399	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1400	on_changed => sub {
		1401	my ($cbox, $value) = @_;
		1402	$CFG->{shift_fire_stop} = $value;
		1403	0
		1404	});
		1405
1274	$vb->add ($binding_list);	1406	$vb->add ($binding_list);
1275	$vb->add (my $hb = new CFClient::UI::HBox);	1407	$vb->add (my $hb = new CFClient::UI::HBox);
1276		1408
1277	$hb->add (new CFClient::UI::Button	1409	$hb->add (new CFClient::UI::Button
1278	text => "record new",	1410	text => "record new",
…		…
1280	tooltip => "This button opens the binding editor with an empty binding.",	1412	tooltip => "This button opens the binding editor with an empty binding.",
1281	on_activate => sub {	1413	on_activate => sub {
1282	$::BIND_EDITOR->set_binding (undef, undef, [],	1414	$::BIND_EDITOR->set_binding (undef, undef, [],
1283	sub {	1415	sub {
1284	my ($mod, $sym, $cmds) = @_;	1416	my ($mod, $sym, $cmds) = @_;
1285	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1417	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286	$refresh->();	1418	$refresh->();
1287	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1419	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288	$SETUP_DIALOG->show;	1420	$SETUP_DIALOG->show;
1289	},	1421	},
1290	sub {	1422	sub {
…		…
1292	$SETUP_DIALOG->show;	1424	$SETUP_DIALOG->show;
1293	},	1425	},
1294	);	1426	);
1295	$SETUP_DIALOG->hide;	1427	$SETUP_DIALOG->hide;
1296	$::BIND_EDITOR->show;	1428	$::BIND_EDITOR->show;
		1429	0
1297	},	1430	},
1298	);	1431	);
1299		1432
1300	$hb->add (new CFClient::UI::Button	1433	$hb->add (new CFClient::UI::Button
1301	text => "close",	1434	text => "close",
1302	tooltip => "Closes the binding window",	1435	tooltip => "Closes the binding window",
1303	expand => 1,	1436	expand => 1,
1304	on_activate => sub {	1437	on_activate => sub {
1305	$SETUP_DIALOG->hide;	1438	$SETUP_DIALOG->hide;
		1439	0
1306	}	1440	}
1307	);	1441	);
1308		1442
1309	$refresh->();	1443	$refresh->();
1310		1444
1311	$vb	1445	$vb
1312	}	1446	}
1313		1447
1314	sub make_help_window {	1448	sub help_window {
1315	my $win = new CFClient::UI::FancyFrame	1449	my $win = new CFClient::UI::FancyFrame
1316	x => 'center',	1450	x => 'center',
1317	y => 'center',	1451	y => 'center',
1318	z => 2,	1452	z => 2,
1319	name => 'doc_browser',	1453	name => 'doc_browser',
…		…
1322	title => "Documentation";	1456	title => "Documentation";
1323		1457
1324	$win->add (my $vbox = new CFClient::UI::VBox);	1458	$win->add (my $vbox = new CFClient::UI::VBox);
1325		1459
1326	$vbox->add (my $buttons = new CFClient::UI::HBox);	1460	$vbox->add (my $buttons = new CFClient::UI::HBox);
1327	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1461	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1462	expand => 1, fontsize => 0.8, padding_x => 4);
1328		1463
1329	for (	1464	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1465	$buttons->add (my $combo = new CFClient::UI::Combobox
		1466	value => undef,
		1467	options => [
1330	[intro => "Introduction"],	1468	[intro => "Introduction"],
1331	[manual => "Manual"],	1469	[manual => "Main Manual"],
		1470	[skill_help => "Skill Reference"],
		1471	[command_help => "Command Reference"],
1332	[command_help => "Commands"],	1472	[dmcommand_help => "DM Commands"],
1333	[skill_help => "Skills"],	1473	[COPYING => "License Terms"],
1334	) {	1474	],
1335	my ($pod, $label) = @$_;	1475	on_changed => sub {
		1476	my ($self, $pod) = @_;
1336		1477
1337	$buttons->add (new CFClient::UI::Button
1338	text => $label,
1339	on_activate => sub {
1340	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1478	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1341	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1479	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1342		1480
1343	$viewer->clear;	1481	$viewer->clear;
		1482
		1483	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
		1484	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
		1485	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
		1486	# ]);#d#
1344		1487
1345	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1488	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346	for @$pom;	1489	for @$pom;
1347		1490
1348	$viewer->set_offset (0);	1491	$viewer->set_offset (0);
		1492
1349	},	1493	0
		1494	},
		1495	on_visibility_change => sub {
		1496	my ($self, $visible) = @_;
		1497	return unless $visible;
		1498	return if $self->{value};
		1499	$self->set_value ("intro");
		1500	0
		1501	},
1350	);	1502	);
1351	}
1352
1353	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354		1503
1355	$win	1504	$win
1356	}	1505	}
1357		1506
1358	sub sdl_init {	1507	sub sdl_init {
…		…
1395	z => 100,	1544	z => 100,
1396	force_x => "max",	1545	force_x => "max",
1397	force_y => 0;	1546	force_y => 0;
1398	$DEBUG_STATUS->show;	1547	$DEBUG_STATUS->show;
1399		1548
1400	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1549	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1401		1550
1402	$STATUSBOX = new CFClient::UI::Statusbox;	1551	$STATUSBOX = new CFClient::UI::Statusbox;
1403	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1552	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404		1553
1405	(new CFClient::UI::Frame	1554	(new CFClient::UI::Frame
…		…
1425	$MAPWIDGET->connect (activate_console => sub {	1574	$MAPWIDGET->connect (activate_console => sub {
1426	my ($mapwidget, $preset) = @_;	1575	my ($mapwidget, $preset) = @_;
1427		1576
1428	if ($CONSOLE) {	1577	if ($CONSOLE) {
1429	$CONSOLE->{input}->{auto_activated} = 1;	1578	$CONSOLE->{input}->{auto_activated} = 1;
1430	$CONSOLE->{input}->focus_in;	1579	$CONSOLE->{input}->grab_focus;
1431		1580
1432	if ($preset && $CONSOLE->{input}->get_text eq '') {	1581	if ($preset && $CONSOLE->{input}->get_text eq '') {
1433	$CONSOLE->{input}->set_text ($preset);	1582	$CONSOLE->{input}->set_text ($preset);
1434	}	1583	}
1435	}	1584	}
1436	});	1585	});
1437	$MAPWIDGET->show;	1586	$MAPWIDGET->show;
1438	$MAPWIDGET->focus_in;	1587	$MAPWIDGET->grab_focus;
1439		1588
1440	$LOGVIEW = new CFClient::UI::TextView	1589	$LOGVIEW = new CFClient::UI::TextScroller
1441	expand => 1,	1590	expand => 1,
1442	font => $FONT_FIXED,	1591	font => $FONT_FIXED,
1443	fontsize => $::CFG->{log_fontsize},	1592	fontsize => $::CFG->{log_fontsize},
1444	indent => -4,	1593	indent => -4,
1445	can_hover => 1,	1594	can_hover => 1,
…		…
1453	x => 'center',	1602	x => 'center',
1454	y => 'center',	1603	y => 'center',
1455	z => 2,	1604	z => 2,
1456	force_w => $::WIDTH * 0.6,	1605	force_w => $::WIDTH * 0.6,
1457	force_h => $::HEIGHT * 0.6,	1606	force_h => $::HEIGHT * 0.6,
		1607	has_close_button => 1,
1458	;	1608	;
		1609
		1610	$METASERVER = metaserver_dialog;
1459		1611
1460	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1612	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1461	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1613	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1462		1614
1463	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1615	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
…		…
1467	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1619	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1468	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1620	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1469	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1621	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1470	"Configure the use of audio, sound effects and background music.");	1622	"Configure the use of audio, sound effects and background music.");
1471	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1623	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1472	"Lets you define, edit and delete bindings."	1624	"Lets you define, edit and delete key bindings."
1473	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1625	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1474	. "with nothing set and the recording started. After doing the actions you "	1626	. "with nothing set and the recording started. After doing the actions you "
1475	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1627	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1476	. "After pressing the combo the binding will be saved automatically and the "	1628	. "After pressing the combo the binding will be saved automatically and the "
1477	. "binding editor closes");	1629	. "binding editor closes");
1478	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1630	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1479	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1631	"Some debuggin' options. Do not ask.");
1480		1632
1481	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1633	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1482		1634
1483	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1635	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1484	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1636	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
…		…
1486	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1638	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1487	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1639	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1488		1640
1489	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	1641	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
1490		1642
1491	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1492	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1493	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,	1643	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1494	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1644	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1495	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1496		1645
1497	$BUTTONBAR->add (new CFClient::UI::Button	1646	$BUTTONBAR->add (new CFClient::UI::Button
1498	text => "Save Config",	1647	text => "Save Config",
1499	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1648	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1500	on_activate => sub {	1649	on_activate => sub {
1501	$::CFG->{layout} = CFClient::UI::get_layout;	1650	$::CFG->{layout} = CFClient::UI::get_layout;
1502	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1651	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1503	status "Configuration Saved";	1652	status "Configuration Saved";
		1653	0
1504	},	1654	},
1505	);	1655	);
1506		1656
1507	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1657	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1508	tooltip => "View Documentation");	1658	tooltip => "View Documentation");
1509		1659
1510	$BUTTONBAR->add (new CFClient::UI::Button	1660	$BUTTONBAR->add (new CFClient::UI::Button
1511	text => "Quit",	1661	text => "Quit",
1512	tooltip => "Terminates the program",	1662	tooltip => "Terminates the program",
…		…
1514	if ($CONN) {	1664	if ($CONN) {
1515	open_quit_dialog;	1665	open_quit_dialog;
1516	} else {	1666	} else {
1517	exit;	1667	exit;
1518	}	1668	}
		1669	0
1519	},	1670	},
1520	);	1671	);
1521		1672
1522	$BUTTONBAR->show;	1673	$BUTTONBAR->show;
1523	$SETUP_DIALOG->show;	1674	$SETUP_DIALOG->show;
…		…
1525		1676
1526	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1677	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1527	}	1678	}
1528		1679
1529	sub video_shutdown {	1680	sub video_shutdown {
		1681	CFClient::OpenGL::shutdown;
		1682
1530	undef $SDL_ACTIVE;	1683	undef $SDL_ACTIVE;
1531	}	1684	}
1532		1685
1533	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1686	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1534	my $bgmusic;#TODO#hack#d#	1687	my $bgmusic;#TODO#hack#d#
…		…
1750		1903
1751	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1904	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1752	CFClient::UI::set_layout ($::CFG->{layout});	1905	CFClient::UI::set_layout ($::CFG->{layout});
1753		1906
1754	my %DEF_CFG = (	1907	my %DEF_CFG = (
1755	sdl_mode => 0,	1908	sdl_mode => 0,
1756	width => 640,	1909	width => 640,
1757	height => 480,	1910	height => 480,
1758	fullscreen => 0,	1911	fullscreen => 0,
1759	fast => 0,	1912	fast => 0,
1760	map_scale => 1,	1913	map_scale => 1,
1761	fow_enable => 1,	1914	fow_enable => 1,
1762	fow_intensity => 0.45,	1915	fow_intensity => 0.45,
1763	fow_smooth => 0,	1916	fow_smooth => 0,
1764	gui_fontsize => 1,	1917	gui_fontsize => 1,
1765	log_fontsize => 0.7,	1918	log_fontsize => 0.7,
1766	gauge_fontsize=> 1,	1919	gauge_fontsize => 1,
1767	gauge_size => 0.35,	1920	gauge_size => 0.35,
1768	stat_fontsize => 0.7,	1921	stat_fontsize => 0.7,
1769	mapsize => 100,	1922	mapsize => 100,
1770	host => "crossfire.schmorp.de",
1771	say_command => 'say',	1923	say_command => 'say',
1772	audio_enable => 1,	1924	audio_enable => 1,
1773	bgm_enable => 1,	1925	bgm_enable => 1,
1774	bgm_volume => 0.25,	1926	bgm_volume => 0.25,
1775	face_prefetch => 0,	1927	face_prefetch => 0,
1776	output_sync => 1,	1928	output_sync => 1,
1777	output_count => 1,	1929	output_count => 1,
		1930	pickup => 0,
		1931	default => "profile", # default profile
		1932	);
1778	);	1933
1779
1780	while (my ($k, $v) = each %DEF_CFG) {	1934	while (my ($k, $v) = each %DEF_CFG) {
1781	$CFG->{$k} = $v unless exists $CFG->{$k};	1935	$CFG->{$k} = $v unless exists $CFG->{$k};
1782	}	1936	}
		1937
		1938	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";
1783		1939
1784	sdl_init;	1940	sdl_init;
1785		1941
1786	@SDL_MODES = reverse	1942	@SDL_MODES = reverse
1787	grep $_->[0] >= 640 && $_->[1] >= 480,	1943	grep $_->[0] >= 640 && $_->[1] >= 480,
…		…
1829	video_init;	1985	video_init;
1830	audio_init;	1986	audio_init;
1831	}	1987	}
1832		1988
1833	Event::loop;	1989	Event::loop;
		1990	#CFClient::SDL_Quit;
		1991	#CFClient::_exit 0;
1834		1992
1835	END { CFClient::SDL_Quit }	1993	END { CFClient::SDL_Quit }
1836		1994
1837	=head1 NAME	1995	=head1 NAME
1838		1996

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs. Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC