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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC vs. Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC