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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.124 by root, Tue Nov 7 22:41:27 2006 UTC

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

Diff Legend

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