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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
38	use CFClient;	37	use CFClient;
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
46	Carp::confess $_[1];#d#TODO: remove when stable	47	Carp::confess $_[1];#d#TODO: remove when stable
47	CFClient::error $_[1];	48	CFClient::error $_[1];
…		…
83	our $CONSOLE;	84	our $CONSOLE;
84	our $METASERVER;	85	our $METASERVER;
85	our $LOGIN_BUTTON;	86	our $LOGIN_BUTTON;
86	our $QUIT_DIALOG;	87	our $QUIT_DIALOG;
87	our $HOST_ENTRY;	88	our $HOST_ENTRY;
		89	our $SERVER_INFO;
88		90
89	our $SETUP_DIALOG;	91	our $SETUP_DIALOG;
90	our $SETUP_NOTEBOOK;	92	our $SETUP_NOTEBOOK;
91	our $SETUP_SERVER;	93	our $SETUP_SERVER;
92	our $SETUP_KEYBOARD;	94	our $SETUP_KEYBOARD;
93	our $SETUP_SPELLS;	95	our $SETUP_SPELLS;
94		96
		97	our $STATS_WINDOW;
		98	our $MESSAGE_WINDOW;
95	our $FLOORBOX;	99	our $FLOORBOX;
96	our $GAUGES;	100	our $GAUGES;
97	our $STATWIDS;	101	our $STATWIDS;
98		102
99	our $SDL_ACTIVE;	103	our $SDL_ACTIVE;
…		…
120	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	124	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
121	}	125	}
122		126
123	sub debug {	127	sub debug {
124	$DEBUG_STATUS->set_text ($_[0]);	128	$DEBUG_STATUS->set_text ($_[0]);
		129	}
		130
		131	sub destroy_query_dialog {
		132	(delete $_[0]{query_dialog})->destroy
		133	if $_[0]{query_dialog};
		134	}
		135
		136	# server query dialog
		137	sub server_query {
		138	my ($conn, $flags, $prompt) = @_;
		139
		140	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		141	x => "center",
		142	y => "center",
		143	title => "Server Query",
		144	child => my $vbox = new CFClient::UI::VBox,
		145	;
		146
		147	my @dialog = my $label = new CFClient::UI::Label
		148	max_w => $::WIDTH * 0.4,
		149	ellipsise => 0,
		150	text => $prompt;
		151
		152	if ($flags & CS_QUERY_YESNO) {
		153	push @dialog, my $hbox = new CFClient::UI::HBox;
		154
		155	$hbox->add (new CFClient::UI::Button
		156	text => "No",
		157	on_activate => sub {
		158	$conn->send ("reply n");
		159	$dialog->destroy;
		160	0
		161	}
		162	);
		163	$hbox->add (new CFClient::UI::Button
		164	text => "Yes",
		165	on_activate => sub {
		166	$conn->send ("reply y");
		167	destroy_query_dialog $conn;
		168	0
		169	},
		170	);
		171
		172	$dialog->grab_focus;
		173
		174	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		175	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		176
		177	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		178	$MESSAGE_WINDOW->show;
		179
		180	unshift @dialog, new CFClient::UI::Label
		181	max_w => $::WIDTH * 0.4,
		182	ellipsise => 0,
		183	markup => "\nOr use your keyboard:\n";
		184
		185	unshift @dialog, my $table = new CFClient::UI::Table;
		186
		187	$table->add (0, 0, new CFClient::UI::Button
		188	text => "Next Race",
		189	on_activate => sub {
		190	$conn->send ("reply n");
		191	destroy_query_dialog $conn;
		192	0
		193	},
		194	);
		195	$table->add (2, 0, new CFClient::UI::Button
		196	text => "Accept",
		197	on_activate => sub {
		198	$conn->send ("reply d");
		199	destroy_query_dialog $conn;
		200	0
		201	},
		202	);
		203
		204	unshift @dialog, new CFClient::UI::Label
		205	max_w => $::WIDTH * 0.4,
		206	ellipsise => 0,
		207	markup =>
		208	"<big><b>Character Creation: Race</b></big>\n\n"
		209	. "Look at the <b>Messages</b> window to see a description of this race "
		210	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
		211	. "and the center of the screen to see how this race looks like "
		212	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
		213	. "You can look at another race, or accept this race (you will come back to this race eventually, "
		214	. "so you can take your time making this important choice."
		215	;
		216
		217	} elsif ($prompt =~ /roll new stats/) {
		218	if (my $stat = delete $conn->{stat_change_with}) {
		219	$conn->send ("reply $stat");
		220	destroy_query_dialog $conn;
		221	return;
		222	}
		223
		224	$STATS_WINDOW->show;
		225	$MESSAGE_WINDOW->hide;
		226
		227	unshift @dialog, new CFClient::UI::Label
		228	max_w => $::WIDTH * 0.4,
		229	ellipsise => 0,
		230	markup => "\nOr use your keyboard:\n";
		231
		232	unshift @dialog, my $table = new CFClient::UI::Table;
		233
		234	# left: re-roll
		235	$table->add (0, 0, new CFClient::UI::Button
		236	text => "Roll Again",
		237	on_activate => sub {
		238	$conn->send ("reply y");
		239	destroy_query_dialog $conn;
		240	0
		241	},
		242	);
		243
		244	# center: swap stats
		245	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		246	value => $_,
		247	options => [
		248	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		249	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		250	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		251	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		252	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		253	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		254	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		255	],
		256	), 1 .. 2;
		257
		258	$table->add (2, 0, new CFClient::UI::Button
		259	text => "Swap Stats",
		260	on_activate => sub {
		261	$conn->{stat_change_with} = $sw2->{value};
		262	$conn->send ("reply $sw1->{value}");
		263	destroy_query_dialog $conn;
		264	0
		265	},
		266	);
		267	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		268
		269	# right: accept
		270	$table->add (4, 0, new CFClient::UI::Button
		271	text => "Accept",
		272	on_activate => sub {
		273	$conn->send ("reply n");
		274	$STATS_WINDOW->hide;
		275	destroy_query_dialog $conn;
		276	0
		277	},
		278	);
		279
		280	unshift @dialog, new CFClient::UI::Label
		281	max_w => $::WIDTH * 0.4,
		282	ellipsise => 0,
		283	markup =>
		284	"<big><b>Character Creation: Stats</b></big>\n\n"
		285	. "Look at the <b>Stats</b> window to see your basic stats "
		286	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
		287	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
		288	. "Race selection will influence those values later on."
		289	;
		290	}
		291
		292	push @dialog, my $entry = new CFClient::UI::Entry
		293	on_changed => sub {
		294	$conn->send ("reply $_[1]");
		295	destroy_query_dialog $conn;
		296	0
		297	},
		298	;
		299
		300	$entry->grab_focus;
		301
		302	} else {
		303	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		304
		305	push @dialog, my $entry = new CFClient::UI::Entry
		306	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		307	on_activate => sub {
		308	$conn->send ("reply $_[1]");
		309	destroy_query_dialog $conn;
		310	0
		311	},
		312	;
		313
		314	$entry->grab_focus;
		315	}
		316
		317	$vbox->add (@dialog);
		318	$dialog->show;
125	}	319	}
126		320
127	sub start_game {	321	sub start_game {
128	status "logging in...";	322	status "logging in...";
129		323
…		…
148	map_widget => $MAPWIDGET,	342	map_widget => $MAPWIDGET,
149	logview => $LOGVIEW,	343	logview => $LOGVIEW,
150	statusbox => $STATUSBOX,	344	statusbox => $STATUSBOX,
151	map => $MAP,	345	map => $MAP,
152	mapmap => $MAPMAP,	346	mapmap => $MAPMAP,
		347	query => \&server_query,
153		348
154	sound_play => sub {	349	sound_play => sub {
155	my ($x, $y, $soundnum, $type) = @_;	350	my ($x, $y, $soundnum, $type) = @_;
156		351
157	$SDL_MIXER	352	$SDL_MIXER
…		…
174	}	369	}
175	}	370	}
176		371
177	sub stop_game {	372	sub stop_game {
178	$LOGIN_BUTTON->set_text ("Login");	373	$LOGIN_BUTTON->set_text ("Login");
		374	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	375	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	376	$INV_WINDOW->hide;
181	$LOGVIEW->hide;	377	$SETUP_SPELLS->clear_spells;
182		378
183	return unless $CONN;	379	return unless $CONN;
184		380
185	status "connection closed";	381	status "connection closed";
186		382
		383	destroy_query_dialog $CONN;
187	$CONN->destroy;	384	$CONN->destroy;
188	$CONN = 0; # false, does not autovivify	385	$CONN = 0; # false, does not autovivify
189	}	386	}
190		387
191	sub graphics_setup {	388	sub graphics_setup {
…		…
211		408
212	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	409	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
213	$table->add (1, $row++, new CFClient::UI::CheckBox	410	$table->add (1, $row++, new CFClient::UI::CheckBox
214	state => $CFG->{fullscreen},	411	state => $CFG->{fullscreen},
215	tooltip => "Bring the client into fullscreen mode.",	412	tooltip => "Bring the client into fullscreen mode.",
216	on_changed => sub {	413	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217	my ($self, $value) = @_;
218	$CFG->{fullscreen} = $value;
219	}
220	);	414	);
221		415
222	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	416	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
223	$table->add (1, $row++, new CFClient::UI::CheckBox	417	$table->add (1, $row++, new CFClient::UI::CheckBox
224	state => $CFG->{fast},	418	state => $CFG->{fast},
225	tooltip => "Lower the visual quality considerably to speed up rendering.",	419	tooltip => "Lower the visual quality considerably to speed up rendering.",
226	on_changed => sub {	420	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227	my ($self, $value) = @_;
228	$CFG->{fast} = $value;
229	}
230	);	421	);
231		422
232	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	423	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
233	$table->add (1, $row++, new CFClient::UI::Slider	424	$table->add (1, $row++, new CFClient::UI::Slider
234	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	425	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	426	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236	on_changed => sub {	427	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237	my ($self, $value) = @_;
238	$CFG->{map_scale} = 2 ** $value;
239	}
240	);	428	);
241		429
242	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	430	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
243	$table->add (1, $row++, new CFClient::UI::CheckBox	431	$table->add (1, $row++, new CFClient::UI::CheckBox
244	state => $CFG->{fow_enable},	432	state => $CFG->{fow_enable},
245	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	433	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
246	on_changed => sub {	434	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247	my ($self, $value) = @_;
248	$CFG->{fow_enable} = $value;
249	}
250	);	435	);
251		436
252	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	437	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
253	$table->add (1, $row++, new CFClient::UI::Slider	438	$table->add (1, $row++, new CFClient::UI::Slider
254	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	439	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	440	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256	on_changed => sub {	441	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257	my ($self, $value) = @_;
258	$CFG->{fow_intensity} = $value;
259	}
260	);	442	);
261		443
262	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	444	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263	$table->add (1, $row++, new CFClient::UI::CheckBox	445	$table->add (1, $row++, new CFClient::UI::CheckBox
264	state => $CFG->{fow_smooth},	446	state => $CFG->{fow_smooth},
265	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	447	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266	on_changed => sub {	448	on_changed => sub {
267	my ($self, $value) = @_;	449	my ($self, $value) = @_;
268	$CFG->{fow_smooth} = $value;	450	$CFG->{fow_smooth} = $value;
269	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	451	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		452	0
270	}	453	}
271	);	454	);
272		455
273	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	456	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274	$table->add (1, $row++, new CFClient::UI::Slider	457	$table->add (1, $row++, new CFClient::UI::Slider
275	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	458	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	459	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	460	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278	);	461	);
279		462
280	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	463	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
281	$table->add (1, $row++, new CFClient::UI::Slider	464	$table->add (1, $row++, new CFClient::UI::Slider
282	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	465	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	466	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	467	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285	);	468	);
286		469
287	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	470	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288		471
289	$table->add (1, $row++, new CFClient::UI::Slider	472	$table->add (1, $row++, new CFClient::UI::Slider
290	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	473	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	474	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292	on_changed => sub {	475	on_changed => sub {
293	$CFG->{stat_fontsize} = $_[1];	476	$CFG->{stat_fontsize} = $_[1];
294	&set_stats_window_fontsize;	477	&set_stats_window_fontsize;
		478	0
295	}	479	}
296	);	480	);
297		481
298	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	482	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
299	$table->add (1, $row++, new CFClient::UI::Slider	483	$table->add (1, $row++, new CFClient::UI::Slider
300	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	484	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	485	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302	on_changed => sub {	486	on_changed => sub {
303	$CFG->{gauge_fontsize} = $_[1];	487	$CFG->{gauge_fontsize} = $_[1];
304	&set_gauge_window_fontsize;	488	&set_gauge_window_fontsize;
		489	0
305	}	490	}
306	);	491	);
307		492
308	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	493	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
309	$table->add (1, $row++, new CFClient::UI::Slider	494	$table->add (1, $row++, new CFClient::UI::Slider
310	range => [$CFG->{gauge_size}, 0.2, 0.8],	495	range => [$CFG->{gauge_size}, 0.2, 0.8],
311	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	496	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
312	on_changed => sub {	497	on_changed => sub {
313	$CFG->{gauge_size} = $_[1];	498	$CFG->{gauge_size} = $_[1];
314	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	499	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		500	0
315	}	501	}
316	);	502	);
317		503
318	$table->add (1, $row++, new CFClient::UI::Button	504	$table->add (1, $row++, new CFClient::UI::Button
319	expand => 1, align => 0, text => "Apply",	505	expand => 1, align => 0, text => "Apply",
320	tooltip => "Apply the video settings",	506	tooltip => "Apply the video settings",
321	on_activate => sub {	507	on_activate => sub {
322	video_shutdown ();	508	video_shutdown ();
323	video_init ();	509	video_init ();
		510	0
324	}	511	}
325	);	512	);
326		513
327	$vbox	514	$vbox
328	}	515	}
…		…
336		523
337	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	524	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
338	$table->add (1, $row++, new CFClient::UI::CheckBox	525	$table->add (1, $row++, new CFClient::UI::CheckBox
339	state => $CFG->{audio_enable},	526	state => $CFG->{audio_enable},
340	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	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.",
341	on_changed => sub {	528	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342	$CFG->{audio_enable} = $_[1];
343	}
344	);	529	);
345	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	530	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
346	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	531	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
347	# $CFG->{effects_volume} = $_[1];	532	# $CFG->{effects_volume} = $_[1];
348	# });	533	# });
349	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	534	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
350	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	535	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
351	$hbox->add (new CFClient::UI::CheckBox	536	$hbox->add (new CFClient::UI::CheckBox
352	expand => 1, state => $CFG->{bgm_enable},	537	expand => 1, state => $CFG->{bgm_enable},
353	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	538	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
354	on_changed => sub {	539	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355	$CFG->{bgm_enable} = $_[1];
356	}
357	);	540	);
358	$hbox->add (new CFClient::UI::Slider	541	$hbox->add (new CFClient::UI::Slider
359	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	542	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360	tooltip => "The volume of the background music. Changes are instant.",	543	tooltip => "The volume of the background music. Changes are instant.",
361	on_changed => sub {	544	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
362	$CFG->{bgm_volume} = $_[1];
363	CFClient::MixMusic::volume $_[1] * 128;
364	}
365	);	545	);
366		546
367	$table->add (1, $row++, new CFClient::UI::Button	547	$table->add (1, $row++, new CFClient::UI::Button
368	expand => 1, align => 0, text => "Apply",	548	expand => 1, align => 0, text => "Apply",
369	tooltip => "Apply the audio settings",	549	tooltip => "Apply the audio settings",
370	on_activate => sub {	550	on_activate => sub {
371	audio_shutdown ();	551	audio_shutdown ();
372	audio_init ();	552	audio_init ();
		553	0
373	}	554	}
374	);	555	);
375		556
376	$vbox	557	$vbox
377	}	558	}
…		…
439	&set_gauge_window_fontsize;	620	&set_gauge_window_fontsize;
440		621
441	$win	622	$win
442	}	623	}
443		624
		625	sub debug_setup {
		626	my $table = new CFClient::UI::Table;
444		627
		628	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		629	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		630	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		631	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		632	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		633	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		634	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		635	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		636
		637	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		638
		639	for my $x (0..2) {
		640	for my $y (0 .. 2) {
		641	$table->add ($x + 3, $y,
		642	new CFClient::UI::Entry
		643	text => $default_smooth[$x * 3 + $y],
		644	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		645	);
		646	}
		647	}
		648
		649
		650	$table
		651	}
		652
445	sub make_stats_window {	653	sub stats_window {
446	my $tgw = new CFClient::UI::FancyFrame	654	my $tgw = new CFClient::UI::FancyFrame
447	y => $HEIGHT * (2/8),	655	y => $HEIGHT * (2/8),
448	x => "max",	656	x => "max",
449	title => "Stats",	657	title => "Stats",
450	name => "stats_window";	658	name => "stats_window",
		659	has_close_button => 1;
451		660
452	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	661	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
453	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	662	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
454	can_hover => 1, can_events => 1,	663	can_hover => 1, can_events => 1,
455	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	664	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
601	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	810	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	811	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
603		812
604	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);	813	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
605		814
606	# TODO: replace by CS_STAT_RES_xxx constants
607	my %tbl = (	815	my %tbl = (
608	phys => 100,	816	phys => CS_STAT_RES_PHYS,
609	magic => 101,	817	magic => CS_STAT_RES_MAG,
610	fire => 102,	818	fire => CS_STAT_RES_FIRE,
611	elec => 103,	819	elec => CS_STAT_RES_ELEC,
612	cold => 104,	820	cold => CS_STAT_RES_COLD,
613	conf => 105,	821	conf => CS_STAT_RES_CONF,
614	acid => 106,	822	acid => CS_STAT_RES_ACID,
615	drain => 107,	823	drain => CS_STAT_RES_DRAIN,
616	ghit => 108,	824	ghit => CS_STAT_RES_GHOSTHIT,
617	pois => 109,	825	pois => CS_STAT_RES_POISON,
618	slow => 110,	826	slow => CS_STAT_RES_SLOW,
619	para => 111,	827	para => CS_STAT_RES_PARA,
620	tund => 112,	828	tund => CS_STAT_TURN_UNDEAD,
621	fear => 113,	829	fear => CS_STAT_RES_FEAR,
622	depl => 113,	830	depl => CS_STAT_RES_DEPLETE,
623	deat => 115,	831	deat => CS_STAT_RES_DEATH,
624	holyw => 116,	832	holyw => CS_STAT_RES_HOLYWORD,
625	blind => 117,	833	blind => CS_STAT_RES_BLIND,
626	);	834	);
627		835
628	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	836	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629	for keys %tbl;	837	for keys %tbl;
630	}	838	}
…		…
660		868
661	utf8::decode $buf if utf8::valid $buf;	869	utf8::decode $buf if utf8::valid $buf;
662		870
663	$table->clear;	871	$table->clear;
664		872
		873	my @tip = (
		874	"The current number of users logged in on the server.",
		875	"The hostname of the server.",
		876	"The time this server has been running without being restarted.",
		877	"The server software version - a '+' indicates a Crossfire+ server.",
		878	"Short information about this server provided by its admins.",
		879	);
665	my @col = qw(Use #Users Host Uptime Version Description);	880	my @col = qw(#Users Host Uptime Version Description);
666	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	881	$table->add ($_, 0, new CFClient::UI::Label
		882	can_hover => 1, can_events => 1,
		883	align => 0, fg => [1, 1, 0],
		884	text => $col[$_], tooltip => $tip[$_])
667	for 0 .. $#col;	885	for 0 .. $#col;
668		886
669	my @align = qw(1 0 1 1 -1);	887	my @align = qw(1 0 1 1 -1);
670		888
671	my $y = 0;	889	my $y = 0;
672	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	890	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
689		907
690	$m = [$users, $host, $uptime, $version, $desc];	908	$m = [$users, $host, $uptime, $version, $desc];
691		909
692	$y++;	910	$y++;
693		911
694	$table->add (0, $y, new CFClient::UI::VBox children => [	912	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695	(new CFClient::UI::Button text => "Use", on_activate => sub {	913	(new CFClient::UI::Button
		914	text => "Use",
		915	tooltip => "Put this server into the <b>Host:Port</b> field",
		916	on_activate => sub {
696	$HOST_ENTRY->set_text ($CFG->{host} = $host);	917	$HOST_ENTRY->set_text ($CFG->{host} = $host);
697	$METASERVER->toggle_visibility;	918	$METASERVER->hide;
		919	0
		920	},
698	}),	921	),
699	(new CFClient::UI::Empty expand => 1),	922	(new CFClient::UI::Empty expand => 1),
700	]);	923	]);
701		924
702	$table->add ($_ + 1, $y, new CFClient::UI::Label	925	$table->add ($_, $y, new CFClient::UI::Label
703	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	926	ellipsise => 0,
		927	align => $align[$_],
		928	text => $m->[$_],
		929	tooltip => $tip[$_],
		930	can_hover => 1,
		931	can_events => 1,
		932	fontsize => 0.8)
704	for 0 .. $#$m;	933	for 0 .. $#$m;
705	}	934	}
706	}	935	}
707	});	936	});
708	}	937	}
709		938
710	sub metaserver_dialog {	939	sub metaserver_dialog {
711	my $dialog = new CFClient::UI::FancyFrame	940	my $dialog = new CFClient::UI::FancyFrame
712	title => "Server List",	941	title => "Server List",
713	name => 'metaserver_dialog',	942	name => 'metaserver_dialog',
714	x => 'center',	943	x => 'center',
715	y => 'center',	944	y => 'center',
		945	z => 3,
		946	force_h => $::HEIGHT * 0.4,
716	child => (my $vbox = new CFClient::UI::VBox),	947	child => (my $vbox = new CFClient::UI::VBox),
717	on_visibility_change => sub {	948	on_visibility_change => sub {
718	update_metaserver if $_[1];	949	update_metaserver if $_[1];
		950	0
719	},	951	},
720	;	952	;
721		953
722	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	954	$dialog->{table} = new CFClient::UI::Table;
		955
		956	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
723		957
724	$dialog	958	$dialog
725	}	959	}
726		960
727	sub server_setup {	961	sub server_setup {
…		…
739	text => $CFG->{host},	973	text => $CFG->{host},
740	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	974	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741	on_changed => sub {	975	on_changed => sub {
742	my ($self, $value) = @_;	976	my ($self, $value) = @_;
743	$CFG->{host} = $value;	977	$CFG->{host} = $value;
		978	0
744	}	979	}
745	);	980	);
746		981
747	$METASERVER = metaserver_dialog;	982	$METASERVER = metaserver_dialog;
748		983
749	$vbox->add (new CFClient::UI::Button	984	$vbox->add (new CFClient::UI::Button
750	expand => 1,	985	expand => 1,
751	text => "Server List",	986	text => "Server List",
752	other => $METASERVER,	987	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	988	tooltip => "Show a list of available crossfire servers",
754	on_activate => sub { $METASERVER->toggle_visibility },	989	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		990	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755	);	991	);
756	}	992	}
757		993
758	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	994	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759	$table->add (1, 4, new CFClient::UI::Entry	995	$table->add (1, 4, new CFClient::UI::Entry
760	text => $CFG->{user},	996	text => $CFG->{user},
761	tooltip => "The name of your character on the server",	997	tooltip => "The name of your character on the server",
762	on_changed => sub {	998	on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 }
763	my ($self, $value) = @_;
764	$CFG->{user} = $value;
765	}
766	);	999	);
767		1000
768	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1001	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769	$table->add (1, 5, new CFClient::UI::Entry	1002	$table->add (1, 5, new CFClient::UI::Entry
770	text => $CFG->{password},	1003	text => $CFG->{password},
771	hidden => 1,	1004	hidden => 1,
772	tooltip => "The password for your character",	1005	tooltip => "The password for your character",
773	on_changed => sub {	1006	on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 }
774	my ($self, $value) = @_;
775	$CFG->{password} = $value;
776	}
777	);	1007	);
778		1008
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1009	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	1010	$table->add (1, 7, new CFClient::UI::Slider
781	force_w => 100,	1011	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1012	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	1013	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	1014	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	1015	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	1016	. "This option is only used once at log-in.",
787	on_changed => sub {	1017	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788	my ($self, $value) = @_;
789
790	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791	},
792	);	1018	);
793		1019
794	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1020	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795	$table->add (1, 8, new CFClient::UI::CheckBox	1021	$table->add (1, 8, new CFClient::UI::CheckBox
796	state => $CFG->{face_prefetch},	1022	state => $CFG->{face_prefetch},
…		…
799	. "This might increase or create lag, but increases the chances "	1025	. "This might increase or create lag, but increases the chances "
800	. "of faces being ready for display when you encounter them. "	1026	. "of faces being ready for display when you encounter them. "
801	. "It also uses up server bandwidth on every connect, "	1027	. "It also uses up server bandwidth on every connect, "
802	. "so only set it if you really need to prefetch images. "	1028	. "so only set it if you really need to prefetch images. "
803	. "This option can be set and unset any time.",	1029	. "This option can be set and unset any time.",
804	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1030	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805	);	1031	);
806		1032
807	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1033	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808	$table->add (1, 9, new CFClient::UI::Entry	1034	$table->add (1, 9, new CFClient::UI::Entry
809	text => $CFG->{output_count},	1035	text => $CFG->{output_count},
810	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1036	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811	on_changed => sub { $CFG->{output_count} = $_[1] },	1037	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812	);	1038	);
813		1039
814	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1040	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815	$table->add (1, 10, new CFClient::UI::Entry	1041	$table->add (1, 10, new CFClient::UI::Entry
816	text => $CFG->{output_sync},	1042	text => $CFG->{output_sync},
817	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.",
818	on_changed => sub { $CFG->{output_sync} = $_[1] },	1044	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819	);	1045	);
820		1046
821	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1047	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822	expand => 1,	1048	expand => 1,
823	align => 0,	1049	align => 0,
824	text => "Login",	1050	text => "Login",
825	on_activate => sub {	1051	on_activate => sub {
826	$CONN ? stop_game	1052	$CONN ? stop_game
827	: start_game;	1053	: start_game;
		1054	0
828	},	1055	},
829	);	1056	);
830		1057
831	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1058	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1059	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
835	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1062	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1063	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837	on_changed => sub {	1064	on_changed => sub {
838	my ($self, $value) = @_;	1065	my ($self, $value) = @_;
839	$CFG->{say_command} = $value;	1066	$CFG->{say_command} = $value;
		1067	0
840	}	1068	}
841	);	1069	);
		1070
		1071	$vbox->add (new CFClient::UI::Label
		1072	text => "Server Info",
		1073	fontsize => 1.2,
		1074	padding_y => 8,
		1075	fg => [1, 1, 0, 1],
		1076	);
		1077
		1078	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842		1079
843	$vbox	1080	$vbox
844	}	1081	}
845		1082
846	sub message_window {	1083	sub message_window {
…		…
849	title => "Messages",	1086	title => "Messages",
850	border_bg => [1, 1, 1, 1],	1087	border_bg => [1, 1, 1, 1],
851	bg => [0, 0, 0, 0.75],	1088	bg => [0, 0, 0, 0.75],
852	x => "max",	1089	x => "max",
853	y => 0,	1090	y => 0,
854	force_w => $::WIDTH / 3,	1091	force_w => $::WIDTH * 0.4,
855	force_h => $::HEIGHT / 5,	1092	force_h => $::HEIGHT * 0.5,
856	child => (my $vbox = new CFClient::UI::VBox);	1093	child => (my $vbox = new CFClient::UI::VBox),
		1094	has_close_button => 1;
857		1095
858	$vbox->add ($LOGVIEW);	1096	$vbox->add ($LOGVIEW);
859		1097
860	$vbox->add (my $input = new CFClient::UI::Entry	1098	$vbox->add (my $input = new CFClient::UI::Entry
861	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1099	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
869		1107
870	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1108	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871	$input->{refocus_map} = 1;	1109	$input->{refocus_map} = 1;
872	}	1110	}
873	delete $input->{auto_activated};	1111	delete $input->{auto_activated};
		1112
		1113	0
874	},	1114	},
875	on_activate => sub {	1115	on_activate => sub {
876	my ($input, $text) = @_;	1116	my ($input, $text) = @_;
877	$input->set_text ('');	1117	$input->set_text ('');
878		1118
…		…
884	}	1124	}
885	if ($input->{refocus_map}) {	1125	if ($input->{refocus_map}) {
886	delete $input->{refocus_map};	1126	delete $input->{refocus_map};
887	$MAPWIDGET->focus_in	1127	$MAPWIDGET->focus_in
888	}	1128	}
		1129
		1130	0
889	},	1131	},
890	on_escape => sub {	1132	on_escape => sub {
891	$MAPWIDGET->focus_in	1133	$MAPWIDGET->grab_focus;
		1134
		1135	0
892	},	1136	},
893	);	1137	);
894		1138
895	$CONSOLE = {	1139	$CONSOLE = {
896	window => $window,	1140	window => $window,
…		…
903	sub open_quit_dialog {	1147	sub open_quit_dialog {
904	unless ($QUIT_DIALOG) {	1148	unless ($QUIT_DIALOG) {
905	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1149	$QUIT_DIALOG = new CFClient::UI::FancyFrame
906	x => "center",	1150	x => "center",
907	y => "center",	1151	y => "center",
		1152	z => 50,
908	title => "Really Quit?",	1153	title => "Really Quit?",
909	;	1154	;
910		1155
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1156	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912		1157
…		…
917	);	1162	);
918	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1163	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919	$hb->add (new CFClient::UI::Button	1164	$hb->add (new CFClient::UI::Button
920	text => "Ok",	1165	text => "Ok",
921	expand => 1,	1166	expand => 1,
922	on_activate => sub { $QUIT_DIALOG->hide },	1167	on_activate => sub { $QUIT_DIALOG->hide; 0 },
923	);	1168	);
924	$hb->add (new CFClient::UI::Button	1169	$hb->add (new CFClient::UI::Button
925	text => "Quit anyway",	1170	text => "Quit anyway",
926	expand => 1,	1171	expand => 1,
927	on_activate => sub { exit },	1172	on_activate => sub { exit },
…		…
930		1175
931	$QUIT_DIALOG->show;	1176	$QUIT_DIALOG->show;
932	}	1177	}
933		1178
934	sub autopickup_setup {	1179	sub autopickup_setup {
935	my $vb = new CFClient::UI::VBox;	1180	my $table = new CFClient::UI::Table;
936
937	$vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939	$hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940	$hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942	my $tbl = 0;
943	my $tblrow = 0;
944		1181
945	for (	1182	for (
946	["General", $gen_tbl],	1183	["General", 0, 0,
947	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1184	["Enable autopickup" => PICKUP_NEWMODE],
948	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1185	["Inhibit autopickup" => PICKUP_INHIBIT],
949	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1186	["Stop before pickup" => PICKUP_STOP],
950	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1187	["Debug autopickup" => PICKUP_DEBUG],
		1188	],
951	["Weapons", $ltbl],	1189	["Weapons", 0, 6,
952	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1190	["All weapons" => PICKUP_ALLWEAPON],
953	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1191	["Missile weapons" => PICKUP_MISSILEWEAPON],
954	["Bows" => CFClient::Pickup::PU_BOW],	1192	["Bows" => PICKUP_BOW],
955	["Arrows" => CFClient::Pickup::PU_ARROW],	1193	["Arrows" => PICKUP_ARROW],
		1194	],
956	["Armour"],	1195	["Armour", 0, 12,
957	["Helmets" => CFClient::Pickup::PU_HELMET],	1196	["Helmets" => PICKUP_HELMET],
958	["Shields" => CFClient::Pickup::PU_SHIELD],	1197	["Shields" => PICKUP_SHIELD],
959	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1198	["Body Armour" => PICKUP_ARMOUR],
960	["Boots" => CFClient::Pickup::PU_BOOTS],	1199	["Boots" => PICKUP_BOOTS],
961	["Gloves" => CFClient::Pickup::PU_GLOVES],	1200	["Gloves" => PICKUP_GLOVES],
962	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1201	["Cloaks" => PICKUP_CLOAK],
		1202	],
		1203
963	["Readables", $rtbl],	1204	["Readables", 2, 2,
964	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1205	["Spellbooks" => PICKUP_SPELLBOOK],
965	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1206	["Skillscrolls" => PICKUP_SKILLSCROLL],
966	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1207	["Normal Books/Scrolls" => PICKUP_READABLES],
		1208	],
967	["Misc"],	1209	["Misc", 2, 7,
968	["Food" => CFClient::Pickup::PU_FOOD],	1210	["Food" => PICKUP_FOOD],
969	["Drinks" => CFClient::Pickup::PU_DRINK],	1211	["Drinks" => PICKUP_DRINK],
970	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1212	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971	["Keys" => CFClient::Pickup::PU_KEY],	1213	["Keys" => PICKUP_KEY],
972	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1214	["Magical Items" => PICKUP_MAGICAL],
973	["Potions" => CFClient::Pickup::PU_POTION],	1215	["Potions" => PICKUP_POTION],
974	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1216	["Magic Devices" => PICKUP_MAGIC_DEVICE],
975	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1217	["Ignore cursed" => PICKUP_NOT_CURSED],
976	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1218	["Jewelery" => PICKUP_JEWELS],
		1219	],
		1220	["Weight/Value ratio", 2, 17]
977	)	1221	)
978	{	1222	{
979	if (ref $_->[1]) {	1223	my ($title, $x, $y, @bits) = @$_;
980	$tbl = $_->[1];
981	$tblrow = 0;
982	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1224	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983	} elsif (not defined $_->[1]) {	1225
984	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);	1226	for (@bits) {
985	} else {	1227	++$y;
		1228
986	my $mask = $_->[1];	1229	my $mask = $_->[1];
987	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1230	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox	1231	$table->add ($x+1, $y, new CFClient::UI::CheckBox
989	state => $CFG->{pickup} & $mask,	1232	state => $CFG->{pickup} & $mask,
990	on_changed => sub {	1233	on_changed => sub {
991	my ($box, $value) = @_;	1234	my ($box, $value) = @_;
		1235
992	if ($value) {	1236	if ($value) {
993	$::CFG->{pickup} \|= $mask;	1237	$::CFG->{pickup} \|= $mask;
994	} else {	1238	} else {
995	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1239	$::CFG->{pickup} &= ~$mask;
996	}	1240	}
		1241
997	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1242	$::CONN->send_command ("pickup $::CFG->{pickup}")
998	if defined $::CONN;	1243	if defined $::CONN;
		1244
		1245	0
999	});	1246	});
1000	}	1247	}
1001	}	1248	}
1002		1249
1003	$vb	1250	$table->add (2, 18, new CFClient::UI::ValSlider
1004	}	1251	range => [0, 0, 16, 1, 1],
		1252	to_value => sub { ">= " . 5 * $_[0] },
		1253	on_changed => sub {
		1254	my ($slider, $value) = @_;
1005		1255
		1256	$::CFG->{pickup} &= ~0x7;
		1257	$::CFG->{pickup} \|= int $value
		1258	if $value;
		1259	1;
		1260	});
		1261	$table->add (3, 18, new CFClient::UI::Button
		1262	text => "set",
		1263	on_activate => sub {
		1264	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1265	if defined $::CONN;
		1266	0
		1267	});
		1268
		1269	$table
		1270	}
		1271
1006	sub make_inventory_window {	1272	sub inventory_window {
1007	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1273	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008	x => "center",	1274	x => "center",
1009	y => "center",	1275	y => "center",
1010	force_w => $WIDTH * 9/10,	1276	force_w => $WIDTH * 9/10,
1011	force_h => $HEIGHT * 9/10,	1277	force_h => $HEIGHT * 9/10,
1012	title => "Inventory",	1278	title => "Inventory",
		1279	has_close_button => 1,
1013	;	1280	;
1014		1281
1015	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1282	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1016		1283
1017	$hb->add (my $vb1 = new CFClient::UI::VBox);	1284	$hb->add (my $vb1 = new CFClient::UI::VBox);
…		…
1053	text => "delete",	1320	text => "delete",
1054	tooltip => "Deletes the binding",	1321	tooltip => "Deletes the binding",
1055	on_activate => sub {	1322	on_activate => sub {
1056	$binding_list->remove ($hb);	1323	$binding_list->remove ($hb);
1057	delete $::CFG->{bindings}->{$mod}->{$sym};	1324	delete $::CFG->{bindings}->{$mod}->{$sym};
		1325	0
1058	});	1326	});
1059		1327
1060	$hb->add (new CFClient::UI::Button	1328	$hb->add (new CFClient::UI::Button
1061	text => "edit",	1329	text => "edit",
1062	tooltip => "Edits the binding",	1330	tooltip => "Edits the binding",
…		…
1075	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1343	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076	$SETUP_DIALOG->show;	1344	$SETUP_DIALOG->show;
1077	});	1345	});
1078	$::BIND_EDITOR->show;	1346	$::BIND_EDITOR->show;
1079	$SETUP_DIALOG->hide;	1347	$SETUP_DIALOG->hide;
		1348	0
1080	});	1349	});
1081		1350
1082	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1351	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1352	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084	}	1353	}
1085	}	1354	}
1086	};	1355	};
1087		1356
1088	my $vb = new CFClient::UI::VBox;	1357	my $vb = new CFClient::UI::VBox;
		1358	$vb->add (my $hb = new CFClient::UI::HBox);
		1359	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1360	$hb->add (new CFClient::UI::CheckBox
		1361	expand => 1,
		1362	state => $CFG->{shift_fire_stop},
		1363	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1364	on_changed => sub {
		1365	my ($cbox, $value) = @_;
		1366	$CFG->{shift_fire_stop} = $value;
		1367	0
		1368	});
		1369
1089	$vb->add ($binding_list);	1370	$vb->add ($binding_list);
1090	$vb->add (my $hb = new CFClient::UI::HBox);	1371	$vb->add (my $hb = new CFClient::UI::HBox);
1091		1372
1092	$hb->add (new CFClient::UI::Button	1373	$hb->add (new CFClient::UI::Button
1093	text => "record new",	1374	text => "record new",
…		…
1103	$SETUP_DIALOG->show;	1384	$SETUP_DIALOG->show;
1104	},	1385	},
1105	sub {	1386	sub {
1106	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1387	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107	$SETUP_DIALOG->show;	1388	$SETUP_DIALOG->show;
1108	});	1389	},
		1390	);
1109	$SETUP_DIALOG->hide;	1391	$SETUP_DIALOG->hide;
1110	$::BIND_EDITOR->show;	1392	$::BIND_EDITOR->show;
		1393	0
1111	},	1394	},
1112	);	1395	);
1113		1396
1114	$hb->add (new CFClient::UI::Button	1397	$hb->add (new CFClient::UI::Button
1115	text => "close",	1398	text => "close",
1116	tooltip => "Closes the binding window",	1399	tooltip => "Closes the binding window",
1117	expand => 1,	1400	expand => 1,
1118	on_activate => sub {	1401	on_activate => sub {
1119	$SETUP_DIALOG->hide;	1402	$SETUP_DIALOG->hide;
		1403	0
1120	}	1404	}
1121	);	1405	);
1122		1406
1123	$refresh->();	1407	$refresh->();
1124		1408
1125	$vb	1409	$vb
1126	}	1410	}
1127		1411
1128	sub make_help_window {	1412	sub help_window {
1129	my $win = new CFClient::UI::FancyFrame	1413	my $win = new CFClient::UI::FancyFrame
1130	x => 'center',	1414	x => 'center',
1131	y => 'center',	1415	y => 'center',
		1416	z => 2,
1132	name => 'doc_browser',	1417	name => 'doc_browser',
1133	force_w => int $WIDTH * 7/8,	1418	force_w => int $WIDTH * 7/8,
1134	force_h => int $HEIGHT * 7/8,	1419	force_h => int $HEIGHT * 7/8,
1135	title => "Documentation";	1420	title => "Documentation";
1136		1421
1137	$win->add (my $vbox = new CFClient::UI::VBox);	1422	$win->add (my $vbox = new CFClient::UI::VBox);
1138		1423
1139	$vbox->add (my $buttons = new CFClient::UI::HBox);	1424	$vbox->add (my $buttons = new CFClient::UI::HBox);
1140	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1425	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1426	expand => 1, fontsize => 0.8, padding_x => 4);
1141		1427
1142	for (	1428	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1429	$buttons->add (my $combo = new CFClient::UI::Combobox
		1430	value => undef,
		1431	options => [
1143	[intro => "Introduction"],	1432	[intro => "Introduction"],
1144	[manual => "Manual"],	1433	[manual => "Manual"],
		1434	[skill_help => "Skills"],
1145	[command_help => "Commands"],	1435	[command_help => "Commands"],
1146	[skill_help => "Skills"],	1436	[dmcommand_help => "DM Commands"],
1147	) {	1437	[COPYING => "License Terms"],
1148	my ($pod, $label) = @$_;	1438	],
		1439	on_changed => sub {
		1440	my ($self, $pod) = @_;
1149		1441
1150	$buttons->add (new CFClient::UI::Button	1442	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151	text => $label,	1443	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152	on_activate => sub {
1153	my $parser = new Pod::POM;
1154	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1155		1444
1156	$viewer->clear;	1445	$viewer->clear;
1157		1446
1158	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1447	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159	for @{ CFClient::pod_to_pango_list $pom };	1448	for @$pom;
1160		1449
1161	$viewer->set_offset (0);	1450	$viewer->set_offset (0);
1162	},	1451	0
		1452	},
		1453	on_visibility_change => sub {
		1454	my ($self, $visible) = @_;
		1455	return unless $visible;
		1456	return if $self->{value};
		1457	$self->set_value ("intro");
		1458	0
		1459	},
1163	);	1460	);
1164	}
1165
1166	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167		1461
1168	$win	1462	$win
1169	}	1463	}
1170		1464
1171	sub sdl_init {	1465	sub sdl_init {
…		…
1211	$DEBUG_STATUS->show;	1505	$DEBUG_STATUS->show;
1212		1506
1213	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1507	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214		1508
1215	$STATUSBOX = new CFClient::UI::Statusbox;	1509	$STATUSBOX = new CFClient::UI::Statusbox;
1216	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1510	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217		1511
1218	(new CFClient::UI::Frame	1512	(new CFClient::UI::Frame
1219	bg => [0, 0, 0, 0.4],	1513	bg => [0, 0, 0, 0.4],
1220	force_x => 0,	1514	force_x => 0,
1221	force_y => "max",	1515	force_y => "max",
…		…
1238	$MAPWIDGET->connect (activate_console => sub {	1532	$MAPWIDGET->connect (activate_console => sub {
1239	my ($mapwidget, $preset) = @_;	1533	my ($mapwidget, $preset) = @_;
1240		1534
1241	if ($CONSOLE) {	1535	if ($CONSOLE) {
1242	$CONSOLE->{input}->{auto_activated} = 1;	1536	$CONSOLE->{input}->{auto_activated} = 1;
1243	$CONSOLE->{input}->focus_in;	1537	$CONSOLE->{input}->grab_focus;
1244		1538
1245	if ($preset && $CONSOLE->{input}->get_text eq '') {	1539	if ($preset && $CONSOLE->{input}->get_text eq '') {
1246	$CONSOLE->{input}->set_text ($preset);	1540	$CONSOLE->{input}->set_text ($preset);
1247	}	1541	}
1248	}	1542	}
1249	});	1543	});
1250	$MAPWIDGET->show;	1544	$MAPWIDGET->show;
1251	$MAPWIDGET->focus_in;	1545	$MAPWIDGET->grab_focus;
1252		1546
1253	$LOGVIEW = new CFClient::UI::TextView	1547	$LOGVIEW = new CFClient::UI::TextScroller
1254	expand => 1,	1548	expand => 1,
1255	font => $FONT_FIXED,	1549	font => $FONT_FIXED,
1256	fontsize => $::CFG->{log_fontsize},	1550	fontsize => $::CFG->{log_fontsize},
		1551	indent => -4,
1257	can_hover => 1,	1552	can_hover => 1,
1258	can_events => 1,	1553	can_events => 1,
1259	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1554	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260	;	1555	;
1261		1556
1262	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1557	$SETUP_DIALOG = new CFClient::UI::FancyFrame
1263	title => "Setup",	1558	title => "Setup",
1264	name => "setup_dialog",	1559	name => "setup_dialog",
1265	x => 'center',	1560	x => 'center',
1266	y => 'center',	1561	y => 'center',
		1562	z => 2,
1267	force_w => $::WIDTH * 0.6,	1563	force_w => $::WIDTH * 0.6,
1268	force_h => $::HEIGHT * 0.6,	1564	force_h => $::HEIGHT * 0.6,
		1565	has_close_button => 1,
1269	;	1566	;
1270		1567
1271	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook);	1568	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1569	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272		1570
1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1571	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274	"Configure the server to play on, your username, password and other server-related options.");	1572	"Configure the server to play on, your username, password and other server-related options.");
1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1573	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1574	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1575	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1576	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1577	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1280	"Configure the use of audio, sound effects and background music.");	1578	"Configure the use of audio, sound effects and background music.");
1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1579	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282	"Lets you define, edit and delete bindings."	1580	"Lets you define, edit and delete bindings."
1283	. "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "	1581	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1284	. "with nothing set and the recording started. After doing the actions you "	1582	. "with nothing set and the recording started. After doing the actions you "
1285	. "want to record press Insert and you will be asked to press a key-combo."	1583	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286	. "After pressing the combo the binding will be saved automatically and the "	1584	. "After pressing the combo the binding will be saved automatically and the "
1287	. "binding editor closes");	1585	. "binding editor closes");
1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1586	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1587	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1588	$SETUP_NOTEBOOK->add (Debug => debug_setup,
		1589	"Some debuggign options. Do not ask.");
1290		1590
1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1591	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292		1592
1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1593	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1594	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295		1595
1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1596	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1597	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298		1598
1299	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	1599	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
1300		1600
1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1601	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1602	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1603	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."	1604	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1305	."You can also hit the Tab-key to show/hide the Inventory.");	1605	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306		1606
1307	$BUTTONBAR->add (new CFClient::UI::Button	1607	$BUTTONBAR->add (new CFClient::UI::Button
1308	text => "Save Config",	1608	text => "Save Config",
1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1609	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310	on_activate => sub {	1610	on_activate => sub {
1311	$::CFG->{layout} = CFClient::UI::get_layout;	1611	$::CFG->{layout} = CFClient::UI::get_layout;
1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1612	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313	status "Configuration Saved";	1613	status "Configuration Saved";
		1614	0
1314	},	1615	},
1315	);	1616	);
1316		1617
1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1618	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1318	tooltip => "View Documentation");	1619	tooltip => "View Documentation");
1319		1620
1320	$BUTTONBAR->add (new CFClient::UI::Button	1621	$BUTTONBAR->add (new CFClient::UI::Button
1321	text => "Quit",	1622	text => "Quit",
1322	tooltip => "Terminates the program",	1623	tooltip => "Terminates the program",
…		…
1324	if ($CONN) {	1625	if ($CONN) {
1325	open_quit_dialog;	1626	open_quit_dialog;
1326	} else {	1627	} else {
1327	exit;	1628	exit;
1328	}	1629	}
		1630	0
1329	},	1631	},
1330	);	1632	);
1331		1633
1332	$BUTTONBAR->show;	1634	$BUTTONBAR->show;
1333	$SETUP_DIALOG->show;	1635	$SETUP_DIALOG->show;
…		…
1335		1637
1336	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1638	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337	}	1639	}
1338		1640
1339	sub video_shutdown {	1641	sub video_shutdown {
		1642	CFClient::OpenGL::shutdown;
		1643
1340	undef $SDL_ACTIVE;	1644	undef $SDL_ACTIVE;
1341	}	1645	}
1342		1646
1343	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1647	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344	my $bgmusic;#TODO#hack#d#	1648	my $bgmusic;#TODO#hack#d#
…		…
1570	map_scale => 1,	1874	map_scale => 1,
1571	fow_enable => 1,	1875	fow_enable => 1,
1572	fow_intensity => 0.45,	1876	fow_intensity => 0.45,
1573	fow_smooth => 0,	1877	fow_smooth => 0,
1574	gui_fontsize => 1,	1878	gui_fontsize => 1,
1575	log_fontsize => 1,	1879	log_fontsize => 0.7,
1576	gauge_fontsize=> 1,	1880	gauge_fontsize=> 1,
1577	gauge_size => 0.35,	1881	gauge_size => 0.35,
1578	stat_fontsize => 1,	1882	stat_fontsize => 0.7,
1579	mapsize => 100,	1883	mapsize => 100,
1580	host => "crossfire.schmorp.de",	1884	host => "crossfire.schmorp.de",
1581	say_command => 'say',	1885	say_command => 'say',
1582	audio_enable => 1,	1886	audio_enable => 1,
1583	bgm_enable => 1,	1887	bgm_enable => 1,
1584	bgm_volume => 0.25,	1888	bgm_volume => 0.25,
1585	face_prefetch => 0,	1889	face_prefetch => 0,
1586	output_sync => 1,	1890	output_sync => 1,
1587	output_count => 1,	1891	output_count => 1,
		1892	pickup => 0,
1588	);	1893	);
1589		1894
1590	while (my ($k, $v) = each %DEF_CFG) {	1895	while (my ($k, $v) = each %DEF_CFG) {
1591	$CFG->{$k} = $v unless exists $CFG->{$k};	1896	$CFG->{$k} = $v unless exists $CFG->{$k};
1592	}	1897	}
…		…
1639	video_init;	1944	video_init;
1640	audio_init;	1945	audio_init;
1641	}	1946	}
1642		1947
1643	Event::loop;	1948	Event::loop;
		1949	#CFClient::SDL_Quit;
		1950	#CFClient::_exit 0;
1644		1951
1645	END { CFClient::SDL_Quit }	1952	END { CFClient::SDL_Quit }
1646		1953
1647	=head1 NAME	1954	=head1 NAME
1648		1955

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs. Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC