ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.72 by elmex, Tue Jun 13 18:14:03 2006 UTC vs.
Revision 1.107 by root, Sun Aug 13 03:20:56 2006 UTC

…		…
32	use Crossfire;	32	use Crossfire;
33	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
34		34
35	use Compress::LZF;	35	use Compress::LZF;
36		36
37	use CFClient;	37	use CFPlus;
38	use CFClient::OpenGL ();	38	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	39	use CFPlus::Protocol;
40	use CFClient::UI;	40	use CFPlus::UI;
		41	use CFPlus::Pod;
		42	use CFPlus::BindingEditor;
41	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
42		44
43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		46	$SIG{PIPE} = 'IGNORE';
44		47
		48	$Event::Eval = 0;
45	$Event::DIED = sub {	49	$Event::DIED = sub {
46	# TODO: display dialog box or so	50	# TODO: display dialog box or so
47	Carp::confess $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
48	CFClient::error $_[1];	52	CFPlus::error $_[1];
49	};	53	};
50		54
51	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	55	$SIG{__DIE__} = sub {
		56	return if CFPlus::in_destruct;
		57	Carp::cluck $_[0];
		58	CFPlus::error $_[0];
		59	return;#d#
		60	#return unless defined $^S && !$^S;
		61	$Event::DIED->(undef, $_[0]);
		62	};
52		63
53	our $VERSION = '0.1';	64	our $VERSION = '0.1';
54		65
55	my $MAX_FPS = 60;	66	my $MAX_FPS = 60;
56	my $MIN_FPS = 5; # unused as of yet	67	my $MIN_FPS = 5; # unused as of yet
…		…
84	our $CONSOLE;	95	our $CONSOLE;
85	our $METASERVER;	96	our $METASERVER;
86	our $LOGIN_BUTTON;	97	our $LOGIN_BUTTON;
87	our $QUIT_DIALOG;	98	our $QUIT_DIALOG;
88	our $HOST_ENTRY;	99	our $HOST_ENTRY;
		100	our $FULLSCREEN_ENABLE;
		101	our $PICKUP_ENABLE;
89	our $SERVER_INFO;	102	our $SERVER_INFO;
90		103
91	our $SETUP_DIALOG;	104	our $SETUP_DIALOG;
92	our $SETUP_NOTEBOOK;	105	our $SETUP_NOTEBOOK;
93	our $SETUP_SERVER;	106	our $SETUP_SERVER;
94	our $SETUP_KEYBOARD;	107	our $SETUP_KEYBOARD;
95	our $SETUP_SPELLS;
96		108
		109	our $PL_NOTEBOOK;
97	our $STATS_WINDOW;	110	our $PL_WINDOW;
		111
		112	our $INVENTORY_PAGE;
		113	our $STATS_PAGE;
		114	our $SKILL_PAGE;
		115	our $SPELL_PAGE;
		116
		117	our $HELP_WINDOW;
98	our $MESSAGE_WINDOW;	118	our $MESSAGE_WINDOW;
99	our $FLOORBOX;	119	our $FLOORBOX;
100	our $GAUGES;	120	our $GAUGES;
101	our $STATWIDS;	121	our $STATWIDS;
102		122
…		…
109		129
110	our $ALT_ENTER_MESSAGE;	130	our $ALT_ENTER_MESSAGE;
111	our $STATUSBOX;	131	our $STATUSBOX;
112	our $DEBUG_STATUS;	132	our $DEBUG_STATUS;
113		133
114	our $INV_WINDOW;
115	our $INV;	134	our $INV;
116	our $INVR;	135	our $INVR;
117	our $INV_RIGHT_HB;	136	our $INV_RIGHT_HB;
118		137
119	our $BIND_EDITOR;	138	our $BIND_EDITOR;
		139	our $BIND_UPD_CB;
120		140
121	our $PICKUP_CFG;	141	our $PICKUP_CFG;
122		142
123	sub status {	143	sub status {
124	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	144	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
125	}	145	}
126		146
127	sub debug {	147	sub debug {
128	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
129	}	149	}
…		…
135		155
136	# server query dialog	156	# server query dialog
137	sub server_query {	157	sub server_query {
138	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
139		159
140	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
141	x => "center",	161	x => "center",
142	y => "center",	162	y => "center",
143	title => "Server Query",	163	title => "Server Query",
144	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
145	;	165	;
146		166
147	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
148	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
149	ellipsise => 0,	169	ellipsise => 0,
150	text => $prompt;	170	text => $prompt;
151		171
152	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
153	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
154		174
155	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
156	text => "No",	176	text => "No",
157	on_activate => sub {	177	on_activate => sub {
158	$conn->send ("reply n");	178	$conn->send ("reply n");
159	$dialog->destroy;	179	$dialog->destroy;
		180	0
160	}	181	}
161	);	182	);
162	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
163	text => "Yes",	184	text => "Yes",
164	on_activate => sub {	185	on_activate => sub {
165	$conn->send ("reply y");	186	$conn->send ("reply y");
166	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
		188	0
167	},	189	},
168	);	190	);
169		191
170	$dialog->focus_in;	192	$dialog->grab_focus;
171		193
172	} elsif ($flags & CS_QUERY_SINGLECHAR) {	194	} elsif ($flags & CS_QUERY_SINGLECHAR) {
173	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174		196
175	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	197	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
177		199
178	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
179	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
180	ellipsise => 0,	202	ellipsise => 0,
181	markup => "\nOr use your keyboard:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
182		204
183	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
184		206
185	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
186	text => "Next Race",	208	text => "Next Race",
187	on_activate => sub {	209	on_activate => sub {
188	$conn->send ("reply n");	210	$conn->send ("reply n");
189	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
		212	0
190	},	213	},
191	);	214	);
192	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
193	text => "Accept",	216	text => "Accept",
194	on_activate => sub {	217	on_activate => sub {
195	$conn->send ("reply d");	218	$conn->send ("reply d");
196	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
		220	0
197	},	221	},
198	);	222	);
199		223
200	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
201	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
202	ellipsise => 0,	226	ellipsise => 0,
203	markup =>	227	markup =>
204	"<big><b>Character Creation: Race</b></big>\n\n"	228	"<big><b>Character Creation: Race</b></big>\n\n"
205	. "Look at the <b>Messages</b> window to see a description of this race "	229	. "Look at the <b>Messages</b> window to see a description of this race "
206	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207	. "and the center of the screen to see how this race looks like "	230	. "and the center of the screen to see how this race looks like "
208	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"	231	. "(<small>below this dialog window: you may need to move the dialog away and "
		232	. "click into the display area to make it visible</small>).\n\n"
209	. "You can look at another race, or accept this race (you will come back to this race eventually, "	233	. "You can look at another race, or accept this race (you will cycle back to "
210	. "so you can take your time making this important choice."	234	. "this race eventually, so you can take your time making this important choice."
211	;	235	;
212		236
213	} elsif ($prompt =~ /roll new stats/) {	237	} elsif ($prompt =~ /roll new stats/) {
214	if (my $stat = delete $conn->{stat_change_with}) {	238	if (my $stat = delete $conn->{stat_change_with}) {
215	$conn->send ("reply $stat");	239	$conn->send ("reply $stat");
216	destroy_query_dialog $conn;	240	destroy_query_dialog $conn;
217	return;	241	return;
218	}	242	}
219		243
220	$STATS_WINDOW->show;	244	$STATS_PAGE->show;
221	$MESSAGE_WINDOW->hide;	245	$MESSAGE_WINDOW->hide;
222		246
223	unshift @dialog, new CFClient::UI::Label	247	unshift @dialog, new CFPlus::UI::Label
224	max_w => $::WIDTH * 0.4,	248	max_w => $::WIDTH * 0.4,
225	ellipsise => 0,	249	ellipsise => 0,
226	markup => "\nOr use your keyboard:\n";	250	markup => "\nOr use your keyboard and the text entry below:\n";
227		251
228	unshift @dialog, my $table = new CFClient::UI::Table;	252	unshift @dialog, my $table = new CFPlus::UI::Table;
229		253
230	# left: re-roll	254	# left: re-roll
231	$table->add (0, 0, new CFClient::UI::Button	255	$table->add (0, 0, new CFPlus::UI::Button
232	text => "Roll Again",	256	text => "Roll Again",
233	on_activate => sub {	257	on_activate => sub {
234	$conn->send ("reply y");	258	$conn->send ("reply y");
235	destroy_query_dialog $conn;	259	destroy_query_dialog $conn;
		260	0
236	},	261	},
237	);	262	);
238		263
239	# center: swap stats	264	# center: swap stats
240	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	265	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		266	expand => 1,
241	value => $_,	267	value => $_,
242	options => [	268	options => [
243	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],	271	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
…		…
248	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	274	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	275	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250	],	276	],
251	), 1 .. 2;	277	), 1 .. 2;
252		278
253	$table->add (2, 0, new CFClient::UI::Button	279	$table->add (2, 0, new CFPlus::UI::Button
254	text => "Swap Stats",	280	text => "Swap Stats",
255	on_activate => sub {	281	on_activate => sub {
256	$conn->{stat_change_with} = $sw2->{value};	282	$conn->{stat_change_with} = $sw2->{value};
257	$conn->send ("reply $sw1->{value}");	283	$conn->send ("reply $sw1->{value}");
258	destroy_query_dialog $conn;	284	destroy_query_dialog $conn;
		285	0
259	},	286	},
260	);	287	);
261	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	288	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
262		289
263	# right: accept	290	# right: accept
264	$table->add (4, 0, new CFClient::UI::Button	291	$table->add (4, 0, new CFPlus::UI::Button
265	text => "Accept",	292	text => "Accept",
266	on_activate => sub {	293	on_activate => sub {
267	$conn->send ("reply n");	294	$conn->send ("reply n");
268	$STATS_WINDOW->hide;	295	$STATS_PAGE->hide;
269	destroy_query_dialog $conn;	296	destroy_query_dialog $conn;
		297	0
270	},	298	},
271	);	299	);
272		300
		301	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		302	for (
		303	[Str => CS_STAT_STR],
		304	[Dex => CS_STAT_DEX],
		305	[Con => CS_STAT_CON],
		306	[Int => CS_STAT_INT],
		307	[Wis => CS_STAT_WIS],
		308	[Pow => CS_STAT_POW],
		309	[Cha => CS_STAT_CHA],
		310	) {
		311	my ($name, $id) = @$_;
		312	$hbox->add (new CFPlus::UI::Label
		313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		314	align => 0,
		315	expand => 1,
		316	can_events => 1,
		317	can_hover => 1,
		318	tooltip => "#stat_$name",
		319	);
		320	}
		321
273	unshift @dialog, new CFClient::UI::Label	322	unshift @dialog, new CFPlus::UI::Label
274	max_w => $::WIDTH * 0.4,	323	max_w => $::WIDTH * 0.4,
275	ellipsise => 0,	324	ellipsise => 0,
276	markup =>	325	markup =>
277	"<big><b>Character Creation: Stats</b></big>\n\n"	326	"<big><b>Character Creation: Stats</b></big>\n\n"
278	. "Look at the <b>Stats</b> window to see your basic stats "	327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
279	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"	328	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
		329	. "They will be modified later by both the race and the class you choose.\n\n"
280	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "	330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
281	. "Race selection will influence those values later on."
282	;	331	;
283	}	332	}
284		333
285	push @dialog, my $entry = new CFClient::UI::Entry	334	push @dialog, my $entry = new CFPlus::UI::Entry
286	on_changed => sub {	335	on_changed => sub {
287	$conn->send ("reply $_[1]");	336	$conn->send ("reply $_[1]");
288	destroy_query_dialog $conn;	337	destroy_query_dialog $conn;
		338	0
289	},	339	},
290	;	340	;
291		341
292	$entry->focus_in;	342	$entry->grab_focus;
293		343
294	} else {	344	} else {
295	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	345	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296		346
297	push @dialog, my $entry = new CFClient::UI::Entry	347	push @dialog, my $entry = new CFPlus::UI::Entry
298	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299	on_activate => sub {	349	on_activate => sub {
300	$conn->send ("reply $_[1]");	350	$conn->send ("reply $_[1]");
301	destroy_query_dialog $conn;	351	destroy_query_dialog $conn;
		352	0
302	},	353	},
303	;	354	;
304		355
305	$entry->focus_in;	356	$entry->grab_focus;
306	}	357	}
307		358
308	$vbox->add (@dialog);	359	$vbox->add (@dialog);
309	$dialog->show;	360	$dialog->show;
310	}	361	}
…		…
315	$LOGIN_BUTTON->set_text ("Logout");	366	$LOGIN_BUTTON->set_text ("Logout");
316	$SETUP_DIALOG->hide;	367	$SETUP_DIALOG->hide;
317		368
318	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	369	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319		370
320	my ($host, $port) = split /:/, $CFG->{host};	371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321		372
322	$MAP = new CFClient::Map $mapsize, $mapsize;	373	$MAP = new CFPlus::Map $mapsize, $mapsize;
323		374
324	$CONN = eval {	375	$CONN = eval {
325	new CFClient::Protocol	376	new CFPlus::Protocol
326	host => $host,	377	host => $host,
327	port => $port || 13327,	378	port => $port || 13327,
328	user => $CFG->{user},	379	user => $CFG->{profile}{default}{user},
329	pass => $CFG->{password},	380	pass => $CFG->{profile}{default}{password},
330	mapw => $mapsize,	381	mapw => $mapsize,
331	maph => $mapsize,	382	maph => $mapsize,
332		383
333	map_widget => $MAPWIDGET,	384	map_widget => $MAPWIDGET,
334	logview => $LOGVIEW,	385	logview => $LOGVIEW,
…		…
349	$chunk->play;	400	$chunk->play;
350	},	401	},
351	};	402	};
352		403
353	if ($CONN) {	404	if ($CONN) {
354	CFClient::lowdelay fileno $CONN->{fh};	405	CFPlus::lowdelay fileno $CONN->{fh};
355		406
356	status "login successful";	407	status "login successful";
357	} else {	408	} else {
358	status "unable to connect";	409	status "unable to connect";
359	stop_game();	410	stop_game();
…		…
362		413
363	sub stop_game {	414	sub stop_game {
364	$LOGIN_BUTTON->set_text ("Login");	415	$LOGIN_BUTTON->set_text ("Login");
365	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	416	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366	$SETUP_DIALOG->show;	417	$SETUP_DIALOG->show;
367	$INV_WINDOW->hide;	418	$PL_WINDOW->hide;
368	$SETUP_SPELLS->clear_spells;	419	$SPELL_PAGE->clear_spells;
369		420
370	return unless $CONN;	421	return unless $CONN;
371		422
372	status "connection closed";	423	status "connection closed";
373		424
374	destroy_query_dialog $CONN;	425	destroy_query_dialog $CONN;
375	$CONN->destroy;	426	$CONN->destroy;
376	$CONN = 0; # false, does not autovivify	427	$CONN = 0; # false, does not autovivify
		428
		429	undef $MAP;
377	}	430	}
378		431
379	sub graphics_setup {	432	sub graphics_setup {
380	my $vbox = new CFClient::UI::VBox;	433	my $vbox = new CFPlus::UI::VBox;
381		434
382	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	435	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
383		436
384	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	437	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
385	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	438	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
386		439
387	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	440	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
388	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	441	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
389		442
390	$mode_slider->connect (changed => sub {	443	$mode_slider->connect (changed => sub {
391	my ($self, $value) = @_;	444	my ($self, $value) = @_;
392		445
393	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	446	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
395	});	448	});
396	$mode_slider->emit (changed => $mode_slider->{range}[0]);	449	$mode_slider->emit (changed => $mode_slider->{range}[0]);
397		450
398	my $row = 1;	451	my $row = 1;
399		452
400	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	453	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
401	$table->add (1, $row++, new CFClient::UI::CheckBox	454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
402	state => $CFG->{fullscreen},	455	state => $CFG->{fullscreen},
403	tooltip => "Bring the client into fullscreen mode.",	456	tooltip => "Bring the client into fullscreen mode.",
404	on_changed => sub {	457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405	my ($self, $value) = @_;
406	$CFG->{fullscreen} = $value;
407	}
408	);	458	);
409		459
410	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	460	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
411	$table->add (1, $row++, new CFClient::UI::CheckBox	461	$table->add (1, $row++, new CFPlus::UI::CheckBox
412	state => $CFG->{fast},	462	state => $CFG->{fast},
413	tooltip => "Lower the visual quality considerably to speed up rendering.",	463	tooltip => "Lower the visual quality considerably to speed up rendering.",
414	on_changed => sub {	464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415	my ($self, $value) = @_;
416	$CFG->{fast} = $value;
417	}
418	);	465	);
419		466
420	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	467	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
421	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFPlus::UI::Slider
422	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424	on_changed => sub {	471	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425	my ($self, $value) = @_;
426	$CFG->{map_scale} = 2 ** $value;
427	}
428	);	472	);
429		473
430	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	474	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
431	$table->add (1, $row++, new CFClient::UI::CheckBox	475	$table->add (1, $row++, new CFPlus::UI::CheckBox
432	state => $CFG->{fow_enable},	476	state => $CFG->{fow_enable},
433	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	477	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434	on_changed => sub {	478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435	my ($self, $value) = @_;
436	$CFG->{fow_enable} = $value;
437	}
438	);	479	);
439		480
440	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	481	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
441	$table->add (1, $row++, new CFClient::UI::Slider	482	$table->add (1, $row++, new CFPlus::UI::Slider
442	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	484	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
444	on_changed => sub {	485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445	my ($self, $value) = @_;
446	$CFG->{fow_intensity} = $value;
447	}
448	);	486	);
449		487
450	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	488	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
451	$table->add (1, $row++, new CFClient::UI::CheckBox	489	$table->add (1, $row++, new CFPlus::UI::CheckBox
452	state => $CFG->{fow_smooth},	490	state => $CFG->{fow_smooth},
453	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	491	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
454	on_changed => sub {	492	on_changed => sub {
455	my ($self, $value) = @_;	493	my ($self, $value) = @_;
456	$CFG->{fow_smooth} = $value;	494	$CFG->{fow_smooth} = $value;
457	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	495	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
		496	0
458	}	497	}
459	);	498	);
460		499
461	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	500	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
462	$table->add (1, $row++, new CFClient::UI::Slider	501	$table->add (1, $row++, new CFPlus::UI::Slider
463	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	503	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
465	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466	);	505	);
467		506
468	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	507	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
469	$table->add (1, $row++, new CFClient::UI::Slider	508	$table->add (1, $row++, new CFPlus::UI::Slider
470	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	510	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
472	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473	);	512	);
474		513
475	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476
477	$table->add (1, $row++, new CFClient::UI::Slider
478	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480	on_changed => sub {
481	$CFG->{stat_fontsize} = $_[1];
482	&set_stats_window_fontsize;
483	}
484	);
485
486	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	514	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487	$table->add (1, $row++, new CFClient::UI::Slider	515	$table->add (1, $row++, new CFPlus::UI::Slider
488	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	517	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490	on_changed => sub {	518	on_changed => sub {
491	$CFG->{gauge_fontsize} = $_[1];	519	$CFG->{gauge_fontsize} = $_[1];
492	&set_gauge_window_fontsize;	520	&set_gauge_window_fontsize;
		521	0
493	}	522	}
494	);	523	);
495		524
496	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
497	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFPlus::UI::Slider
498	range => [$CFG->{gauge_size}, 0.2, 0.8],	527	range => [$CFG->{gauge_size}, 0.2, 0.8],
499	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	528	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500	on_changed => sub {	529	on_changed => sub {
501	$CFG->{gauge_size} = $_[1];	530	$CFG->{gauge_size} = $_[1];
502	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		532	0
503	}	533	}
504	);	534	);
505		535
506	$table->add (1, $row++, new CFClient::UI::Button	536	$table->add (1, $row++, new CFPlus::UI::Button
507	expand => 1, align => 0, text => "Apply",	537	expand => 1, align => 0, text => "Apply",
508	tooltip => "Apply the video settings",	538	tooltip => "Apply the video settings",
509	on_activate => sub {	539	on_activate => sub {
510	video_shutdown ();	540	video_shutdown ();
511	video_init ();	541	video_init ();
		542	0
512	}	543	}
513	);	544	);
514		545
515	$vbox	546	$vbox
516	}	547	}
517		548
518	sub audio_setup {	549	sub audio_setup {
519	my $vbox = new CFClient::UI::VBox;	550	my $vbox = new CFPlus::UI::VBox;
520		551
521	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	552	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
522		553
523	my $row = 0;	554	my $row = 0;
524		555
525	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	556	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
526	$table->add (1, $row++, new CFClient::UI::CheckBox	557	$table->add (1, $row++, new CFPlus::UI::CheckBox
527	state => $CFG->{audio_enable},	558	state => $CFG->{audio_enable},
528	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.",	559	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.",
529	on_changed => sub {	560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530	$CFG->{audio_enable} = $_[1];
531	}
532	);	561	);
533	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	562	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
534	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	563	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535	# $CFG->{effects_volume} = $_[1];	564	# $CFG->{effects_volume} = $_[1];
536	# });	565	# });
537	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	566	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
538	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	567	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
539	$hbox->add (new CFClient::UI::CheckBox	568	$hbox->add (new CFPlus::UI::CheckBox
540	expand => 1, state => $CFG->{bgm_enable},	569	expand => 1, state => $CFG->{bgm_enable},
541	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	570	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542	on_changed => sub {	571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543	$CFG->{bgm_enable} = $_[1];
544	}
545	);	572	);
546	$hbox->add (new CFClient::UI::Slider	573	$hbox->add (new CFPlus::UI::Slider
547	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548	tooltip => "The volume of the background music. Changes are instant.",	575	tooltip => "The volume of the background music. Changes are instant.",
549	on_changed => sub {	576	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
550	$CFG->{bgm_volume} = $_[1];
551	CFClient::MixMusic::volume $_[1] * 128;
552	}
553	);	577	);
554		578
555	$table->add (1, $row++, new CFClient::UI::Button	579	$table->add (1, $row++, new CFPlus::UI::Button
556	expand => 1, align => 0, text => "Apply",	580	expand => 1, align => 0, text => "Apply",
557	tooltip => "Apply the audio settings",	581	tooltip => "Apply the audio settings",
558	on_activate => sub {	582	on_activate => sub {
559	audio_shutdown ();	583	audio_shutdown ();
560	audio_init ();	584	audio_init ();
		585	0
561	}	586	}
562	);	587	);
563		588
564	$vbox	589	$vbox
565	}
566
567	sub set_stats_window_fontsize {
568	for (values %{$STATWIDS}) {
569	$_->set_fontsize ($::CFG->{stat_fontsize});
570	}
571	}	590	}
572		591
573	sub set_gauge_window_fontsize {	592	sub set_gauge_window_fontsize {
574	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	593	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575	$_->set_fontsize ($::CFG->{gauge_fontsize});	594	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
577	}	596	}
578		597
579	sub make_gauge_window {	598	sub make_gauge_window {
580	my $gh = int $HEIGHT * $CFG->{gauge_size};	599	my $gh = int $HEIGHT * $CFG->{gauge_size};
581		600
582	my $win = new CFClient::UI::Frame (	601	my $win = new CFPlus::UI::Frame (
583	force_x => 0,	602	force_x => 0,
584	force_y => "max",	603	force_y => "max",
585	force_w => $WIDTH,	604	force_w => $WIDTH,
586	force_h => $gh,	605	force_h => $gh,
587	);	606	);
588		607
589	$win->add (my $hbox = new CFClient::UI::HBox	608	$win->add (my $hbox = new CFPlus::UI::HBox
590	children => [	609	children => [
591	(new CFClient::UI::HBox expand => 1),	610	(new CFPlus::UI::HBox expand => 1),
592	(new CFClient::UI::VBox children => [	611	(new CFPlus::UI::VBox children => [
593	(new CFClient::UI::Empty expand => 1),	612	(new CFPlus::UI::Empty expand => 1),
594	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	613	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
595	]),	614	]),
596	(my $vbox = new CFClient::UI::VBox),	615	(my $vbox = new CFPlus::UI::VBox),
597	],	616	],
598	);	617	);
599		618
600	$vbox->add (new CFClient::UI::HBox	619	$vbox->add (new CFPlus::UI::HBox
601	expand => 1,	620	expand => 1,
602	children => [	621	children => [
603	(new CFClient::UI::Empty expand => 1),	622	(new CFPlus::UI::Empty expand => 1),
604	(my $hb = new CFClient::UI::HBox),	623	(my $hb = new CFPlus::UI::HBox),
605	],	624	],
606	);	625	);
607		626
608	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	627	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
609	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");	628	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
610	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	629	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
611	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");	630	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
612	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	631	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
613	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");	632	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
614	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	633	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
615	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");	634	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
616		635
617	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	636	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
618	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");	637	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
619	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	638	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
620	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");	639	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
621		640
622	$GAUGES = {	641	$GAUGES = {
623	exp => $exp, win => $win, range => $rng,	642	exp => $exp, win => $win, range => $rng,
624	food => $fg, mana => $mg, hp => $hg, grace => $gg	643	food => $fg, mana => $mg, hp => $hg, grace => $gg
…		…
628		647
629	$win	648	$win
630	}	649	}
631		650
632	sub debug_setup {	651	sub debug_setup {
633	my $table = new CFClient::UI::Table;	652	my $table = new CFPlus::UI::Table;
634		653
635	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	654	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
636	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });	655	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
637	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	656	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
638	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });	657	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
639	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	658	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
640	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });	659	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
641	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	660	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
642	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });	661	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643		662
644	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	663	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645		664
646	for my $x (0..2) {	665	for my $x (0..2) {
647	for my $y (0 .. 2) {	666	for my $y (0 .. 2) {
648	$table->add ($x + 3, $y,	667	$table->add ($x + 3, $y,
649	new CFClient::UI::Entry	668	new CFPlus::UI::Entry
650	text => $default_smooth[$x * 3 + $y],	669	text => $default_smooth[$x * 3 + $y],
651	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	670	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652	);	671	);
653	}	672	}
654	}	673	}
…		…
656		675
657	$table	676	$table
658	}	677	}
659		678
660	sub stats_window {	679	sub stats_window {
661	my $tgw = new CFClient::UI::FancyFrame	680	my $r = new CFPlus::UI::ScrolledWindow (
662	y => $HEIGHT * (2/8),	681	expand => 1,
663	x => "max",	682	scroll_y => 1
664	title => "Stats",	683	);
665	name => "stats_window";	684	$r->add (my $vb = new CFPlus::UI::VBox);
666		685
667	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
668	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	686	$vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669	can_hover => 1, can_events => 1,	687	can_hover => 1, can_events => 1,
670	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	688	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	689	$vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672	can_hover => 1, can_events => 1,	690	can_hover => 1, can_events => 1,
673	tooltip => "The map you are currently on (if supported by the server).");	691	tooltip => "The map you are currently on (if supported by the server).");
674		692
675	$vb->add (my $hb0 = new CFClient::UI::HBox);	693	$vb->add (my $hb0 = new CFPlus::UI::HBox);
676	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	694	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677	can_hover => 1, can_events => 1,	695	can_hover => 1, can_events => 1,
678	tooltip => "The weight of the player including all inventory items.");	696	tooltip => "The weight of the player including all inventory items.");
679	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	697	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680	can_hover => 1, can_events => 1,	698	can_hover => 1, can_events => 1,
681	tooltip => "The weight limit: you cannot carry more than this.");	699	tooltip => "The weight limit: you cannot carry more than this.");
682		700
683
684	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	701	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
685	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	702	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
686		703
687	my $color2 = [1, 1, 0];	704	my $color2 = [1, 1, 0];
688		705
689	for (	706	for (
690	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	707	[0, 0, st_str => "Str", 30],
691	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	708	[0, 1, st_dex => "Dex", 30],
692	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	709	[0, 2, st_con => "Con", 30],
693	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	710	[0, 3, st_int => "Int", 30],
694	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	711	[0, 4, st_wis => "Wis", 30],
695	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	712	[0, 5, st_pow => "Pow", 30],
696	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	713	[0, 6, st_cha => "Cha", 30],
697		714
698	[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."],	715	[2, 0, st_wc => "Wc", -120],
699	[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."],	716	[2, 1, st_ac => "Ac", -120],
700	[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."],	717	[2, 2, st_dam => "Dam", 120],
701	[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."],	718	[2, 3, st_arm => "Arm", 120],
702	[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."],	719	[2, 4, st_spd => "Spd", 10.54],
703	[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."],	720	[2, 5, st_wspd => "WSp", 10.54],
704	) {	721	) {
705	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	722	my ($col, $row, $id, $label, $template) = @$_;
706		723
707	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
708	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		726	align => +1, template => $template, tooltip => "#stat_$label");
709	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	727	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		729	align => -1, text => $label, tooltip => "#stat_$label");
711	}	730	}
712		731
713	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	732	$vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
714		733
715	my $row = 0;	734	my $row = 0;
716	my $col = 0;	735	my $col = 0;
717		736
718	my %resist_names = (	737	my %resist_names = (
		738	slow => ["Slow",
719	slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",	739	"<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
		740	holyw => ["Holy Word",
720	holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",	741	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		742	conf => ["Confusion",
721	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	743	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		744	fire => ["Fire",
722	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	745	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		746	depl => ["Depletion",
723	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	747	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		748	magic => ["Magic",
724	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	749	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		750	drain => ["Draining",
725	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	751	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		752	acid => ["Acid",
726	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	753	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		754	pois => ["Poison",
727	pois => "<b>Poison</b> (resistance to getting poisoned)",	755	"<b>Poison</b> (resistance to getting poisoned)"],
		756	para => ["Paralysation",
728	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	757	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		758	deat => ["Death",
729	deat => "<b>Death</b> (resistance against death spells)",	759	"<b>Death</b> (resistance against death spells)"],
730	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	760	phys => ["Physical",
		761	"<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.)"],
		762	blind => ["Blind",
731	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	763	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		764	fear => ["Fear",
732	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)",	765	"<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)"],
		766	tund => ["Turn undead",
733	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	767	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		768	elec => ["Electricity",
734	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	769	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		770	cold => ["Cold",
735	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	771	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		772	ghit => ["Ghost hit",
736	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	773	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737	);	774	);
738	for (qw/slow holyw conf fire depl magic	775	for (qw/slow holyw conf fire depl magic
739	drain acid pois para deat phys	776	drain acid pois para deat phys
740	blind fear tund elec cold ghit/)	777	blind fear tund elec cold ghit/)
741	{	778	{
742	$tbl2->add ($col, $row,	779	$tbl2->add ($col, $row,
743	$STATWIDS->{"res_$_"} =	780	$STATWIDS->{"res_$_"} =
744	new CFClient::UI::Label	781	new CFPlus::UI::Label
745	font => $FONT_FIXED,	782	font => $FONT_FIXED,
746	template => "-100%",	783	template => "-100%",
747	align => +1,	784	align => +1,
748	valign => 0,	785	valign => 0,
749	can_events => 1,	786	can_events => 1,
750	can_hover => 1,	787	can_hover => 1,
751	tooltip => $resist_names{$_},	788	tooltip => $resist_names{$_}->[1],
752	);	789	);
753	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	790	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
754	font => $FONT_FIXED,	791	font => $FONT_FIXED,
755	can_hover => 1,	792	can_hover => 1,
756	can_events => 1,	793	can_events => 1,
757	image => "ui/resist/resist_$_.png",	794	path => "ui/resist/resist_$_.png",
758	tooltip => $resist_names{$_},	795	tooltip => $resist_names{$_}->[1],
		796	);
		797	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
		798	text => $resist_names{$_}->[0],
		799	font => $FONT_FIXED,
		800	can_hover => 1,
		801	can_events => 1,
		802	tooltip => $resist_names{$_}->[1],
759	);	803	);
760		804
761	$row++;	805	$row++;
762	if ($row % 6 == 0) {	806	if ($row % 6 == 0) {
763	$col += 2;	807	$col += 3;
764	$row = 0;	808	$row = 0;
765	}	809	}
766	}	810	}
767		811
768	&set_stats_window_fontsize;
769	update_stats_window ({});	812	#update_stats_window ({});
770		813
		814	$r
		815	}
		816
		817	sub skill_window {
		818	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		819	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771	$tgw	820	$sw
772	}	821	}
773		822
774	sub formsep($) {	823	sub formsep($) {
775	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776	}	825	}
777		826
778	sub update_stats_window {
779	my ($stats) = @_;
780
781	# I love text protocols...
782
783	my $hp = $stats->{+CS_STAT_HP} * 1;
784	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
785	my $sp = $stats->{+CS_STAT_SP} * 1;
786	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
787	my $fo = $stats->{+CS_STAT_FOOD} * 1;
788	my $fo_m = 999;
789	my $gr = $stats->{+CS_STAT_GRACE} * 1;
790	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
791
792	$GAUGES->{hp} ->set_value ($hp, $hp_m);
793	$GAUGES->{mana} ->set_value ($sp, $sp_m);
794	$GAUGES->{food} ->set_value ($fo, $fo_m);
795	$GAUGES->{grace} ->set_value ($gr, $gr_m);
796	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
797	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
798	my $rng = $stats->{+CS_STAT_RANGE};
799	$rng =~ s/^Range: //; # thank you so much dear server
800	$GAUGES->{range} ->set_text ("Rng: " . $rng);
801	my $title = $stats->{+CS_STAT_TITLE};
802	$title =~ s/^Player: //;
803	$STATWIDS->{title} ->set_text ("Title: " . $title);
804
805	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
806	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
807	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
808	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
809	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
810	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
816	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818
819	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820
821	my %tbl = (
822	phys => CS_STAT_RES_PHYS,
823	magic => CS_STAT_RES_MAG,
824	fire => CS_STAT_RES_FIRE,
825	elec => CS_STAT_RES_ELEC,
826	cold => CS_STAT_RES_COLD,
827	conf => CS_STAT_RES_CONF,
828	acid => CS_STAT_RES_ACID,
829	drain => CS_STAT_RES_DRAIN,
830	ghit => CS_STAT_RES_GHOSTHIT,
831	pois => CS_STAT_RES_POISON,
832	slow => CS_STAT_RES_SLOW,
833	para => CS_STAT_RES_PARA,
834	tund => CS_STAT_TURN_UNDEAD,
835	fear => CS_STAT_RES_FEAR,
836	depl => CS_STAT_RES_DEPLETE,
837	deat => CS_STAT_RES_DEATH,
838	holyw => CS_STAT_RES_HOLYWORD,
839	blind => CS_STAT_RES_BLIND,
840	);
841
842	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
843	for keys %tbl;
844	}
845
846	my $METASERVER_ATIME;	827	my $METASERVER_ATIME;
847		828
848	sub update_metaserver {	829	sub update_metaserver {
		830	my ($metaserver_dialog) = @_;
		831
		832	$METASERVER = $metaserver_dialog
		833	if defined $metaserver_dialog;
		834
849	return if $METASERVER_ATIME > time;	835	return if $METASERVER_ATIME > time;
850	$METASERVER_ATIME = time + 60;	836	$METASERVER_ATIME = time + 60;
851		837
852	my $table = $METASERVER->{table};	838	my $table = $METASERVER->{table};
853	$table->clear;	839	$table->clear;
854	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	840	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
855		841
856	my $buf;	842	my $buf;
857		843
858	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	844	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
859		845
…		…
882	"The time this server has been running without being restarted.",	868	"The time this server has been running without being restarted.",
883	"The server software version - a '+' indicates a Crossfire+ server.",	869	"The server software version - a '+' indicates a Crossfire+ server.",
884	"Short information about this server provided by its admins.",	870	"Short information about this server provided by its admins.",
885	);	871	);
886	my @col = qw(#Users Host Uptime Version Description);	872	my @col = qw(#Users Host Uptime Version Description);
887	$table->add ($_, 0, new CFClient::UI::Label	873	$table->add ($_, 0, new CFPlus::UI::Label
888	can_hover => 1, can_events => 1,	874	can_hover => 1, can_events => 1,
889	align => 0, fg => [1, 1, 0],	875	align => 0, fg => [1, 1, 0],
890	text => $col[$_], tooltip => $tip[$_])	876	text => $col[$_], tooltip => $tip[$_])
891	for 0 .. $#col;	877	for 0 .. $#col;
892		878
…		…
913		899
914	$m = [$users, $host, $uptime, $version, $desc];	900	$m = [$users, $host, $uptime, $version, $desc];
915		901
916	$y++;	902	$y++;
917		903
918	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	904	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
919	(new CFClient::UI::Button	905	(new CFPlus::UI::Button
920	text => "Use",	906	text => "Use",
921	tooltip => "Put this server into the <b>Host:Port</b> field",	907	tooltip => "Put this server into the <b>Host:Port</b> field",
922	on_activate => sub {	908	on_activate => sub {
923	$HOST_ENTRY->set_text ($CFG->{host} = $host);	909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
924	$METASERVER->hide;	910	$METASERVER->hide;
		911	0
925	},	912	},
926	),	913	),
927	(new CFClient::UI::Empty expand => 1),	914	(new CFPlus::UI::Empty expand => 1),
928	]);	915	]);
929		916
930	$table->add ($_, $y, new CFClient::UI::Label	917	$table->add ($_, $y, new CFPlus::UI::Label
931	ellipsise => 0,	918	ellipsise => 0,
932	align => $align[$_],	919	align => $align[$_],
933	text => $m->[$_],	920	text => $m->[$_],
934	tooltip => $tip[$_],	921	tooltip => $tip[$_],
935	can_hover => 1,	922	can_hover => 1,
…		…
940	}	927	}
941	});	928	});
942	}	929	}
943		930
944	sub metaserver_dialog {	931	sub metaserver_dialog {
		932	my $vbox = new CFPlus::UI::VBox;
		933	my $table = new CFPlus::UI::Table;
		934	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		935
945	my $dialog = new CFClient::UI::FancyFrame	936	my $dialog = new CFPlus::UI::FancyFrame
946	title => "Server List",	937	title => "Server List",
947	name => 'metaserver_dialog',	938	name => 'metaserver_dialog',
948	x => 'center',	939	x => 'center',
949	y => 'center',	940	y => 'center',
950	z => 3,	941	z => 3,
951	force_h => $::HEIGHT * 0.4,	942	force_h => $::HEIGHT * 0.4,
952	child => (my $vbox = new CFClient::UI::VBox),	943	child => $vbox,
		944	has_close_button => 1,
		945	table => $table,
953	on_visibility_change => sub {	946	on_visibility_change => sub {
954	update_metaserver if $_[1];	947	update_metaserver ($_[0]) if $_[1];
		948	0
955	},	949	},
956	;	950	;
957		951
958	$dialog->{table} = new CFClient::UI::Table;
959
960	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962	$dialog	952	$dialog
963	}	953	}
964		954
965	sub server_setup {	955	sub server_setup {
966	my $vbox = new CFClient::UI::VBox;	956	my $vbox = new CFPlus::UI::VBox;
967		957
968	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	958	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
969	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	959	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
970		960
971	{	961	{
972	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	962	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
973		963
974	$vbox->add (	964	$vbox->add (
975	$HOST_ENTRY = new CFClient::UI::Entry	965	$HOST_ENTRY = new CFPlus::UI::Entry
976	expand => 1,	966	expand => 1,
977	text => $CFG->{host},	967	text => $CFG->{profile}{default}{host},
978	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	968	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
979	on_changed => sub {	969	on_changed => sub {
980	my ($self, $value) = @_;	970	my ($self, $value) = @_;
981	$CFG->{host} = $value;	971	$CFG->{profile}{default}{host} = $value;
		972	0
982	}	973	}
983	);	974	);
984		975
985	$METASERVER = metaserver_dialog;
986
987	$vbox->add (new CFClient::UI::Button	976	$vbox->add (new CFPlus::UI::Button
988	expand => 1,	977	expand => 1,
989	text => "Server List",	978	text => "Server List",
990	other => $METASERVER,	979	other => $METASERVER,
991	tooltip => "Show a list of available crossfire servers",	980	tooltip => "Show a list of available crossfire servers",
992	on_activate => sub { $METASERVER->toggle_visibility },	981	on_activate => sub { $METASERVER->toggle_visibility; 0 },
993	on_visibility_change => sub { $METASERVER->hide unless $_[1] },	982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
994	);	983	);
995	}	984	}
996		985
997	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	986	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
998	$table->add (1, 4, new CFClient::UI::Entry	987	$table->add (1, 4, new CFPlus::UI::Entry
999	text => $CFG->{user},	988	text => $CFG->{profile}{default}{user},
1000	tooltip => "The name of your character on the server",	989	tooltip => "The name of your character on the server",
1001	on_changed => sub {	990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1002	my ($self, $value) = @_;
1003	$CFG->{user} = $value;
1004	}
1005	);	991	);
1006		992
1007	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	993	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1008	$table->add (1, 5, new CFClient::UI::Entry	994	$table->add (1, 5, new CFPlus::UI::Entry
1009	text => $CFG->{password},	995	text => $CFG->{profile}{default}{password},
1010	hidden => 1,	996	hidden => 1,
1011	tooltip => "The password for your character",	997	tooltip => "The password for your character",
1012	on_changed => sub {	998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1013	my ($self, $value) = @_;
1014	$CFG->{password} = $value;
1015	}
1016	);	999	);
1017		1000
1018	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1001	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1019	$table->add (1, 7, new CFClient::UI::Slider	1002	$table->add (1, 7, new CFPlus::UI::Slider
1020	force_w => 100,	1003	force_w => 100,
1021	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1022	tooltip => "This is the size of the portion of the map update the server sends you. "	1005	tooltip => "This is the size of the portion of the map update the server sends you. "
1023	. "If you set this to a high value you will be able to see further, "	1006	. "If you set this to a high value you will be able to see further, "
1024	. "but you also increase bandwidth requirements and latency. "	1007	. "but you also increase bandwidth requirements and latency. "
1025	. "This option is only used once at log-in.",	1008	. "This option is only used once at log-in.",
1026	on_changed => sub {	1009	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1027	my ($self, $value) = @_;
1028
1029	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1030	},
1031	);	1010	);
1032		1011
1033	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1012	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1034	$table->add (1, 8, new CFClient::UI::CheckBox	1013	$table->add (1, 8, new CFPlus::UI::CheckBox
1035	state => $CFG->{face_prefetch},	1014	state => $CFG->{face_prefetch},
1036	tooltip => "<b>Background Image Prefetch</b>\n\n"	1015	tooltip => "<b>Background Image Prefetch</b>\n\n"
1037	. "If enabled, the client automatically pre-fetches images from the server. "	1016	. "If enabled, the client automatically pre-fetches images from the server. "
1038	. "This might increase or create lag, but increases the chances "	1017	. "This might increase or create lag, but increases the chances "
1039	. "of faces being ready for display when you encounter them. "	1018	. "of faces being ready for display when you encounter them. "
1040	. "It also uses up server bandwidth on every connect, "	1019	. "It also uses up server bandwidth on every connect, "
1041	. "so only set it if you really need to prefetch images. "	1020	. "so only set it if you really need to prefetch images. "
1042	. "This option can be set and unset any time.",	1021	. "This option can be set and unset any time.",
1043	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1044	);	1023	);
1045		1024
1046	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1025	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1047	$table->add (1, 9, new CFClient::UI::Entry	1026	$table->add (1, 9, new CFPlus::UI::Entry
1048	text => $CFG->{output_count},	1027	text => $CFG->{output_count},
1049	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1050	on_changed => sub { $CFG->{output_count} = $_[1] },	1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1051	);	1030	);
1052		1031
1053	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1032	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1054	$table->add (1, 10, new CFClient::UI::Entry	1033	$table->add (1, 10, new CFPlus::UI::Entry
1055	text => $CFG->{output_sync},	1034	text => $CFG->{output_sync},
1056	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1035	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057	on_changed => sub { $CFG->{output_sync} = $_[1] },	1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1058	);	1037	);
1059		1038
1060	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1039	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1061	expand => 1,	1040	expand => 1,
1062	align => 0,	1041	align => 0,
1063	text => "Login",	1042	text => "Login",
1064	on_activate => sub {	1043	on_activate => sub {
1065	$CONN ? stop_game	1044	$CONN ? stop_game
1066	: start_game;	1045	: start_game;
		1046	0
1067	},	1047	},
1068	);	1048	);
1069		1049
1070	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1050	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1071	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1051	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1072	text => $CFG->{say_command},	1052	text => $CFG->{say_command},
1073	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1053	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1074	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1054	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1055	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076	on_changed => sub {	1056	on_changed => sub {
1077	my ($self, $value) = @_;	1057	my ($self, $value) = @_;
1078	$CFG->{say_command} = $value;	1058	$CFG->{say_command} = $value;
		1059	0
1079	}	1060	}
1080	);	1061	);
1081		1062
1082	$vbox->add (new CFClient::UI::Label	1063	$vbox->add (new CFPlus::UI::Label
1083	text => "Server Info",	1064	text => "Server Info",
1084	fontsize => 1.2,	1065	fontsize => 1.2,
1085	padding_y => 8,	1066	padding_y => 8,
1086	fg => [1, 1, 0, 1],	1067	fg => [1, 1, 0, 1],
1087	);	1068	);
1088		1069
1089	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1070	$vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1090		1071
1091	$vbox	1072	$vbox
1092	}	1073	}
1093		1074
1094	sub message_window {	1075	sub message_window {
1095	my $window = new CFClient::UI::FancyFrame	1076	my $window = new CFPlus::UI::FancyFrame
1096	name => "message_window",	1077	name => "message_window",
1097	title => "Messages",	1078	title => "Messages",
1098	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1099	bg => [0, 0, 0, 0.75],
1100	x => "max",	1080	x => "max",
1101	y => 0,	1081	y => 0,
1102	force_w => $::WIDTH * 0.4,	1082	force_w => $::WIDTH * 0.4,
1103	force_h => $::HEIGHT * 0.5,	1083	force_h => $::HEIGHT * 0.5,
1104	child => (my $vbox = new CFClient::UI::VBox);	1084	child => (my $vbox = new CFPlus::UI::VBox),
		1085	has_close_button => 1;
1105		1086
1106	$vbox->add ($LOGVIEW);	1087	$vbox->add ($LOGVIEW);
1107		1088
1108	$vbox->add (my $input = new CFClient::UI::Entry	1089	$vbox->add (my $input = new CFPlus::UI::Entry
1109	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1090	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1110	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1091	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1111	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1092	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1112	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1093	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1113	on_focus_in => sub {	1094	on_focus_in => sub {
…		…
1117		1098
1118	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1099	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1119	$input->{refocus_map} = 1;	1100	$input->{refocus_map} = 1;
1120	}	1101	}
1121	delete $input->{auto_activated};	1102	delete $input->{auto_activated};
		1103
		1104	0
1122	},	1105	},
1123	on_activate => sub {	1106	on_activate => sub {
1124	my ($input, $text) = @_;	1107	my ($input, $text) = @_;
1125	$input->set_text ('');	1108	$input->set_text ('');
1126		1109
…		…
1132	}	1115	}
1133	if ($input->{refocus_map}) {	1116	if ($input->{refocus_map}) {
1134	delete $input->{refocus_map};	1117	delete $input->{refocus_map};
1135	$MAPWIDGET->focus_in	1118	$MAPWIDGET->focus_in
1136	}	1119	}
		1120
		1121	0
1137	},	1122	},
1138	on_escape => sub {	1123	on_escape => sub {
1139	$MAPWIDGET->focus_in	1124	$MAPWIDGET->grab_focus;
		1125
		1126	0
1140	},	1127	},
1141	);	1128	);
1142		1129
1143	$CONSOLE = {	1130	$CONSOLE = {
1144	window => $window,	1131	window => $window,
…		…
1146	};	1133	};
1147		1134
1148	$window	1135	$window
1149	}	1136	}
1150		1137
		1138	sub open_string_query {
		1139	my $cb = $_[1];
		1140	my $dialog = new CFPlus::UI::FancyFrame
		1141	x => "center",
		1142	y => "center",
		1143	z => 50,
		1144	force_w => $WIDTH * 4/5,
		1145	title => $_[0];
		1146
		1147	$dialog->add (
		1148	my $e = new CFPlus::UI::Entry
		1149	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1150	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1151	);
		1152
		1153	$e->grab_focus;
		1154	$dialog->show;
		1155	}
		1156
1151	sub open_quit_dialog {	1157	sub open_quit_dialog {
1152	unless ($QUIT_DIALOG) {	1158	unless ($QUIT_DIALOG) {
1153	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1159	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1154	x => "center",	1160	x => "center",
1155	y => "center",	1161	y => "center",
1156	z => 50,	1162	z => 50,
1157	title => "Really Quit?",	1163	title => "Really Quit?",
		1164	on_key_down => sub {
		1165	my ($dialog, $ev) = @_;
		1166	$ev->{sym} == 27 and $dialog->hide;
		1167	}
1158	;	1168	;
1159		1169
1160	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1170	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1161		1171
1162	$vb->add (new CFClient::UI::Label	1172	$vb->add (new CFPlus::UI::Label
1163	text => "You should find a savebed and apply it first!",	1173	text => "You should find a savebed and apply it first!",
1164	max_w => $WIDTH * 0.25,	1174	max_w => $WIDTH * 0.25,
1165	ellipsize => 0,	1175	ellipsize => 0,
1166	);	1176	);
1167	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1177	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1168	$hb->add (new CFClient::UI::Button	1178	$hb->add (new CFPlus::UI::Button
1169	text => "Ok",	1179	text => "Ok",
1170	expand => 1,	1180	expand => 1,
1171	on_activate => sub { $QUIT_DIALOG->hide },	1181	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1172	);	1182	);
1173	$hb->add (new CFClient::UI::Button	1183	$hb->add (new CFPlus::UI::Button
1174	text => "Quit anyway",	1184	text => "Quit anyway",
1175	expand => 1,	1185	expand => 1,
1176	on_activate => sub { exit },	1186	on_activate => sub { exit },
1177	);	1187	);
1178	}	1188	}
1179		1189
1180	$QUIT_DIALOG->show;	1190	$QUIT_DIALOG->show;
		1191	$QUIT_DIALOG->grab_focus;
1181	}	1192	}
1182		1193
1183	sub autopickup_setup {	1194	sub autopickup_setup {
1184	my $table = new CFClient::UI::Table;	1195	my $table = new CFPlus::UI::Table;
1185		1196
1186	for (	1197	for (
1187	["General", 0, 0,	1198	["General", 0, 0,
1188	["Enable autopickup" => PICKUP_NEWMODE],	1199	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189	["Inhibit autopickup" => PICKUP_INHIBIT],	1200	["Inhibit autopickup" => PICKUP_INHIBIT],
1190	["Stop before pickup" => PICKUP_STOP],	1201	["Stop before pickup" => PICKUP_STOP],
1191	["Debug autopickup" => PICKUP_DEBUG],	1202	["Debug autopickup" => PICKUP_DEBUG],
1192	],	1203	],
1193	["Weapons", 0, 6,	1204	["Weapons", 0, 6,
…		…
1223	],	1234	],
1224	["Weight/Value ratio", 2, 17]	1235	["Weight/Value ratio", 2, 17]
1225	)	1236	)
1226	{	1237	{
1227	my ($title, $x, $y, @bits) = @$_;	1238	my ($title, $x, $y, @bits) = @$_;
1228	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1239	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1229		1240
1230	for (@bits) {	1241	for (@bits) {
1231	++$y;	1242	++$y;
1232		1243
1233	my $mask = $_->[1];	1244	my $mask = $_->[1];
1234	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1245	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1235	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1246	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1236	state => $CFG->{pickup} & $mask,	1247	state => $::CFG->{pickup} & $mask,
1237	on_changed => sub {	1248	on_changed => sub {
1238	my ($box, $value) = @_;	1249	my ($box, $value) = @_;
1239		1250
1240	if ($value) {	1251	if ($value) {
1241	$::CFG->{pickup} |= $mask;	1252	$::CFG->{pickup} |= $mask;
…		…
1243	$::CFG->{pickup} &= ~$mask;	1254	$::CFG->{pickup} &= ~$mask;
1244	}	1255	}
1245		1256
1246	$::CONN->send_command ("pickup $::CFG->{pickup}")	1257	$::CONN->send_command ("pickup $::CFG->{pickup}")
1247	if defined $::CONN;	1258	if defined $::CONN;
		1259
		1260	0
1248	});	1261	});
		1262
		1263	${$_->[2]} = $checkbox if $_->[2];
1249	}	1264	}
1250	}	1265	}
1251		1266
1252	$table->add (2, 18, new CFClient::UI::ValSlider	1267	$table->add (2, 18, new CFPlus::UI::ValSlider
1253	range => [0, 0, 16, 1, 1],	1268	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1269	template => ">= 99",
1254	to_value => sub { ">= " . 5 * $_[0] },	1270	to_value => sub { ">= " . 5 * $_[0] },
1255	on_changed => sub {	1271	on_changed => sub {
1256	my ($slider, $value) = @_;	1272	my ($slider, $value) = @_;
1257		1273
1258	$::CFG->{pickup} &= ~0x7;	1274	$::CFG->{pickup} &= ~0xF;
1259	$::CFG->{pickup} |= int $value	1275	$::CFG->{pickup} |= int $value
1260	if $value;	1276	if $value;
1261	1;	1277	1;
1262	});	1278	});
		1279
1263	$table->add (3, 18, new CFClient::UI::Button	1280	$table->add (3, 18, new CFPlus::UI::Button
1264	text => "set",	1281	text => "set",
1265	on_activate => sub {	1282	on_activate => sub {
1266	$::CONN->send_command ("pickup $::CFG->{pickup}")	1283	$::CONN->send_command ("pickup $::CFG->{pickup}")
1267	if defined $::CONN;	1284	if defined $::CONN;
1268	1;	1285	0
1269	});	1286	});
1270		1287
1271	$table	1288	$table
1272	}	1289	}
1273		1290
		1291	my %SORT_ORDER = (
		1292	type => undef,
		1293	mtime => sub { sort {
		1294	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1295	or $b->{mtime} <=> $a->{mtime}
		1296	or $a->{type} <=> $b->{type}
		1297	} @_ },
		1298	weight => sub { sort {
		1299	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1300	or $a->{type} <=> $b->{type}
		1301	} @_ },
		1302	);
		1303
1274	sub inventory_window {	1304	sub inventory_widget {
		1305	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1306
		1307	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		1308	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1309
		1310	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1311
		1312	use sort 'stable';
		1313
		1314	$hb1->add (new CFPlus::UI::Selector
		1315	value => $::CFG->{inv_sort},
		1316	options => [
		1317	[type => "Type/Name"],
		1318	[mtime => "Recent/Normal/Locked"],
		1319	[weight => "Weight/Type"],
		1320	],
		1321	on_changed => sub {
		1322	$::CFG->{inv_sort} = $_[1];
		1323	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1324	},
		1325	);
		1326	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1327	#TODO# update to weigh/maxweight
		1328	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1329
		1330	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1331	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1332
		1333	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1334
		1335	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1336
		1337	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1338	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1339
		1340	# XXX: Call after $INVR = ... because set_opencont sets the items
		1341	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1342
		1343	$hb
		1344	}
		1345
		1346	sub toggle_player_page {
		1347	my ($widget) = @_;
		1348
		1349	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1350	$PL_WINDOW->hide;
		1351	} else {
		1352	$PL_NOTEBOOK->set_current_page ($widget);
		1353	$PL_WINDOW->show;
		1354	}
		1355	}
		1356
		1357	sub player_window {
1275	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1358	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1276	x => "center",	1359	x => "center",
1277	y => "center",	1360	y => "center",
1278	force_w => $WIDTH * 9/10,	1361	force_w => $WIDTH * 9/10,
1279	force_h => $HEIGHT * 9/10,	1362	force_h => $HEIGHT * 9/10,
1280	title => "Inventory",	1363	title => "Player",
		1364	name => "playerbook",
		1365	has_close_button => 1
1281	;	1366	;
1282		1367
1283	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1368	my $ntb =
		1369	$PL_NOTEBOOK =
		1370	new CFPlus::UI::Notebook expand => 1, debug => 1;
1284		1371
1285	$hb->add (my $vb1 = new CFClient::UI::VBox);	1372	$ntb->add (
1286	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1373	"Statistics (F2)" => $STATS_PAGE = stats_window,
1287	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1374	"Shows statistics, where all your Stats and Resistances are shown."
		1375	);
		1376	$ntb->add (
		1377	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1378	"Shows all your Skills."
		1379	);
1288		1380
1289	$hb->add (my $vb2 = new CFClient::UI::VBox);	1381	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1382	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
		1383	$ntb->add (
		1384	"Spellbook (F4)" => $spellsw,
		1385	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1386	);
		1387	$ntb->add (
		1388	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1389	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1390	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1391	);
1290		1392
1291	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1393	$ntb->set_current_page ($INVENTORY_PAGE);
1292		1394
1293	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1395	$plwin->add ($ntb);
1294		1396	$plwin
1295	# XXX: Call after $INVR = ... because set_opencont sets the items
1296	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298	$invwin
1299	}	1397	}
1300		1398
1301	sub spell_setup {	1399	sub update_bindings {
1302	new CFClient::UI::SpellList	1400	$BIND_UPD_CB->() if $BIND_UPD_CB;
1303	}	1401	}
1304		1402
1305	sub keyboard_setup {	1403	sub keyboard_setup {
1306	my $binding_list = new CFClient::UI::VBox;	1404	my $binding_list = new CFPlus::UI::VBox;
1307		1405
1308	my $refresh;	1406	my $refresh;
1309	$refresh = sub {	1407	$refresh = $BIND_UPD_CB = sub {
1310	$binding_list->clear ();	1408	$binding_list->clear ();
1311		1409
1312	for my $mod (keys %{$::CFG->{bindings}}) {	1410	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1313	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1411	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1314	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1412	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1315	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1413	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316		1414
1317	my $lbl = join "; ", @$cmds;	1415	my $lbl = join "; ", @$cmds;
1318	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1416	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1319	$binding_list->add (my $hb = new CFClient::UI::HBox);	1417	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1320	$hb->add (new CFClient::UI::Button	1418	$hb->add (new CFPlus::UI::Button
1321	text => "delete",	1419	text => "delete",
1322	tooltip => "Deletes the binding",	1420	tooltip => "Deletes the binding",
1323	on_activate => sub {	1421	on_activate => sub {
1324	$binding_list->remove ($hb);	1422	$binding_list->remove ($hb);
1325	delete $::CFG->{bindings}->{$mod}->{$sym};	1423	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1424	0
1326	});	1425	});
1327		1426
1328	$hb->add (new CFClient::UI::Button	1427	$hb->add (new CFPlus::UI::Button
1329	text => "edit",	1428	text => "edit",
1330	tooltip => "Edits the binding",	1429	tooltip => "Edits the binding",
1331	on_activate => sub {	1430	on_activate => sub {
1332	$::BIND_EDITOR->set_binding (	1431	$::BIND_EDITOR->set_binding (
1333	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1432	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1334	sub {	1433	sub {
1335	my ($nmod, $nsym, $ncmds) = @_;	1434	my ($nmod, $nsym, $ncmds) = @_;
1336	delete $::CFG->{bindings}->{$mod}->{$sym};	1435	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1337	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1436	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1338	$refresh->();	1437	$refresh->();
1339	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1438	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340	$SETUP_DIALOG->show;	1439	$SETUP_DIALOG->show;
1341	},	1440	},
1342	sub {	1441	sub {
1343	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1442	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344	$SETUP_DIALOG->show;	1443	$SETUP_DIALOG->show;
1345	});	1444	});
1346	$::BIND_EDITOR->show;	1445	$::BIND_EDITOR->show;
1347	$SETUP_DIALOG->hide;	1446	$SETUP_DIALOG->hide;
		1447	0
1348	});	1448	});
1349		1449
1350	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1450	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1351	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1451	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1352	}	1452	}
1353	}	1453	}
1354	};	1454	};
1355		1455
1356	my $vb = new CFClient::UI::VBox;	1456	my $vb = new CFPlus::UI::VBox;
1357	$vb->add (my $hb = new CFClient::UI::HBox);	1457	$vb->add (my $hb = new CFPlus::UI::HBox);
1358	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1458	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1359	$hb->add (new CFClient::UI::CheckBox	1459	$hb->add (new CFPlus::UI::CheckBox
1360	expand => 1,	1460	expand => 1,
1361	state => $CFG->{shift_fire_stop},	1461	state => $CFG->{shift_fire_stop},
1362	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1462	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363	on_changed => sub {	1463	on_changed => sub {
1364	my ($cbox, $value) = @_;	1464	my ($cbox, $value) = @_;
1365	$CFG->{shift_fire_stop} = $value;	1465	$CFG->{shift_fire_stop} = $value;
		1466	0
1366	});	1467	});
1367		1468
1368	$vb->add ($binding_list);	1469	$vb->add ($binding_list);
1369	$vb->add (my $hb = new CFClient::UI::HBox);	1470	$vb->add (my $hb = new CFPlus::UI::HBox);
1370		1471
1371	$hb->add (new CFClient::UI::Button	1472	$hb->add (new CFPlus::UI::Button
1372	text => "record new",	1473	text => "record new",
1373	expand => 1,	1474	expand => 1,
1374	tooltip => "This button opens the binding editor with an empty binding.",	1475	tooltip => "This button opens the binding editor with an empty binding.",
1375	on_activate => sub {	1476	on_activate => sub {
1376	$::BIND_EDITOR->set_binding (undef, undef, [],	1477	$::BIND_EDITOR->set_binding (undef, undef, [],
1377	sub {	1478	sub {
1378	my ($mod, $sym, $cmds) = @_;	1479	my ($mod, $sym, $cmds) = @_;
1379	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1480	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1380	$refresh->();	1481	$refresh->();
1381	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1482	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382	$SETUP_DIALOG->show;	1483	$SETUP_DIALOG->show;
1383	},	1484	},
1384	sub {	1485	sub {
…		…
1386	$SETUP_DIALOG->show;	1487	$SETUP_DIALOG->show;
1387	},	1488	},
1388	);	1489	);
1389	$SETUP_DIALOG->hide;	1490	$SETUP_DIALOG->hide;
1390	$::BIND_EDITOR->show;	1491	$::BIND_EDITOR->show;
		1492	0
1391	},	1493	},
1392	);	1494	);
1393		1495
1394	$hb->add (new CFClient::UI::Button	1496	$hb->add (new CFPlus::UI::Button
1395	text => "close",	1497	text => "close",
1396	tooltip => "Closes the binding window",	1498	tooltip => "Closes the binding window",
1397	expand => 1,	1499	expand => 1,
1398	on_activate => sub {	1500	on_activate => sub {
1399	$SETUP_DIALOG->hide;	1501	$SETUP_DIALOG->hide;
		1502	0
1400	}	1503	}
1401	);	1504	);
1402		1505
1403	$refresh->();	1506	$refresh->();
1404		1507
1405	$vb	1508	$vb
1406	}	1509	}
1407		1510
1408	sub help_window {	1511	sub help_window {
1409	my $win = new CFClient::UI::FancyFrame	1512	my $win = new CFPlus::UI::FancyFrame
1410	x => 'center',	1513	x => 'center',
1411	y => 'center',	1514	y => 'center',
1412	z => 2,	1515	z => 2,
1413	name => 'doc_browser',	1516	name => 'doc_browser',
1414	force_w => int $WIDTH * 7/8,	1517	force_w => int $WIDTH * 7/8,
1415	force_h => int $HEIGHT * 7/8,	1518	force_h => int $HEIGHT * 7/8,
1416	title => "Documentation";	1519	title => "Help Browser",
		1520	has_close_button => 1;
1417		1521
1418	$win->add (my $vbox = new CFClient::UI::VBox);	1522	$win->add (my $vbox = new CFPlus::UI::VBox);
1419		1523
1420	$vbox->add (my $buttons = new CFClient::UI::HBox);	1524	$vbox->add (my $buttons = new CFPlus::UI::HBox);
1421	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1525	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1422	expand => 1, fontsize => 0.8, padding_x => 4);	1526	expand => 1, fontsize => 0.8, padding_x => 4);
1423		1527
1424	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1528	$buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1425	$buttons->add (my $combo = new CFClient::UI::Combobox	1529	$buttons->add (my $combo = new CFPlus::UI::Selector
1426	value => undef,	1530	value => undef,
1427	options => [	1531	options => [
1428	[intro => "Introduction"],	1532	[intro => "Introduction"],
1429	[manual => "Manual"],	1533	[manual => "Main Manual"],
1430	[skill_help => "Skills"],	1534	[skill_help => "Skill Reference"],
1431	[command_help => "Commands"],	1535	[command_help => "Command Reference"],
1432	[dmcommand_help => "DM Commands"],	1536	[dmcommand_help => "DM Commands"],
1433	[COPYING => "License Terms"],	1537	[COPYING => "License Terms"],
1434	],	1538	],
1435	on_changed => sub {	1539	on_changed => sub {
1436	my ($self, $pod) = @_;	1540	my ($self, $pod) = @_;
1437		1541
1438	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440
1441	$viewer->clear;	1542	$viewer->clear;
1442		1543	$viewer->add_paragraph (CFPlus::Pod::section pod => $pod);
1443	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444	for @$pom;
1445
1446	$viewer->set_offset (0);	1544	$viewer->set_offset (0);
		1545
		1546	0
1447	},	1547	},
1448	on_visibility_change => sub {	1548	on_visibility_change => sub {
1449	my ($self, $visible) = @_;	1549	my ($self, $visible) = @_;
1450	return unless $visible;	1550	return unless $visible;
1451	return if $self->{value};	1551	return if $self->{value};
1452	$self->set_value ("intro");	1552	$self->set_value ("intro");
		1553	0
1453	},	1554	},
1454	);	1555	);
1455		1556
1456	$win	1557	$win
1457	}	1558	}
1458		1559
1459	sub sdl_init {	1560	sub sdl_init {
1460	CFClient::SDL_Init	1561	CFPlus::SDL_Init
1461	and die "SDL::Init failed!\n";	1562	and die "SDL::Init failed!\n";
1462	}	1563	}
1463		1564
1464	sub video_init {	1565	sub video_init {
1465	sdl_init;	1566	sdl_init;
…		…
1470		1571
1471	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1572	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1472	$FULLSCREEN = $CFG->{fullscreen};	1573	$FULLSCREEN = $CFG->{fullscreen};
1473	$FAST = $CFG->{fast};	1574	$FAST = $CFG->{fast};
1474		1575
1475	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1576	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1476	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1577	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1477		1578
1478	$SDL_ACTIVE = 1;	1579	$SDL_ACTIVE = 1;
1479	$LAST_REFRESH = time - 0.01;	1580	$LAST_REFRESH = time - 0.01;
1480		1581
1481	CFClient::OpenGL::init;	1582	CFPlus::OpenGL::init;
1482		1583
1483	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1584	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1484		1585
1485	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1586	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1486		1587
1487	#############################################################################	1588	#############################################################################
1488		1589
1489	if ($DEBUG_STATUS) {	1590	if ($DEBUG_STATUS) {
1490	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1591	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1491	} else {	1592	} else {
1492	# create the widgets	1593	# create the widgets
1493		1594
1494	$DEBUG_STATUS = new CFClient::UI::Label	1595	$DEBUG_STATUS = new CFPlus::UI::Label
1495	padding => 0,	1596	padding => 0,
1496	z => 100,	1597	z => 100,
1497	force_x => "max",	1598	force_x => "max",
1498	force_y => 0;	1599	force_y => 0;
1499	$DEBUG_STATUS->show;	1600	$DEBUG_STATUS->show;
1500		1601
1501	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1602	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1502		1603
1503	$STATUSBOX = new CFClient::UI::Statusbox;	1604	$STATUSBOX = new CFPlus::UI::Statusbox;
1504	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1605	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1505		1606
1506	(new CFClient::UI::Frame	1607	(new CFPlus::UI::Frame
1507	bg => [0, 0, 0, 0.4],	1608	bg => [0, 0, 0, 0.4],
1508	force_x => 0,	1609	force_x => 0,
1509	force_y => "max",	1610	force_y => "max",
1510	child => $STATUSBOX,	1611	child => $STATUSBOX,
1511	)->show;	1612	)->show;
1512		1613
1513	CFClient::UI::FancyFrame->new (	1614	CFPlus::UI::FancyFrame->new (
1514	title => "Map",	1615	title => "Map",
1515	name => "mapmap",	1616	name => "mapmap",
1516	x => 0,	1617	x => 0,
1517	y => $FONTSIZE + 8,	1618	y => $FONTSIZE + 8,
1518	border_bg => [1, 1, 1, 192/255],	1619	border_bg => [1, 1, 1, 192/255],
1519	bg => [1, 1, 1, 0],	1620	bg => [1, 1, 1, 0],
1520	no_close_button => 1,
1521	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1621	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1522	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1622	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1523	),	1623	),
1524	)->show;	1624	)->show;
1525		1625
1526	$MAPWIDGET = new CFClient::MapWidget;	1626	$MAPWIDGET = new CFPlus::MapWidget;
1527	$MAPWIDGET->connect (activate_console => sub {	1627	$MAPWIDGET->connect (activate_console => sub {
1528	my ($mapwidget, $preset) = @_;	1628	my ($mapwidget, $preset) = @_;
1529		1629
1530	if ($CONSOLE) {	1630	if ($CONSOLE) {
1531	$CONSOLE->{input}->{auto_activated} = 1;	1631	$CONSOLE->{input}->{auto_activated} = 1;
1532	$CONSOLE->{input}->focus_in;	1632	$CONSOLE->{input}->grab_focus;
1533		1633
1534	if ($preset && $CONSOLE->{input}->get_text eq '') {	1634	if ($preset && $CONSOLE->{input}->get_text eq '') {
1535	$CONSOLE->{input}->set_text ($preset);	1635	$CONSOLE->{input}->set_text ($preset);
1536	}	1636	}
1537	}	1637	}
1538	});	1638	});
1539	$MAPWIDGET->show;	1639	$MAPWIDGET->show;
1540	$MAPWIDGET->focus_in;	1640	$MAPWIDGET->grab_focus;
1541		1641
1542	$LOGVIEW = new CFClient::UI::TextScroller	1642	$LOGVIEW = new CFPlus::UI::TextScroller
1543	expand => 1,	1643	expand => 1,
1544	font => $FONT_FIXED,	1644	font => $FONT_FIXED,
1545	fontsize => $::CFG->{log_fontsize},	1645	fontsize => $::CFG->{log_fontsize},
1546	indent => -4,	1646	indent => -4,
1547	can_hover => 1,	1647	can_hover => 1,
1548	can_events => 1,	1648	can_events => 1,
1549	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1649	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1550	;	1650	;
1551		1651
1552	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1652	$SETUP_DIALOG = new CFPlus::UI::FancyFrame
1553	title => "Setup",	1653	title => "Setup",
1554	name => "setup_dialog",	1654	name => "setup_dialog",
1555	x => 'center',	1655	x => 'center',
1556	y => 'center',	1656	y => 'center',
1557	z => 2,	1657	z => 2,
1558	force_w => $::WIDTH * 0.6,	1658	force_w => $::WIDTH * 0.6,
1559	force_h => $::HEIGHT * 0.6,	1659	force_h => $::HEIGHT * 0.6,
		1660	has_close_button => 1,
1560	;	1661	;
1561		1662
		1663	$METASERVER = metaserver_dialog;
		1664
1562	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1665	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1563	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1666	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564		1667
1565	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1668	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1566	"Configure the server to play on, your username, password and other server-related options.");	1669	"Configure the server to play on, your username, password and other server-related options.");
1567	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1670	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1568	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1671	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1569	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1672	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1673	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1674	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1572	"Configure the use of audio, sound effects and background music.");	1675	"Configure the use of audio, sound effects and background music.");
1573	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1676	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574	"Lets you define, edit and delete bindings."	1677	"Lets you define, edit and delete key bindings."
1575	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1678	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1576	. "with nothing set and the recording started. After doing the actions you "	1679	. "with nothing set and the recording started. After doing the actions you "
1577	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1680	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578	. "After pressing the combo the binding will be saved automatically and the "	1681	. "After pressing the combo the binding will be saved automatically and the "
1579	. "binding editor closes");	1682	. "binding editor closes");
1580	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1683	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1583	"Some debuggign options. Do not ask.");	1684	"Some debuggin' options. Do not ask.");
1584		1685
1585	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1686	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586		1687
1587	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1688	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1588	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1689	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1589		1690
1590	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1691	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1591	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1692	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1592		1693
1593	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	1694	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
1594		1695
1595	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1596	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1597	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,	1696	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1598	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1697	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1599	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1600		1698
1601	$BUTTONBAR->add (new CFClient::UI::Button	1699	$BUTTONBAR->add (new CFPlus::UI::Button
1602	text => "Save Config",	1700	text => "Save Config",
1603	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1701	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1604	on_activate => sub {	1702	on_activate => sub {
1605	$::CFG->{layout} = CFClient::UI::get_layout;	1703	$::CFG->{layout} = CFPlus::UI::get_layout;
1606	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1704	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1607	status "Configuration Saved";	1705	status "Configuration Saved";
		1706	0
1608	},	1707	},
1609	);	1708	);
1610		1709
1611	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,	1710	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1612	tooltip => "View Documentation");	1711	tooltip => "View Documentation");
1613		1712
1614	$BUTTONBAR->add (new CFClient::UI::Button	1713	$BUTTONBAR->add (new CFPlus::UI::Button
1615	text => "Quit",	1714	text => "Quit",
1616	tooltip => "Terminates the program",	1715	tooltip => "Terminates the program",
1617	on_activate => sub {	1716	on_activate => sub {
1618	if ($CONN) {	1717	if ($CONN) {
1619	open_quit_dialog;	1718	open_quit_dialog;
1620	} else {	1719	} else {
1621	exit;	1720	exit;
1622	}	1721	}
		1722	0
1623	},	1723	},
1624	);	1724	);
1625		1725
1626	$BUTTONBAR->show;	1726	$BUTTONBAR->show;
1627	$SETUP_DIALOG->show;	1727	$SETUP_DIALOG->show;
…		…
1629		1729
1630	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1730	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1631	}	1731	}
1632		1732
1633	sub video_shutdown {	1733	sub video_shutdown {
		1734	CFPlus::OpenGL::shutdown;
		1735
1634	undef $SDL_ACTIVE;	1736	undef $SDL_ACTIVE;
1635	}	1737	}
1636		1738
1637	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1739	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1638	my $bgmusic;#TODO#hack#d#	1740	my $bgmusic;#TODO#hack#d#
…		…
1645		1747
1646	sub audio_music_finished {	1748	sub audio_music_finished {
1647	return unless $CFG->{bgm_enable};	1749	return unless $CFG->{bgm_enable};
1648		1750
1649	# TODO: hack, do play loop and mood music	1751	# TODO: hack, do play loop and mood music
1650	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1752	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1651	$bgmusic->play (0);	1753	$bgmusic->play (0);
1652		1754
1653	push @bgmusic, shift @bgmusic;	1755	push @bgmusic, shift @bgmusic;
1654	}	1756	}
1655		1757
1656	sub audio_init {	1758	sub audio_init {
1657	if ($CFG->{audio_enable}) {	1759	if ($CFG->{audio_enable}) {
1658	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1760	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1659	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1761	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1660		1762
1661	unless ($SDL_MIXER) {	1763	unless ($SDL_MIXER) {
1662	status "Unable to open sound device: there will be no sound";	1764	status "Unable to open sound device: there will be no sound";
1663	return;	1765	return;
1664	}	1766	}
1665		1767
1666	CFClient::Mix_AllocateChannels 8;	1768	CFPlus::Mix_AllocateChannels 8;
1667	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1769	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1668		1770
1669	audio_music_finished;	1771	audio_music_finished;
1670		1772
1671	while (<$fh>) {	1773	while (<$fh>) {
1672	next if /^\s*#/;	1774	next if /^\s*#/;
…		…
1675	my ($file, $volume, $event) = split /\s+/, $_, 3;	1777	my ($file, $volume, $event) = split /\s+/, $_, 3;
1676		1778
1677	push @SOUNDS, "$volume,$file";	1779	push @SOUNDS, "$volume,$file";
1678		1780
1679	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1781	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1680	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1782	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1681	$chunk->volume ($volume * 128 / 100);	1783	$chunk->volume ($volume * 128 / 100);
1682	$chunk	1784	$chunk
1683	};	1785	};
1684	}	1786	}
1685	} else {	1787	} else {
…		…
1687	}	1789	}
1688	}	1790	}
1689	}	1791	}
1690		1792
1691	sub audio_shutdown {	1793	sub audio_shutdown {
1692	CFClient::Mix_CloseAudio if $SDL_MIXER;	1794	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1693	undef $SDL_MIXER;	1795	undef $SDL_MIXER;
1694	@SOUNDS = ();	1796	@SOUNDS = ();
1695	%AUDIO_CHUNKS = ();	1797	%AUDIO_CHUNKS = ();
1696	}	1798	}
1697		1799
…		…
1704		1806
1705	sub force_refresh {	1807	sub force_refresh {
1706	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1808	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1707	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1809	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1708		1810
1709	$CFClient::UI::ROOT->draw;	1811	$CFPlus::UI::ROOT->draw;
1710		1812
1711	$WANT_REFRESH = 0;	1813	$WANT_REFRESH = 0;
1712	$CAN_REFRESH = 0;	1814	$CAN_REFRESH = 0;
1713	$LAST_REFRESH = $NOW;	1815	$LAST_REFRESH = $NOW;
1714		1816
1715	0 && do {
1716	# some weird model-drawing code, just a joke right now
1717	use CFClient::OpenGL;
1718
1719	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1720	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1721	$demo{r} ||= do {
1722	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1723	$mod->{v} = pack "f*", @{$mod->{v}};
1724	$_ = [scalar @$_, pack "S!*", @$_]
1725	for values %{$mod->{g}};
1726	$mod
1727	};
1728
1729	my $r = $demo{r} or die;
1730
1731	glDepthMask 1;
1732	glClear GL_DEPTH_BUFFER_BIT;
1733	glEnable GL_TEXTURE_2D;
1734	glEnable GL_DEPTH_TEST;
1735	glEnable GL_CULL_FACE;
1736	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1737
1738	glMatrixMode GL_PROJECTION;
1739	glLoadIdentity;
1740	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1741	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1742	glMatrixMode GL_MODELVIEW;
1743	glLoadIdentity;
1744
1745	glPushMatrix;
1746	glTranslate 0, 0, -800;
1747	glScale 1, -1, 1;
1748	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1749	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1750	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1751	glScale 50, 50, 50;
1752
1753	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1754	while (my ($k, $v) = each %{$r->{g}}) {
1755	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1756	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1757	}
1758
1759	glPopMatrix;
1760
1761	glShadeModel GL_FLAT;
1762	glDisable GL_DEPTH_TEST;
1763	glDisable GL_TEXTURE_2D;
1764	glDepthMask 0;
1765
1766	$WANT_REFRESH++;
1767	};
1768
1769	CFClient::SDL_GL_SwapBuffers;	1817	CFPlus::SDL_GL_SwapBuffers;
1770	}	1818	}
1771		1819
1772	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1820	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1773	$NOW = time;	1821	$NOW = time;
1774		1822
1775	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1823	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1776	for CFClient::SDL_PollEvent;	1824	for CFPlus::SDL_PollEvent;
1777		1825
1778	if (%animate_object) {	1826	if (%animate_object) {
1779	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1827	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1780	$WANT_REFRESH++;	1828	$WANT_REFRESH++;
1781	}	1829	}
…		…
1805	$CONN->face_prefetch	1853	$CONN->face_prefetch
1806	if $CONN;	1854	if $CONN;
1807	});	1855	});
1808		1856
1809	%SDL_CB = (	1857	%SDL_CB = (
1810	CFClient::SDL_QUIT => sub {	1858	CFPlus::SDL_QUIT => sub {
1811	Event::unloop -1;	1859	Event::unloop -1;
1812	},	1860	},
1813	CFClient::SDL_VIDEORESIZE => sub {	1861	CFPlus::SDL_VIDEORESIZE => sub {
1814	},	1862	},
1815	CFClient::SDL_VIDEOEXPOSE => sub {	1863	CFPlus::SDL_VIDEOEXPOSE => sub {
1816	CFClient::UI::full_refresh;	1864	CFPlus::UI::full_refresh;
1817	},	1865	},
1818	CFClient::SDL_ACTIVEEVENT => sub {	1866	CFPlus::SDL_ACTIVEEVENT => sub {
1819	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1867	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1820	},	1868	},
1821	CFClient::SDL_KEYDOWN => sub {	1869	CFPlus::SDL_KEYDOWN => sub {
1822	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1870	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1823	# alt-enter	1871	# alt-enter
		1872	$FULLSCREEN_ENABLE->toggle;
1824	video_shutdown;	1873	video_shutdown;
1825	$CFG->{fullscreen} = !$CFG->{fullscreen};
1826	video_init;	1874	video_init;
1827	} else {	1875	} else {
1828	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1876	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1829	}	1877	}
1830	},	1878	},
1831	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1879	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1832	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1880	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1833	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1881	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1834	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1882	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1835	CFClient::SDL_USEREVENT => sub {	1883	CFPlus::SDL_USEREVENT => sub {
1836	if ($_[0]{code} == 1) {	1884	if ($_[0]{code} == 1) {
1837	audio_channel_finished $_[0]{data1};	1885	audio_channel_finished $_[0]{data1};
1838	} elsif ($_[0]{code} == 0) {	1886	} elsif ($_[0]{code} == 0) {
1839	audio_music_finished;	1887	audio_music_finished;
1840	}	1888	}
…		…
1844	#############################################################################	1892	#############################################################################
1845		1893
1846	$SIG{INT} = $SIG{TERM} = sub { exit };	1894	$SIG{INT} = $SIG{TERM} = sub { exit };
1847		1895
1848	{	1896	{
1849	local $SIG{__DIE__} = sub {
1850	return unless defined $^S && !$^S;
1851	Carp::confess $_[1];#d#TODO: remove when stable
1852	CFClient::fatal $_[0];
1853	};
1854
1855	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1897	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1856	CFClient::UI::set_layout ($::CFG->{layout});	1898	CFPlus::UI::set_layout ($::CFG->{layout});
1857		1899
1858	my %DEF_CFG = (	1900	my %DEF_CFG = (
1859	sdl_mode => 0,	1901	sdl_mode => 0,
1860	width => 640,	1902	width => 640,
1861	height => 480,	1903	height => 480,
1862	fullscreen => 0,	1904	fullscreen => 0,
1863	fast => 0,	1905	fast => 0,
1864	map_scale => 1,	1906	map_scale => 1,
1865	fow_enable => 1,	1907	fow_enable => 1,
1866	fow_intensity => 0.45,	1908	fow_intensity => 0.45,
1867	fow_smooth => 0,	1909	fow_smooth => 0,
1868	gui_fontsize => 1,	1910	gui_fontsize => 1,
1869	log_fontsize => 0.7,	1911	log_fontsize => 0.7,
1870	gauge_fontsize=> 1,	1912	gauge_fontsize => 1,
1871	gauge_size => 0.35,	1913	gauge_size => 0.35,
1872	stat_fontsize => 0.7,	1914	stat_fontsize => 0.7,
1873	mapsize => 100,	1915	mapsize => 100,
1874	host => "crossfire.schmorp.de",
1875	say_command => 'say',	1916	say_command => 'say',
1876	audio_enable => 1,	1917	audio_enable => 1,
1877	bgm_enable => 1,	1918	bgm_enable => 1,
1878	bgm_volume => 0.25,	1919	bgm_volume => 0.25,
1879	face_prefetch => 0,	1920	face_prefetch => 0,
1880	output_sync => 1,	1921	output_sync => 1,
1881	output_count => 1,	1922	output_count => 1,
1882	pickup => 0,	1923	pickup => 0,
		1924	inv_sort => "mtime",
		1925	default => "profile", # default profile
		1926	);
1883	);	1927
1884
1885	while (my ($k, $v) = each %DEF_CFG) {	1928	while (my ($k, $v) = each %DEF_CFG) {
1886	$CFG->{$k} = $v unless exists $CFG->{$k};	1929	$CFG->{$k} = $v unless exists $CFG->{$k};
1887	}	1930	}
1888		1931
		1932	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		1933
1889	sdl_init;	1934	sdl_init;
1890		1935
1891	@SDL_MODES = reverse	1936	@SDL_MODES = reverse
1892	grep $_->[0] >= 640 && $_->[1] >= 480,	1937	grep $_->[0] >= 640 && $_->[1] >= 480,
1893	CFClient::SDL_ListModes;	1938	CFPlus::SDL_ListModes;
1894		1939
1895	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1940	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1896		1941
1897	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1942	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1898		1943
1899	{	1944	{
1900	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1945	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1901	DejaVuSans.ttf	1946	DejaVuSans.ttf
1902	DejaVuSansMono.ttf	1947	DejaVuSansMono.ttf
1903	DejaVuSans-Bold.ttf	1948	DejaVuSans-Bold.ttf
1904	DejaVuSansMono-Bold.ttf	1949	DejaVuSansMono-Bold.ttf
1905	DejaVuSans-Oblique.ttf	1950	DejaVuSans-Oblique.ttf
1906	DejaVuSansMono-Oblique.ttf	1951	DejaVuSansMono-Oblique.ttf
1907	DejaVuSans-BoldOblique.ttf	1952	DejaVuSans-BoldOblique.ttf
1908	DejaVuSansMono-BoldOblique.ttf	1953	DejaVuSansMono-BoldOblique.ttf
1909	);	1954	);
1910		1955
1911	CFClient::add_font $_ for @fonts;	1956	CFPlus::add_font $_ for @fonts;
1912		1957
1913	CFClient::pango_init;	1958	CFPlus::pango_init;
1914		1959
1915	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	1960	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1916	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	1961	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1917		1962
1918	$FONT_PROP->make_default;	1963	$FONT_PROP->make_default;
1919	}	1964	}
1920		1965
1921	# compare mono (ft) vs. rgba (cairo)	1966	# compare mono (ft) vs. rgba (cairo)
1922	# ft - 1.8s, cairo 3s, even in alpha-only mode	1967	# ft - 1.8s, cairo 3s, even in alpha-only mode
1923	# for my $rgba (0..1) {	1968	# for my $rgba (0..1) {
1924	# my $t1 = Time::HiRes::time;	1969	# my $t1 = Time::HiRes::time;
1925	# for (1..1000) {	1970	# for (1..1000) {
1926	# my $layout = CFClient::Layout->new ($rgba);	1971	# my $layout = CFPlus::Layout->new ($rgba);
1927	# $layout->set_text ("hallo" x 100);	1972	# $layout->set_text ("hallo" x 100);
1928	# $layout->render;	1973	# $layout->render;
1929	# }	1974	# }
1930	# my $t2 = Time::HiRes::time;	1975	# my $t2 = Time::HiRes::time;
1931	# warn $t2-$t1;	1976	# warn $t2-$t1;
…		…
1934	video_init;	1979	video_init;
1935	audio_init;	1980	audio_init;
1936	}	1981	}
1937		1982
1938	Event::loop;	1983	Event::loop;
1939	#CFClient::SDL_Quit;	1984	#CFPlus::SDL_Quit;
1940	#CFClient::_exit 0;	1985	#CFPlus::_exit 0;
1941		1986
1942	END { CFClient::SDL_Quit }	1987	END { CFPlus::SDL_Quit }
1943		1988
1944	=head1 NAME	1989	=head1 NAME
1945		1990
1946	cfplus - A Crossfire+ and Crossfire game client	1991	cfplus - A Crossfire+ and Crossfire game client
1947		1992

Diff Legend

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