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

Diff Legend

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