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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs. Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC