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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.58 by root, Mon Jun 5 22:07:43 2006 UTC vs. Revision 1.82 by elmex, Wed Jun 28 10:37:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.58 by root, Mon Jun 5 22:07:43 2006 UTC vs.
Revision 1.82 by elmex, Wed Jun 28 10:37:19 2006 UTC