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.135 by elmex, Tue Dec 5 16:53:29 2006 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	my $startup_done = sub { };	3	my $startup_done = sub { };
		4	our $PANGO = "1.5.0";
4		5
5	# do splash-screen thingy on win32	6	# do splash-screen thingy on win32
6	BEGIN {	7	BEGIN {
7	if (%PAR::LibCache && $^O eq "MSWin32") {	8	if (%PAR::LibCache && $^O eq "MSWin32") {
8	while (my ($filename, $zip) = each %PAR::LibCache) {	9	while (my ($filename, $zip) = each %PAR::LibCache) {
…		…
29	# do things only needed for single-binary version (par)	30	# do things only needed for single-binary version (par)
30	BEGIN {	31	BEGIN {
31	if (%PAR::LibCache) {	32	if (%PAR::LibCache) {
32	@INC = grep ref, @INC; # weed out all paths except pars loader refs	33	@INC = grep ref, @INC; # weed out all paths except pars loader refs
33		34
		35	my $tmp = $ENV{PAR_TEMP};
		36
34	while (my ($filename, $zip) = each %PAR::LibCache) {	37	while (my ($filename, $zip) = each %PAR::LibCache) {
35	for ($zip->memberNames) {	38	for ($zip->memberNames) {
36	next unless /^root\/(.*)/;	39	next unless /^root\/(.*)/;
37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	40	$zip->extractMember ($_, "$tmp/$1")
38	unless -e "$ENV{PAR_TEMP}/$1";	41	unless -e "$tmp/$1";
39	}	42	}
40	}	43	}
41		44
42	# TODO: pango-rc file, anybody?	45	if ($^O eq "MSWin32") {
		46	# relocatable
		47	} else {
		48	# unix, need to patch pango rc file
		49	open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
		50	or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
		51	local $/;
		52	my $rc = <$fh>;
		53	$rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43		54
44	unshift @INC, $ENV{PAR_TEMP};	55	mkdir "$tmp/pango-modules";
		56	open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
		57	or die "$tmp/pango-modules/pango.modules: $!";
		58	print $fh $rc;
		59
		60	$ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
		61	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
		62	or die "$ENV{PANGO_RC_FILE}: $!";
		63	print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
		64	}
		65
		66	unshift @INC, $tmp;
45	}	67	}
46	}	68	}
47		69
48	# need to do it again because that pile of garbage called PAR nukes it before main	70	# need to do it again because that pile of garbage called PAR nukes it before main
49	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
50	if %PAR::LibCache;	72	if %PAR::LibCache;
51		73
52	use Time::HiRes 'time';	74	use Time::HiRes 'time';
53	use Event;	75	use Event;
		76	use List::Util qw(max min);
54		77
55	use Crossfire;	78	use Crossfire;
56	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
57		80
58	use Compress::LZF;	81	use Compress::LZF;
59		82
60	use CFPlus;	83	use CFPlus;
61	use CFPlus::OpenGL ();	84	use CFPlus::OpenGL ();
62	use CFPlus::Protocol;	85	use CFPlus::Protocol;
		86	use CFPlus::DB;
63	use CFPlus::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
		89	use CFPlus::UI::Inventory;
		90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
64	use CFPlus::Pod;	92	use CFPlus::Pod;
65	use CFPlus::BindingEditor;
66	use CFPlus::MapWidget;	93	use CFPlus::MapWidget;
		94	use CFPlus::Macro;
67		95
68	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69	$SIG{PIPE} = 'IGNORE';	97	$SIG{PIPE} = 'IGNORE';
70		98
71	$Event::Eval = 0;	99	$Event::Eval = 1;
72	$Event::DIED = sub {	100	$Event::DIED = sub {
73	CFPlus::fatal Carp::longmess $_[1]	101	CFPlus::fatal Carp::longmess $_[1]
74	};	102	};
75		103
76	my $MAX_FPS = 60;	104	my $MAX_FPS = 60;
…		…
100		128
101	our $MAP;	129	our $MAP;
102	our $MAPMAP;	130	our $MAPMAP;
103	our $MAPWIDGET;	131	our $MAPWIDGET;
104	our $BUTTONBAR;	132	our $BUTTONBAR;
105	our $LOGVIEW;
106	our $CONSOLE;
107	our $METASERVER;	133	our $METASERVER;
108	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
109	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
110	our $HOST_ENTRY;	136	our $HOST_ENTRY;
111	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
118	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
119		145
120	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
121	our $PL_WINDOW;	147	our $PL_WINDOW;
122		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
123	our $INVENTORY_PAGE;	152	our $INVENTORY_PAGE;
124	our $STATS_PAGE;	153	our $STATS_PAGE;
125	our $SKILL_PAGE;	154	our $SKILL_PAGE;
126	our $SPELL_PAGE;	155	our $SPELL_PAGE;
127	our $SPELL_LIST;	156	our $SPELL_LIST;
…		…
133	our $STATWIDS;	162	our $STATWIDS;
134		163
135	our $SDL_ACTIVE;	164	our $SDL_ACTIVE;
136	our %SDL_CB;	165	our %SDL_CB;
137		166
138	our $SDL_MIXER;
139	our @SOUNDS; # event => file mapping
140	our %AUDIO_CHUNKS; # audio files
141
142	our $ALT_ENTER_MESSAGE;	167	our $ALT_ENTER_MESSAGE;
143	our $STATUSBOX;	168	our $STATUSBOX;
144	our $DEBUG_STATUS;	169	our $DEBUG_STATUS;
145		170
146	our $INV;	171	our $INV;
147	our $INVR;	172	our $INVR;
148	our $INV_RIGHT_HB;	173	our $INV_RIGHT_HB;
149		174
150	our $BIND_EDITOR;
151	our $BIND_UPD_CB;
152
153	our $PICKUP_CFG;	175	our $PICKUP_CFG;
154		176
155	our $IN_BUILD_MODE;	177	#############################################################################
156	our $BUILD_BUTTON;
157		178
158	sub status {	179	sub status {
159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	180	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160	}	181	}
161		182
…		…
163	$DEBUG_STATUS->set_text ($_[0]);	184	$DEBUG_STATUS->set_text ($_[0]);
164	}	185	}
165		186
166	sub message {	187	sub message {
167	my ($para) = @_;	188	my ($para) = @_;
168		189	$MESSAGE_WINDOW->message ($para);
169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173	$LOGVIEW->add_paragraph ($para);
174	$LOGVIEW->scroll_to_bottom;
175	}	190	}
		191
		192	#############################################################################
		193	#TODO: maybe move into own audio module...
		194
		195	our $SDL_MIXER;
		196
		197	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		198	our $MUSIC_WANT; # arryref of ambient music we want to play
		199	our @MUSIC_HAVE; # ambient music we have on disk
		200	our $MUSIC_START;
		201	our @MUSIC_JINGLE; # which jingles to play next
		202	our $MUSIC_PLAYING_DATA;
		203	our $MUSIC_PLAYING_META;
		204	our $MUSIC_PLAYER;
		205	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
		206
		207	our %AUDIO_CHUNK; # audio "files"
		208	our %AUDIO_PLAY; # which audio faces should be played
		209
		210	sub audio_channel_finished {
		211	my ($channel) = @_;
		212
		213	# warn "channel $channel finished\n";#d#
		214	}
		215
		216	sub audio_sound_push($) {
		217	my ($face) = @_;
		218
		219	$CFG->{effects_enable}
		220	or return;
		221
		222	$AUDIO_PLAY{$face}
		223	or return;
		224
		225	if (my $chunk = $AUDIO_CHUNK{$face}) {
		226	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		227	my (undef, $dx, $dy, $vol) = @$_;
		228
		229	my $channel = CFPlus::Channel::find;
		230	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		231	$dx = $dx / 10 * 255;
		232	$channel->set_panning (255 - $dx, 255 + $dx);
		233
		234	# my $angle = $dx ? : $dx < 0 ?
		235	# my $distance = -$vol;
		236	# $channel->set_position ($angle, $distance);
		237
		238	$chunk->play ($channel);
		239	}
		240	} else {
		241	# sound_meta not set means data is in flight either way
		242	my $meta = $CONN->{sound_meta}{$face}
		243	or return;
		244
		245	# if its a jingle, play it as ambient music
		246	if ($meta->{meta}{jingle}) {
		247	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		248	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		249	&audio_music_push ($face);
		250	}
		251	} else {
		252	# fetch from database
		253	CFPlus::DB::get res_data => $meta->{name}, sub {
		254	my $rwops = new CFPlus::RW $_[0];
		255	my $chunk = new CFPlus::MixChunk $rwops
		256	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		257	$chunk->volume (($meta->{meta}{volume} || 1) * 128);
		258	$AUDIO_CHUNK{$face} = $chunk;
		259
		260	audio_sound_push ($face);
		261	};
		262	}
		263	}
		264	}
		265
		266	sub audio_sound_play {
		267	my ($face, $dx, $dy, $vol) = @_;
		268
		269	$SDL_MIXER
		270	or return;
		271	$CFG->{effects_enable}
		272	or return;
		273
		274	my $queue = $AUDIO_PLAY{$face} ||= [];
		275	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		276	audio_sound_push $face
		277	unless @$queue > 1;
		278	}
		279
		280	sub audio_music_set_meta {
		281	my ($meta) = @_;
		282
		283	$MUSIC_PLAYING_META = $meta;
		284	$MUSIC_PLAYING_WIDGET->set_markup (
		285	"<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
		286	. "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
		287	. "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
		288	. "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
		289	);
		290	}
		291
		292	sub audio_music_update_volume {
		293	return unless $MUSIC_PLAYING_META;
		294	my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
		295	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		296	CFPlus::MixMusic::volume $base * $volume * 128;
		297	}
		298
		299	sub audio_music_start {
		300	my $meta = $MUSIC_PLAYING_META;
		301
		302	CFPlus::DB::get res_data => $meta->{name}, sub {
		303	return unless $SDL_MIXER;
		304
		305	# music might have changed...
		306	$meta eq $MUSIC_PLAYING_META
		307	or return &audio_music_start ();
		308
		309	audio_music_update_volume;
		310
		311	$MUSIC_PLAYING_DATA = \$_[0];
		312
		313	my $rwops = $meta->{path}
		314	? new_from_file CFPlus::RW $meta->{path}
		315	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		316
		317	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		318	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		319
		320	my $NOW = time;
		321
		322	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		323	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		324	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		325	$MUSIC_START = time - $pos;
		326	} else {
		327	$MUSIC_PLAYER->play (0);
		328	$MUSIC_START = time;
		329	}
		330
		331	delete $meta->{stop_time};
		332	delete $meta->{stop_pos};
		333	}
		334	}
		335
		336	sub audio_music_push {
		337	return unless $SDL_MIXER;
		338
		339	my $fade_out;
		340
		341	if (@MUSIC_JINGLE) {
		342	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		343	$fade_out = 333;
		344	} else {
		345	return unless $CFG->{bgm_enable};
		346
		347	my @have =
		348	grep $_,
		349	map $CONN->{music_meta}{$_},
		350	@$MUSIC_WANT;
		351
		352	@MUSIC_HAVE = @have
		353	if @have;
		354
		355	# default MUSIC_HAVE == MUSIC_DEFAULT
		356	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		357	$fade_out = 1000;
		358	}
		359
		360	# if the currently playing song is acceptable, let it continue
		361	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		362
		363	my $NOW = time;
		364
		365	if ($MUSIC_PLAYING_META) {
		366	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		367	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		368	CFPlus::MixMusic::fade_out $fade_out;
		369	} else {
		370	# sort by stop time, oldest first
		371	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		372
		373	# if the most recently-played piece played very recently,
		374	# resume it, else choose the oldest piece for rotation.
		375	audio_music_set_meta
		376	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		377	? $MUSIC_HAVE[-1]
		378	: $MUSIC_HAVE[0];
		379
		380	audio_music_start;
		381	}
		382	}
		383
		384	sub audio_music_set_ambient {
		385	my ($songs) = @_;
		386
		387	$MUSIC_WANT = $songs;
		388	audio_music_push;
		389	}
		390
		391	sub audio_music_finished {
		392	# we compress multiple jingles of the same type
		393	shift @MUSIC_JINGLE
		394	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		395
		396	$MUSIC_PLAYING_WIDGET->clear;
		397
		398	undef $MUSIC_PLAYER;
		399	undef $MUSIC_PLAYING_META;
		400	undef $MUSIC_PLAYING_DATA;
		401
		402	audio_music_push;
		403	}
		404
		405	sub audio_init {
		406	if ($CFG->{audio_enable}) {
		407	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		408	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		409
		410	unless ($SDL_MIXER) {
		411	status "Unable to open sound device: there will be no sound";
		412	return;
		413	}
		414
		415	CFPlus::Mix_AllocateChannels 16;
		416
		417	audio_music_finished;
		418	} else {
		419	undef $SDL_MIXER;
		420	}
		421	}
		422
		423	sub audio_shutdown {
		424	undef $MUSIC_PLAYER;
		425	undef $MUSIC_PLAYING_META;
		426	undef $MUSIC_PLAYING_DATA;
		427
		428	$MUSIC_WANT = [];
		429	@MUSIC_JINGLE = ();
		430	%AUDIO_PLAY = ();
		431	%AUDIO_CHUNK = ();
		432
		433	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		434	undef $SDL_MIXER;
		435	}
		436
		437	#############################################################################
176		438
177	sub destroy_query_dialog {	439	sub destroy_query_dialog {
178	(delete $_[0]{query_dialog})->destroy	440	(delete $_[0]{query_dialog})->destroy
179	if $_[0]{query_dialog};	441	if $_[0]{query_dialog};
180	}	442	}
181		443
		444	# FIXME: a very ugly hack to wait for stat update look below! #d#
		445	our $QUERY_TIMER; #d#
		446
182	# server query dialog	447	# server query dialog
183	sub server_query {	448	sub server_query {
184	my ($conn, $flags, $prompt) = @_;	449	my ($conn, $flags, $prompt) = @_;
		450
		451	# FIXME: a very ugly hack to wait for stat update #d#
		452	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		453	unless ($QUERY_TIMER) {
		454	$QUERY_TIMER =
		455	Event->timer (
		456	after => 1,
		457	cb => sub {
		458	server_query ($conn, $flags, $prompt, 1);
		459	$QUERY_TIMER = undef
		460	}
		461	);
		462	return;
		463	}
		464	}
185		465
186	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel	466	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187	x => "center",	467	x => "center",
188	y => "center",	468	y => "center",
189	title => "Server Query",	469	title => "Server Query",
190	child => my $vbox = new CFPlus::UI::VBox,	470	child => my $vbox = new CFPlus::UI::VBox,
191	;	471	;
192		472
193	my @dialog = my $label = new CFPlus::UI::Label	473	my @dialog = my $label = new CFPlus::UI::Label
194	max_w => $::WIDTH * 0.4,	474	max_w => $::WIDTH * 0.8,
195	ellipsise => 0,	475	ellipsise => 0,
196	text => $prompt;	476	text => $prompt;
197		477
198	if ($flags & CS_QUERY_YESNO) {	478	if ($flags & CS_QUERY_YESNO) {
199	push @dialog, my $hbox = new CFPlus::UI::HBox;	479	push @dialog, my $hbox = new CFPlus::UI::HBox;
…		…
216	);	496	);
217		497
218	$dialog->grab_focus;	498	$dialog->grab_focus;
219		499
220	} elsif ($flags & CS_QUERY_SINGLECHAR) {	500	} elsif ($flags & CS_QUERY_SINGLECHAR) {
221	$dialog->{tooltip} = "#charcreation_focus";
222
223	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	501	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
224	$MESSAGE_WINDOW->show;	502	$dialog->{tooltip} = "#charcreation_focus";
225		503
226	unshift @dialog, new CFPlus::UI::Label	504	unshift @dialog, new CFPlus::UI::Label
227	max_w => $::WIDTH * 0.4,	505	max_w => $::WIDTH * 0.8,
228	ellipsise => 0,	506	ellipsise => 0,
229	markup => "\nOr use your keyboard and the text entry below:\n";	507	markup => "\nOr use your keyboard and the text entry below:\n";
230		508
231	unshift @dialog, my $table = new CFPlus::UI::Table;	509	unshift @dialog, my $table = new CFPlus::UI::Table;
232		510
233	$table->add (0, 0, new CFPlus::UI::Button	511	$table->add_at (0, 0, new CFPlus::UI::Button
234	text => "Next Race",	512	text => "Next Race",
235	on_activate => sub {	513	on_activate => sub {
236	$conn->send ("reply n");	514	$conn->send ("reply n");
237	destroy_query_dialog $conn;	515	destroy_query_dialog $conn;
238	0	516	0
239	},	517	},
240	);	518	);
241	$table->add (2, 0, new CFPlus::UI::Button	519	$table->add_at (2, 0, new CFPlus::UI::Button
242	text => "Accept",	520	text => "Accept",
243	on_activate => sub {	521	on_activate => sub {
244	$conn->send ("reply d");	522	$conn->send ("reply d");
245	destroy_query_dialog $conn;	523	destroy_query_dialog $conn;
246	0	524	0
247	},	525	},
248	);	526	);
249		527
		528	if ($conn->{chargen_race_description}) {
		529	unshift @dialog, new CFPlus::UI::Label
		530	max_w => $::WIDTH * 0.8,
		531	ellipsise => 0,
		532	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		533	;
		534	}
		535
		536	unshift @dialog, new CFPlus::UI::Face
		537	face => $conn->{player}{face},
		538	bg => [.2, .2, .2, 1],
		539	min_w => 64,
		540	min_h => 64,
		541	;
		542
		543	if ($conn->{chargen_race_title}) {
		544	unshift @dialog, new CFPlus::UI::Label
		545	allign => 1,
		546	ellipsise => 0,
		547	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		548	;
		549	}
		550
250	unshift @dialog, new CFPlus::UI::Label	551	unshift @dialog, new CFPlus::UI::Label
251	max_w => $::WIDTH * 0.4,	552	max_w => $::WIDTH * 0.4,
252	ellipsise => 0,	553	ellipsise => 0,
253	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	554	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
254	;	555	;
…		…
258	$conn->send ("reply $stat");	559	$conn->send ("reply $stat");
259	destroy_query_dialog $conn;	560	destroy_query_dialog $conn;
260	return;	561	return;
261	}	562	}
262		563
263	$STATS_PAGE->show;
264	$MESSAGE_WINDOW->hide;
265
266	unshift @dialog, new CFPlus::UI::Label	564	unshift @dialog, new CFPlus::UI::Label
267	max_w => $::WIDTH * 0.4,	565	max_w => $::WIDTH * 0.4,
268	ellipsise => 0,	566	ellipsise => 0,
269	markup => "\nOr use your keyboard and the text entry below:\n";	567	markup => "\nOr use your keyboard and the text entry below:\n";
270		568
271	unshift @dialog, my $table = new CFPlus::UI::Table;	569	unshift @dialog, my $table = new CFPlus::UI::Table;
272		570
273	# left: re-roll	571	# left: re-roll
274	$table->add (0, 0, new CFPlus::UI::Button	572	$table->add_at (0, 0, new CFPlus::UI::Button
275	text => "Roll Again",	573	text => "Roll Again",
276	on_activate => sub {	574	on_activate => sub {
277	$conn->send ("reply y");	575	$conn->send ("reply y");
278	destroy_query_dialog $conn;	576	destroy_query_dialog $conn;
279	0	577	0
…		…
293	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	591	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
294	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	592	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
295	],	593	],
296	), 1 .. 2;	594	), 1 .. 2;
297		595
298	$table->add (2, 0, new CFPlus::UI::Button	596	$table->add_at (2, 0, new CFPlus::UI::Button
299	text => "Swap Stats",	597	text => "Swap Stats",
300	on_activate => sub {	598	on_activate => sub {
301	$conn->{stat_change_with} = $sw2->{value};	599	$conn->{stat_change_with} = $sw2->{value};
302	$conn->send ("reply $sw1->{value}");	600	$conn->send ("reply $sw1->{value}");
303	destroy_query_dialog $conn;	601	destroy_query_dialog $conn;
304	0	602	0
305	},	603	},
306	);	604	);
307	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	605	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
308		606
309	# right: accept	607	# right: accept
310	$table->add (4, 0, new CFPlus::UI::Button	608	$table->add_at (4, 0, new CFPlus::UI::Button
311	text => "Accept",	609	text => "Accept",
312	on_activate => sub {	610	on_activate => sub {
313	$conn->send ("reply n");	611	$conn->send ("reply n");
314	$STATS_PAGE->hide;	612	$STATS_PAGE->hide;
315	destroy_query_dialog $conn;	613	destroy_query_dialog $conn;
…		…
378	status "logging in...";	676	status "logging in...";
379		677
380	$LOGIN_BUTTON->set_text ("Logout");	678	$LOGIN_BUTTON->set_text ("Logout");
381	$SETUP_DIALOG->hide;	679	$SETUP_DIALOG->hide;
382		680
383	$PROFILE = $CFG->{profile}{default};
384
385	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	681	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
386		682
387	my ($host, $port) = split /:/, $PROFILE->{host};	683	my ($host, $port) = split /:/, $PROFILE->{host};
388		684
389	$MAP = new CFPlus::Map;	685	$MAP = new CFPlus::Map;
…		…
398	maph => $mapsize,	694	maph => $mapsize,
399		695
400	client => "cfplus $CFPlus::VERSION $] $^O",	696	client => "cfplus $CFPlus::VERSION $] $^O",
401		697
402	map_widget => $MAPWIDGET,	698	map_widget => $MAPWIDGET,
403	logview => $LOGVIEW,
404	statusbox => $STATUSBOX,	699	statusbox => $STATUSBOX,
405	map => $MAP,	700	map => $MAP,
406	mapmap => $MAPMAP,	701	mapmap => $MAPMAP,
407	query => \&server_query,	702	query => \&server_query,
408		703
409	sound_play => sub {	704	setup_req => {
410	my ($x, $y, $soundnum, $type) = @_;	705	smoothing => $CFG->{map_smoothing}*1,
411
412	$SDL_MIXER
413	or return;
414
415	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
416	or return;
417
418	$chunk->play;
419	},	706	},
420	};	707	};
421		708
422	if ($CONN) {	709	if ($CONN) {
423	CFPlus::lowdelay fileno $CONN->{fh};	710	CFPlus::lowdelay fileno $CONN->{fh};
…		…
433	$LOGIN_BUTTON->set_text ("Login");	720	$LOGIN_BUTTON->set_text ("Login");
434	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	721	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
435	$SETUP_DIALOG->show;	722	$SETUP_DIALOG->show;
436	$PL_WINDOW->hide;	723	$PL_WINDOW->hide;
437	$SPELL_LIST->clear_spells;	724	$SPELL_LIST->clear_spells;
		725	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		726
		727	&audio_music_set_ambient ([]);
438		728
439	return unless $CONN;	729	return unless $CONN;
440		730
441	status "connection closed";	731	status "connection closed";
442		732
…		…
450	sub graphics_setup {	740	sub graphics_setup {
451	my $vbox = new CFPlus::UI::VBox;	741	my $vbox = new CFPlus::UI::VBox;
452		742
453	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	743	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
454		744
		745	my $row = 0;
		746
		747	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		748	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		749	can_events => 1,
		750	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		751
		752	my $vidmode_tooltip =
		753	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		754	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		755
455	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	756	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
456	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);	757	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
457		758
		759	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
458	$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]);	760	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
459	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	761	tooltip => $vidmode_tooltip);
		762	$hbox->add (my $mode_label = new CFPlus::UI::Label
		763	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		764	can_events => 1, tooltip => $vidmode_tooltip);
460		765
461	$mode_slider->connect (changed => sub {	766	$mode_slider->connect (changed => sub {
462	my ($self, $value) = @_;	767	my ($self, $value) = @_;
463		768
464	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	769	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	770	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
466	});	771	});
467	$mode_slider->emit (changed => $mode_slider->{range}[0]);	772	$mode_slider->emit (changed => $mode_slider->{range}[0]);
468		773
469	my $row = 1;
470
471	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	774	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
472	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	775	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473	state => $CFG->{fullscreen},	776	state => $CFG->{fullscreen},
474	tooltip => "Bring the client into fullscreen mode.",	777	tooltip => "Bring the client into fullscreen mode.",
475	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	778	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
476	);	779	);
477		780
478	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	781	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
479	$table->add (1, $row++, new CFPlus::UI::CheckBox	782	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
480	state => $CFG->{fast},	783	state => $CFG->{fast},
481	tooltip => "Lower the visual quality considerably to speed up rendering.",	784	tooltip => "Lower the visual quality considerably to speed up rendering.",
482	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	785	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
483	);	786	);
484		787
		788	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		789	$table->add_at (1, $row++, new CFPlus::UI::Slider
		790	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		791	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		792	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		793	);
		794
		795	$table->add_at (1, $row++, new CFPlus::UI::Button
		796	expand => 1, align => 0, text => "Apply",
		797	tooltip => "Apply the video settings above.",
		798	on_activate => sub {
		799	video_shutdown ();
		800	video_init ();
		801	0
		802	}
		803	);
		804
485	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	805	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
486	$table->add (1, $row++, new CFPlus::UI::Slider	806	$table->add_at (1, $row++, new CFPlus::UI::Slider
487	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	807	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
488	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	808	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
489	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	809	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
490	);	810	);
491		811
		812	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		813	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		814	state => $CFG->{map_smoothing},
		815	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		816	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		817	. "Changes take effect at next connection only.",
		818	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		819	);
		820
492	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	821	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
493	$table->add (1, $row++, new CFPlus::UI::CheckBox	822	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
494	state => $CFG->{fow_enable},	823	state => $CFG->{fow_enable},
495	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	824	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
496	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	825	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
497	);	826	);
498		827
499	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	828	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
500	$table->add (1, $row++, new CFPlus::UI::Slider	829	$table->add_at (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	830	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
502	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	831	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
503	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	832	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
504	);	833	);
505		834
506	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
507	$table->add (1, $row++, new CFPlus::UI::CheckBox
508	state => $CFG->{fow_smooth},
509	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
510	on_changed => sub {
511	my ($self, $value) = @_;
512	$CFG->{fow_smooth} = $value;
513	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
514	0
515	}
516	);
517
518	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
519	$table->add (1, $row++, new CFPlus::UI::Slider
520	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
521	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
522	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
523	);
524
525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	835	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
526	$table->add (1, $row++, new CFPlus::UI::Slider	836	$table->add_at (1, $row++, new CFPlus::UI::Slider
527	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	837	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
528	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	838	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
529	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	839	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
530	);	840	);
531		841
532	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	842	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
533	$table->add (1, $row++, new CFPlus::UI::Slider	843	$table->add_at (1, $row++, new CFPlus::UI::Slider
534	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	844	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
535	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	845	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
536	on_changed => sub {	846	on_changed => sub {
537	$CFG->{gauge_fontsize} = $_[1];	847	$CFG->{gauge_fontsize} = $_[1];
538	&set_gauge_window_fontsize;	848	&set_gauge_window_fontsize;
539	0	849	0
540	}	850	}
541	);	851	);
542		852
543	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	853	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
544	$table->add (1, $row++, new CFPlus::UI::Slider	854	$table->add_at (1, $row++, new CFPlus::UI::Slider
545	range => [$CFG->{gauge_size}, 0.2, 0.8],	855	range => [$CFG->{gauge_size}, 0.2, 0.8],
546	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	856	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
547	on_changed => sub {	857	on_changed => sub {
548	$CFG->{gauge_size} = $_[1];	858	$CFG->{gauge_size} = $_[1];
549	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	859	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
550	0	860	0
551	}	861	}
552	);	862	);
553		863
554	$table->add (1, $row++, new CFPlus::UI::Button
555	expand => 1, align => 0, text => "Apply",
556	tooltip => "Apply the video settings",
557	on_activate => sub {
558	video_shutdown ();
559	video_init ();
560	0
561	}
562	);
563
564	$vbox	864	$vbox
565	}	865	}
566		866
567	sub audio_setup {	867	sub audio_setup {
568	my $vbox = new CFPlus::UI::VBox;	868	my $vbox = new CFPlus::UI::VBox;
569		869
570	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	870	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
571		871
572	my $row = 0;	872	my $row = 0;
573		873
574	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	874	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
575	$table->add (1, $row++, new CFPlus::UI::CheckBox	875	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
576	state => $CFG->{audio_enable},	876	state => $CFG->{audio_enable},
577	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.",	877	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.",
578	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	878	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
579	);	879	);
580	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	880	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
581	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	881	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
582	# $CFG->{effects_volume} = $_[1];	882	# $CFG->{effects_volume} = $_[1];
583	# });	883	# });
		884
		885	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
		886	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		887	expand => 1, state => $CFG->{effects_enable},
		888	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		889	on_changed => sub {
		890	$CFG->{effects_enable} = $_[1];
		891	$CONN->update_fx_want if $CONN;
		892	0
		893	}
		894	);
		895	$table->add_at (2, $row++, new CFPlus::UI::Slider
		896	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		897	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		898	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		899	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		900	);
		901
584	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	902	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
585	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
586	$hbox->add (new CFPlus::UI::CheckBox	903	$table->add_at (1, $row, new CFPlus::UI::CheckBox
587	expand => 1, state => $CFG->{bgm_enable},	904	expand => 1, state => $CFG->{bgm_enable},
588	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	905	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
589	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	906	on_changed => sub {
		907	$CFG->{bgm_enable} = $_[1];
		908	$CONN->update_fx_want if $CONN;
		909	0
		910	}
590	);	911	);
591	$hbox->add (new CFPlus::UI::Slider	912	$table->add_at (2, $row++, new CFPlus::UI::Slider
592	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	913	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
593	tooltip => "The volume of the background music. Changes are instant.",	914	tooltip => "The volume of the background music. Changes are instant.",
594	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	915	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
595	);	916	);
596		917
597	$table->add (1, $row++, new CFPlus::UI::Button	918	$table->add_at (1, $row++, new CFPlus::UI::Button
598	expand => 1, align => 0, text => "Apply",	919	c_colspan => 2, expand => 1, align => 0, text => "Apply",
599	tooltip => "Apply the audio settings",	920	tooltip => "Apply the audio settings",
600	on_activate => sub {	921	on_activate => sub {
601	audio_shutdown ();	922	audio_shutdown ();
602	audio_init ();	923	audio_init ();
603	0	924	0
…		…
661	}	982	}
662		983
663	sub debug_setup {	984	sub debug_setup {
664	my $table = new CFPlus::UI::Table;	985	my $table = new CFPlus::UI::Table;
665		986
666	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	987	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
667	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	988	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
668	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	989	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
669	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	990	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
670	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	991	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
671	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	992	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
672	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	993	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
673	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	994	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );	995	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
675		996
676	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	997	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
677		998
678	for my $x (0..2) {	999	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
679	for my $y (0 .. 2) {	1000	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
680	$table->add ($x + 3, $y,	1001	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
681	new CFPlus::UI::Entry	1002	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
682	text => $default_smooth[$x * 3 + $y],	1003	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
683	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	1004	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
684	);	1005
685	}	1006	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		1007
		1008	$c->add_items ({
		1009	type => "line_loop",
		1010	color => [0, 1, 0],
		1011	width => 9,
		1012	coord_mode => "abs",
		1013	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
686	}	1014	});
687		1015
		1016	$c->add_items ({
		1017	type => "lines",
		1018	color => [1, 1, 0],
		1019	width => 2,
		1020	coord_mode => "rel",
		1021	coord => [[0,0], [1,1], [1,0], [0,1]],
		1022	});
		1023
		1024	$c->add_items ({
		1025	type => "polygon",
		1026	color => [0, 0.43, 0],
		1027	width => 2,
		1028	coord_mode => "rel",
		1029	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		1030	});
688		1031
689	$table	1032	$table
690	}	1033	}
691		1034
692	sub stats_window {	1035	sub stats_window {
…		…
740	[2, 4, st_spd => "Spd", 10.54],	1083	[2, 4, st_spd => "Spd", 10.54],
741	[2, 5, st_wspd => "WSp", 10.54],	1084	[2, 5, st_wspd => "WSp", 10.54],
742	) {	1085	) {
743	my ($col, $row, $id, $label, $template) = @$_;	1086	my ($col, $row, $id, $label, $template) = @$_;
744		1087
745	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1088	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
746	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1089	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
747	align => +1, template => $template, tooltip => "#stat_$label");	1090	align => +1, template => $template, tooltip => "#stat_$label");
748	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1091	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
749	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1092	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
750	align => -1, text => $label, tooltip => "#stat_$label");	1093	align => -1, text => $label, tooltip => "#stat_$label");
751	}	1094	}
752		1095
753	$vb->add (new CFPlus::UI::FancyFrame	1096	$vb->add (new CFPlus::UI::FancyFrame
…		…
794	cold => ["Cold",	1137	cold => ["Cold",
795	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1138	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
796	ghit => ["Ghost hit",	1139	ghit => ["Ghost hit",
797	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1140	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
798	);	1141	);
		1142
799	for (qw/slow holyw conf fire depl magic	1143	for (qw/slow holyw conf fire depl magic
800	drain acid pois para deat phys	1144	drain acid pois para deat phys
801	blind fear tund elec cold ghit/)	1145	blind fear tund elec cold ghit/)
802	{	1146	{
803	$tbl2->add ($col, $row,	1147	$tbl2->add_at ($col, $row,
804	$STATWIDS->{"res_$_"} =	1148	$STATWIDS->{"res_$_"} =
805	new CFPlus::UI::Label	1149	new CFPlus::UI::Label
806	font => $FONT_FIXED,	1150	font => $FONT_FIXED,
807	template => "-100%",	1151	template => "-100%",
808	align => +1,	1152	align => +1,
809	valign => 0,	1153	valign => 0,
810	can_events => 1,	1154	can_events => 1,
811	can_hover => 1,	1155	can_hover => 1,
812	tooltip => $resist_names{$_}->[1],	1156	tooltip => $resist_names{$_}->[1],
813	);	1157	);
814	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	1158	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
815	font => $FONT_FIXED,	1159	font => $FONT_FIXED,
816	can_hover => 1,	1160	can_hover => 1,
817	can_events => 1,	1161	can_events => 1,
818	path => "ui/resist/resist_$_.png",	1162	path => "ui/resist/resist_$_.png",
819	tooltip => $resist_names{$_}->[1],	1163	tooltip => $resist_names{$_}->[1],
820	);	1164	);
821	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	1165	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
822	text => $resist_names{$_}->[0],	1166	text => $resist_names{$_}->[0],
823	font => $FONT_FIXED,	1167	font => $FONT_FIXED,
824	can_hover => 1,	1168	can_hover => 1,
825	can_events => 1,	1169	can_events => 1,
826	tooltip => $resist_names{$_}->[1],	1170	tooltip => $resist_names{$_}->[1],
…		…
859	return if $METASERVER_ATIME > time;	1203	return if $METASERVER_ATIME > time;
860	$METASERVER_ATIME = time + 60;	1204	$METASERVER_ATIME = time + 60;
861		1205
862	my $table = $METASERVER->{table};	1206	my $table = $METASERVER->{table};
863	$table->clear;	1207	$table->clear;
864	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1208	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
865		1209
866	my $ok = 0;	1210	my $ok = 0;
867		1211
868	CFPlus::background {	1212	CFPlus::background {
869	my $ua = CFPlus::lwp_useragent;	1213	my $ua = CFPlus::lwp_useragent;
…		…
880	"The time this server has been running without being restarted.",	1224	"The time this server has been running without being restarted.",
881	"The server software version - a '+' indicates a Crossfire+ server.",	1225	"The server software version - a '+' indicates a Crossfire+ server.",
882	"Short information about this server provided by its admins.",	1226	"Short information about this server provided by its admins.",
883	);	1227	);
884	my @col = qw(#Users Host Uptime Version Description);	1228	my @col = qw(#Users Host Uptime Version Description);
885	$table->add ($_, 0, new CFPlus::UI::Label	1229	$table->add_at ($_, 0, new CFPlus::UI::Label
886	can_hover => 1, can_events => 1,	1230	can_hover => 1, can_events => 1,
887	align => 0, fg => [1, 1, 0],	1231	align => 0, fg => [1, 1, 0],
888	text => $col[$_], tooltip => $tip[$_])	1232	text => $col[$_], tooltip => $tip[$_])
889	for 0 .. $#col;	1233	for 0 .. $#col;
890		1234
891	my @align = qw(1 0 1 1 -1);	1235	my @align = qw(1 0 1 1 -1);
892		1236
893	my $y = 0;	1237	my $y = 0;
894	for my $m (
895	sort {
896	$b->{version} <=> $a->{version}
897	or $b->{users} <=> $a->{users}
898	}
899	@{ $msg->{servers} }	1238	for my $m (@{ $msg->{servers} }) {
900	) {
901	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =	1239	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
902	@$m{qw(ip age hostname users version description ibytes obytes uptime)};	1240	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
903		1241
904	for ($desc) {	1242	for ($desc) {
905	s/<br>/\n/gi;	1243	s/<br>/\n/gi;
906	s/<li>/\n· /gi;	1244	s/<li>/\n· /gi;
907	s/<.*?>//sgi;	1245	s/<.*?>//sgi;
…		…
918		1256
919	$m = [$users, $host, $uptime, $version, $desc];	1257	$m = [$users, $host, $uptime, $version, $desc];
920		1258
921	$y++;	1259	$y++;
922		1260
923	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	1261	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
924	(new CFPlus::UI::Button	1262	(new CFPlus::UI::Button
925	text => "Use",	1263	text => "Use",
926	tooltip => "Put this server into the <b>Host:Port</b> field",	1264	tooltip => "Put this server into the <b>Host:Port</b> field",
927	on_activate => sub {	1265	on_activate => sub {
928	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1266	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
931	},	1269	},
932	),	1270	),
933	(new CFPlus::UI::Empty expand => 1),	1271	(new CFPlus::UI::Empty expand => 1),
934	]);	1272	]);
935		1273
936	$table->add ($_, $y, new CFPlus::UI::Label	1274	$table->add_at ($_, $y, new CFPlus::UI::Label
937	max_w => $::WIDTH * 0.4,	1275	max_w => $::WIDTH * 0.4,
938	ellipsise => 0,	1276	ellipsise => 0,
939	align => $align[$_],	1277	align => $align[$_],
940	text => $m->[$_],	1278	text => $m->[$_],
941	tooltip => $tip[$_],	1279	tooltip => $tip[$_],
942	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),	1280	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
943	can_hover => 1,	1281	can_hover => 1,
944	can_events => 1,	1282	can_events => 1,
945	fontsize => 0.8)	1283	fontsize => 0.8)
946	for 0 .. $#$m;	1284	for 0 .. $#$m;
947	}	1285	}
…		…
982		1320
983	$vbox->add (new CFPlus::UI::FancyFrame	1321	$vbox->add (new CFPlus::UI::FancyFrame
984	label => "Connection Settings",	1322	label => "Connection Settings",
985	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1323	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
986	);	1324	);
987	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1325	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
988		1326
989	{	1327	{
990	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1328	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
991		1329
992	$vbox->add (	1330	$vbox->add (
993	$HOST_ENTRY = new CFPlus::UI::Entry	1331	$HOST_ENTRY = new CFPlus::UI::Entry
994	expand => 1,	1332	expand => 1,
995	text => $CFG->{profile}{default}{host},	1333	text => $CFG->{profile}{default}{host},
996	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1334	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
997	on_changed => sub {	1335	on_changed => sub {
998	my ($self, $value) = @_;	1336	my ($self, $value) = @_;
999	$CFG->{profile}{default}{host} = $value;	1337	$CFG->{profile}{default}{host} = $value;
1000	0	1338	1
1001	}	1339	}
1002	);	1340	);
1003		1341
1004	$vbox->add (new CFPlus::UI::Button	1342	$vbox->add (new CFPlus::UI::Button
1005	expand => 1,	1343	expand => 1,
1006	text => "Server List",	1344	text => "Server List",
1007	other => $METASERVER,	1345	other => $METASERVER,
1008	tooltip => "Show a list of available crossfire servers",	1346	tooltip => "Show a list of available crossfire servers",
1009	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1347	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1010	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1348	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1011	);	1349	);
1012	}	1350	}
1013		1351
1014	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1352	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1015	$table->add (1, 4, new CFPlus::UI::Entry	1353	$table->add_at (1, 4, new CFPlus::UI::Entry
1016	text => $CFG->{profile}{default}{user},	1354	text => $CFG->{profile}{default}{user},
1017	tooltip => "The name of your character on the server",	1355	tooltip => "The name of your character on the server",
1018	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1356	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1019	);	1357	);
1020		1358
1021	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1359	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1022	$table->add (1, 5, new CFPlus::UI::Entry	1360	$table->add_at (1, 5, new CFPlus::UI::Entry
1023	text => $CFG->{profile}{default}{password},	1361	text => $CFG->{profile}{default}{password},
1024	hidden => 1,	1362	hidden => 1,
1025	tooltip => "The password for your character",	1363	tooltip => "The password for your character",
1026	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1364	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1027	);	1365	);
1028		1366
1029	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1367	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1030	$table->add (1, 7, new CFPlus::UI::Slider	1368	$table->add_at (1, 7, new CFPlus::UI::Slider
1031	force_w => 100,	1369	force_w => 100,
1032	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1370	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1033	tooltip => "This is the size of the portion of the map update the server sends you. "	1371	tooltip => "This is the size of the portion of the map update the server sends you. "
1034	. "If you set this to a high value you will be able to see further, "	1372	. "If you set this to a high value you will be able to see further, "
1035	. "but you also increase bandwidth requirements and latency. "	1373	. "but you also increase bandwidth requirements and latency. "
1036	. "This option is only used once at log-in.",	1374	. "This option is only used once at log-in.",
1037	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1375	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1038	);	1376	);
1039		1377
1040	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1378	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1041	$table->add (1, 8, new CFPlus::UI::CheckBox	1379	$table->add_at (1, 8, new CFPlus::UI::Entry
1042	state => $CFG->{face_prefetch},	1380	text => $CFG->{output_rate},
1043	tooltip => "<b>Background Image Prefetch</b>\n\n"	1381	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1044	. "If enabled, the client automatically pre-fetches images from the server. "	1382	. "when sending data. When 0 or unset, the server "
1045	. "This might increase or create lag, but increases the chances "	1383	. "default will be used, which is usually around 100kb/s. Most servers will "
1046	. "of faces being ready for display when you encounter them. "	1384	. "dynamically find an optimal rate, so adjust this only when necessary.",
1047	. "It also uses up server bandwidth on every connect, "
1048	. "so only set it if you really need to prefetch images. "
1049	. "This option can be set and unset any time.",
1050	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1385	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1051	);	1386	);
1052		1387
1053	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1388	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1054	$table->add (1, 9, new CFPlus::UI::Entry	1389	$table->add_at (1, 9, new CFPlus::UI::Entry
1055	text => $CFG->{output_count},	1390	text => $CFG->{output_count},
1056	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1391	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1057	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1392	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1058	);	1393	);
1059		1394
1060	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1395	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1061	$table->add (1, 10, new CFPlus::UI::Entry	1396	$table->add_at (1, 10, new CFPlus::UI::Entry
1062	text => $CFG->{output_sync},	1397	text => $CFG->{output_sync},
1063	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1398	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1064	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1399	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1065	);	1400	);
1066		1401
1067	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1402	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1068	expand => 1,	1403	expand => 1,
1069	align => 0,	1404	align => 0,
1070	text => "Login",	1405	text => "Login",
1071	on_activate => sub {	1406	on_activate => sub {
1072	$CONN ? stop_game	1407	$CONN ? stop_game
1073	: start_game;	1408	: start_game;
1074	0	1409	1
1075	},	1410	},
1076	);	1411	);
1077		1412
1078	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");	1413	$vbox->add (new CFPlus::UI::FancyFrame
1079	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry	1414	label => "Server Info",
1080	text => $CFG->{say_command},	1415	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1081	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. "
1082	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1083	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1084	on_changed => sub {
1085	my ($self, $value) = @_;
1086	$CFG->{say_command} = $value;
1087	0
1088	}
1089	);	1416	);
1090		1417
		1418	$vbox
		1419	}
		1420
		1421	sub client_setup {
		1422	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1423
		1424	my $row = 0;
		1425
1091	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1426	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1092	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox	1427	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1093	state => $CFG->{show_tips},	1428	state => $CFG->{show_tips},
1094	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1429	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1095	on_changed => sub {	1430	on_changed => sub {
1096	my ($self, $value) = @_;	1431	my ($self, $value) = @_;
1097	$CFG->{show_tips} = $value;	1432	$CFG->{show_tips} = $value;
1098	0	1433	0
1099	}	1434	}
1100	);	1435	);
1101		1436
1102	$vbox->add (new CFPlus::UI::FancyFrame	1437	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1103	label => "Server Info",	1438	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1104	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1439	text => $CFG->{logview_max_par},
1105	);	1440	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1106		1441	. "sends more messages than this number, older messages get removed to save memory and "
1107	$vbox	1442	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1108	}
1109
1110	sub message_window {
1111	my $window = new CFPlus::UI::Toplevel
1112	name => "message_window",
1113	title => "Messages",
1114	border_bg => [1, 1, 1, 1],
1115	x => "max",
1116	y => 0,
1117	force_w => $::WIDTH * 0.4,
1118	force_h => $::HEIGHT * 0.5,
1119	child => (my $vbox = new CFPlus::UI::VBox),
1120	has_close_button => 1;
1121
1122	$vbox->add ($LOGVIEW);
1123
1124	$vbox->add (my $input = new CFPlus::UI::Entry
1125	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1126	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1127	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1128	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1129	on_focus_in => sub {	1443	on_changed => sub {
1130	my ($input, $prev_focus) = @_;	1444	my ($self, $value) = @_;
1131		1445	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1132	delete $input->{refocus_map};
1133
1134	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1135	$input->{refocus_map} = 1;
1136	}
1137	delete $input->{auto_activated};
1138
1139	0	1446	0
1140	},	1447	},
1141	on_activate => sub {
1142	my ($input, $text) = @_;
1143	$input->set_text ('');
1144
1145	if ($text =~ /^\/(.*)/) {
1146	$::CONN->user_send ($1);
1147	} else {
1148	my $say_cmd = $::CFG->{say_command} || 'say';
1149	$::CONN->user_send ("$say_cmd $text");
1150	}
1151	if ($input->{refocus_map}) {
1152	delete $input->{refocus_map};
1153	$MAPWIDGET->focus_in
1154	}
1155
1156	0
1157	},
1158	on_escape => sub {
1159	$MAPWIDGET->grab_focus;
1160
1161	0
1162	},
1163	);
1164
1165	$CONSOLE = {
1166	window => $window,
1167	input => $input,
1168	};	1448	);
1169		1449
1170	$window	1450	$table
1171	}	1451	}
1172		1452
1173	sub autopickup_setup {	1453	sub autopickup_setup {
		1454	my $r = new CFPlus::UI::ScrolledWindow (
		1455	expand => 1,
		1456	scroll_y => 1
		1457	);
1174	my $table = new CFPlus::UI::Table;	1458	$r->add (my $table = new CFPlus::UI::Table
		1459	row_expand => [0],
		1460	col_expand => [0, 1, 0, 1],
		1461	);
1175		1462
1176	for (	1463	for (
1177	["General", 0, 0,	1464	["General", 0, 0,
1178	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1465	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1179	["Inhibit autopickup" => PICKUP_INHIBIT],	1466	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1214	],	1501	],
1215	["Weight/Value ratio", 2, 17]	1502	["Weight/Value ratio", 2, 17]
1216	)	1503	)
1217	{	1504	{
1218	my ($title, $x, $y, @bits) = @$_;	1505	my ($title, $x, $y, @bits) = @$_;
1219	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1506	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1220		1507
1221	for (@bits) {	1508	for (@bits) {
1222	++$y;	1509	++$y;
1223		1510
1224	my $mask = $_->[1];	1511	my $mask = $_->[1];
1225	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1512	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1226	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1513	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1227	state => $::CFG->{pickup} & $mask,	1514	state => $::CFG->{pickup} & $mask,
1228	on_changed => sub {	1515	on_changed => sub {
1229	my ($box, $value) = @_;	1516	my ($box, $value) = @_;
1230		1517
1231	if ($value) {	1518	if ($value) {
…		…
1242		1529
1243	${$_->[2]} = $checkbox if $_->[2];	1530	${$_->[2]} = $checkbox if $_->[2];
1244	}	1531	}
1245	}	1532	}
1246		1533
1247	$table->add (2, 18, new CFPlus::UI::ValSlider	1534	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1248	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1535	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1249	template => ">= 99",	1536	template => ">= 99",
1250	to_value => sub { ">= " . 5 * $_[0] },	1537	to_value => sub { ">= " . 5 * $_[0] },
1251	on_changed => sub {	1538	on_changed => sub {
1252	my ($slider, $value) = @_;	1539	my ($slider, $value) = @_;
…		…
1255	$::CFG->{pickup} |= int $value	1542	$::CFG->{pickup} |= int $value
1256	if $value;	1543	if $value;
1257	1;	1544	1;
1258	});	1545	});
1259		1546
1260	$table->add (3, 18, new CFPlus::UI::Button	1547	$table->add_at (3, 18, new CFPlus::UI::Button
1261	text => "set",	1548	text => "set",
1262	on_activate => sub {	1549	on_activate => sub {
1263	$::CONN->send_command ("pickup $::CFG->{pickup}")	1550	$::CONN->send_command ("pickup $::CFG->{pickup}")
1264	if defined $::CONN;	1551	if defined $::CONN;
1265	0	1552	0
1266	});	1553	});
1267		1554
1268	$table	1555	$r
1269	}	1556	}
1270		1557
1271	my %SORT_ORDER = (	1558	my %SORT_ORDER = (
1272	type => undef,	1559	type => undef,
1273	mtime => sub {	1560	mtime => sub {
…		…
1328	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1615	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1329		1616
1330	$hb	1617	$hb
1331	}	1618	}
1332		1619
		1620	sub media_window {
		1621	my $vb = new CFPlus::UI::VBox;
		1622
		1623	$vb->add (new CFPlus::UI::FancyFrame
		1624	label => "Currently playing music",
		1625	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1626	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1627	);
		1628
		1629	$vb->add (new CFPlus::UI::FancyFrame
		1630	label => "Other media used in this session",
		1631	expand => 1,
		1632	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1633	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1634	);
		1635
		1636	$vb
		1637	}
		1638
		1639	sub add_license {
		1640	my ($meta) = @_;
		1641
		1642	$meta = $meta->{meta}
		1643	or return;
		1644
		1645	$meta->{license} || $meta->{author} || $meta->{source}
		1646	or return;
		1647
		1648	$LICENSE_WIDGET->add_paragraph ({
		1649	fg => [1, 1, 1, 1],
		1650	markup => "<small>"
		1651	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1652	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1653	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1654	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1655	. "</small>",
		1656	});
		1657	$LICENSE_WIDGET->scroll_to_bottom;
		1658	}
		1659
1333	sub toggle_player_page {	1660	sub toggle_player_page {
1334	my ($widget) = @_;	1661	my ($widget) = @_;
1335		1662
1336	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {	1663	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1337	$PL_WINDOW->hide;	1664	$PL_WINDOW->hide;
…		…
1352	has_close_button => 1	1679	has_close_button => 1
1353	;	1680	;
1354		1681
1355	my $ntb =	1682	my $ntb =
1356	$PL_NOTEBOOK =	1683	$PL_NOTEBOOK =
1357	new CFPlus::UI::Notebook expand => 1, debug => 1;	1684	new CFPlus::UI::Notebook expand => 1;
1358		1685
1359	$ntb->add (	1686	$ntb->add_tab (
1360	"Statistics (F2)" => $STATS_PAGE = stats_window,	1687	"Statistics (F2)" => $STATS_PAGE = stats_window,
1361	"Shows statistics, where all your Stats and Resistances are shown."	1688	"Shows statistics, where all your Stats and Resistances are shown."
1362	);	1689	);
1363	$ntb->add (	1690	$ntb->add_tab (
1364	"Skills (F3)" => $SKILL_PAGE = skill_window,	1691	"Skills (F3)" => $SKILL_PAGE = skill_window,
1365	"Shows all your Skills."	1692	"Shows all your Skills."
1366	);	1693	);
1367		1694
1368	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1695	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1369	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1696	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1370	$ntb->add (	1697	$ntb->add_tab (
1371	"Spellbook (F4)" => $spellsw,	1698	"Spellbook (F4)" => $spellsw,
1372	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1699	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1373	);	1700	);
1374	$ntb->add (	1701	$ntb->add_tab (
1375	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1702	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1376	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1703	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1377	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1704	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1378	);	1705	);
		1706	$ntb->add_tab (Pickup => autopickup_setup,
		1707	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1708
		1709	$ntb->add_tab (Media => media_window,
		1710	"License, Author and Source info for media sent by the server.");
1379		1711
1380	$ntb->set_current_page ($INVENTORY_PAGE);	1712	$ntb->set_current_page ($INVENTORY_PAGE);
1381		1713
1382	$plwin->add ($ntb);	1714	$plwin->add ($ntb);
1383	$plwin	1715	$plwin
1384	}	1716	}
1385		1717
1386	sub update_bindings {
1387	$BIND_UPD_CB->() if $BIND_UPD_CB;
1388	}
1389
1390	sub keyboard_setup {	1718	sub keyboard_setup {
1391	my $binding_list = new CFPlus::UI::VBox;	1719	CFPlus::Macro::keyboard_setup
1392
1393	my $refresh;
1394	$refresh = $BIND_UPD_CB = sub {
1395	$binding_list->clear ();
1396
1397	return unless $PROFILE;
1398
1399	for my $mod (keys %{$PROFILE->{bindings}}) {
1400	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1401	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1402	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1403
1404	my $lbl = join "; ", @$cmds;
1405	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1406	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1407	$hb->add (new CFPlus::UI::Button
1408	text => "delete",
1409	tooltip => "Deletes the binding",
1410	on_activate => sub {
1411	$binding_list->remove ($hb);
1412	delete $PROFILE->{bindings}{$mod}{$sym};
1413	0
1414	});
1415
1416	$hb->add (new CFPlus::UI::Button
1417	text => "edit",
1418	tooltip => "Edits the binding",
1419	on_activate => sub {
1420	$::BIND_EDITOR->set_binding (
1421	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1422	sub {
1423	my ($nmod, $nsym, $ncmds) = @_;
1424	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1425	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1426	$refresh->();
1427	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428	$SETUP_DIALOG->show;
1429	},
1430	sub {
1431	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1432	$SETUP_DIALOG->show;
1433	});
1434	$::BIND_EDITOR->show;
1435	$SETUP_DIALOG->hide;
1436	0
1437	});
1438
1439	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1440	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1441	}
1442	}
1443	};
1444
1445	my $vb = new CFPlus::UI::VBox;
1446	$vb->add (new CFPlus::UI::FancyFrame
1447	label => "Options",
1448	child => (my $hb = new CFPlus::UI::HBox),
1449	);
1450	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1451	$hb->add (new CFPlus::UI::CheckBox
1452	expand => 1,
1453	state => $CFG->{shift_fire_stop},
1454	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1455	on_changed => sub {
1456	my ($cbox, $value) = @_;
1457	$CFG->{shift_fire_stop} = $value;
1458	0
1459	});
1460
1461	$vb->add (new CFPlus::UI::FancyFrame
1462	label => "Bindings",
1463	child => $binding_list);
1464	$vb->add (my $hb = new CFPlus::UI::HBox);
1465
1466	$hb->add (new CFPlus::UI::Button
1467	text => "record new",
1468	expand => 1,
1469	tooltip => "This button opens the binding editor with an empty binding.",
1470	on_activate => sub {
1471	$::BIND_EDITOR->set_binding (undef, undef, [],
1472	sub {
1473	my ($mod, $sym, $cmds) = @_;
1474	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1475	$refresh->();
1476	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477	$SETUP_DIALOG->show;
1478	},
1479	sub {
1480	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1481	$SETUP_DIALOG->show;
1482	},
1483	);
1484	$SETUP_DIALOG->hide;
1485	$::BIND_EDITOR->show;
1486	0
1487	},
1488	);
1489
1490	$hb->add (new CFPlus::UI::Button
1491	text => "close",
1492	tooltip => "Closes the binding window",
1493	expand => 1,
1494	on_activate => sub {
1495	$SETUP_DIALOG->hide;
1496	0
1497	}
1498	);
1499
1500	$refresh->();
1501
1502	$vb
1503	}	1720	}
1504		1721
1505	sub help_window {	1722	sub help_window {
1506	my $win = new CFPlus::UI::Toplevel	1723	my $win = new CFPlus::UI::Toplevel
1507	x => 'center',	1724	x => 'center',
…		…
1664		1881
1665	sub show_tip_of_the_day {	1882	sub show_tip_of_the_day {
1666	# find all tips	1883	# find all tips
1667	my @tod = CFPlus::Pod::find tip_of_the_day => "*";	1884	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668		1885
1669	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");	1886	CFPlus::DB::get state => "tip_of_the_day", sub {
		1887	my ($todindex) = @_;
1670	$todindex = 0 if $todindex >= @tod;	1888	$todindex = 0 if $todindex >= @tod;
1671	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);	1889	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1672		1890
1673	# create dialog	1891	# create dialog
1674	my $dialog;	1892	my $dialog;
1675		1893
1676	my $close = sub {	1894	my $close = sub {
1677	$dialog->destroy;	1895	$dialog->destroy;
		1896	};
		1897
		1898	$dialog = new CFPlus::UI::Toplevel
		1899	x => "center",
		1900	y => "center",
		1901	z => 3,
		1902	name => 'tip_of_the_day',
		1903	force_w => int $WIDTH * 4/9,
		1904	force_h => int $WIDTH * 2/9,
		1905	title => "Tip of the day #" . (1 + $todindex),
		1906	child => my $vbox = new CFPlus::UI::VBox,
		1907	has_close_button => 1,
		1908	on_delete => $close,
		1909	;
		1910
		1911	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1912	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1913	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1914
		1915	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1916
		1917	$table->add_at (0, 0, new CFPlus::UI::Button
		1918	text => "Close",
		1919	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>.",
		1920	on_activate => $close,
		1921	);
		1922
		1923	$table->add_at (2, 0, new CFPlus::UI::Button
		1924	text => "Next",
		1925	tooltip => "Show the next <b>Tip of the day</b>.",
		1926	on_activate => sub {
		1927	$close->();
		1928	&show_tip_of_the_day;
		1929	},
		1930	);
		1931
		1932	$dialog->show;
1678	};	1933	};
1679
1680	$dialog = new CFPlus::UI::Toplevel
1681	x => "center",
1682	y => "center",
1683	z => 3,
1684	name => 'tip_of_the_day',
1685	force_w => int $WIDTH * 4/9,
1686	force_h => int $WIDTH * 2/9,
1687	title => "Tip of the day #" . (1 + $todindex),
1688	child => my $vbox = new CFPlus::UI::VBox,
1689	has_close_button => 1,
1690	on_delete => $close,
1691	;
1692
1693	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1696
1697	$vbox->add (my $table = new CFPlus::UI::Table);
1698
1699	$table->add (0, 0, new CFPlus::UI::Button
1700	text => "Close",
1701	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>.",
1702	on_activate => $close,
1703	);
1704
1705	$table->add (2, 0, new CFPlus::UI::Button
1706	text => "Next",
1707	tooltip => "Show the next <b>Tip of the day</b>.",
1708	on_activate => sub {
1709	$close->();
1710	&show_tip_of_the_day;
1711	},
1712	);
1713
1714	$dialog->show;
1715	}	1934	}
1716		1935
1717	sub sdl_init {	1936	sub sdl_init {
1718	CFPlus::SDL_Init	1937	CFPlus::SDL_Init
1719	and die "SDL::Init failed!\n";	1938	and die "SDL::Init failed!\n";
1720	}	1939	}
1721		1940
1722	sub video_init {	1941	sub video_init {
1723	sdl_init;
1724
1725	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1942	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1726		1943
1727	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1944	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1728		1945
1729	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1946	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1730	$FULLSCREEN = $CFG->{fullscreen};	1947	$FULLSCREEN = $CFG->{fullscreen};
1731	$FAST = $CFG->{fast};	1948	$FAST = $CFG->{fast};
1732		1949
1733	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1950	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1734	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	1951	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1735		1952
1736	$SDL_ACTIVE = 1;	1953	$SDL_ACTIVE = 1;
1737	$LAST_REFRESH = time - 0.01;	1954	$LAST_REFRESH = time - 0.01;
1738		1955
…		…
1753	padding => 0,	1970	padding => 0,
1754	z => 100,	1971	z => 100,
1755	force_x => "max",	1972	force_x => "max",
1756	force_y => 0;	1973	force_y => 0;
1757	$DEBUG_STATUS->show;	1974	$DEBUG_STATUS->show;
1758
1759	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1760		1975
1761	$STATUSBOX = new CFPlus::UI::Statusbox;	1976	$STATUSBOX = new CFPlus::UI::Statusbox;
1762	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1977	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1763		1978
1764	(new CFPlus::UI::Frame	1979	(new CFPlus::UI::Frame
…		…
1782		1997
1783	$MAPWIDGET = new CFPlus::MapWidget;	1998	$MAPWIDGET = new CFPlus::MapWidget;
1784	$MAPWIDGET->connect (activate_console => sub {	1999	$MAPWIDGET->connect (activate_console => sub {
1785	my ($mapwidget, $preset) = @_;	2000	my ($mapwidget, $preset) = @_;
1786		2001
1787	if ($CONSOLE) {	2002	$MESSAGE_WINDOW->activate_console ($preset)
1788	$CONSOLE->{input}->{auto_activated} = 1;	2003	if $MESSAGE_WINDOW;
1789	$CONSOLE->{input}->grab_focus;
1790
1791	if ($preset && $CONSOLE->{input}->get_text eq '') {
1792	$CONSOLE->{input}->set_text ($preset);
1793	}
1794	}
1795	});	2004	});
1796	$MAPWIDGET->show;	2005	$MAPWIDGET->show;
1797	$MAPWIDGET->grab_focus;	2006	$MAPWIDGET->grab_focus;
1798
1799	$LOGVIEW = new CFPlus::UI::TextScroller
1800	expand => 1,
1801	font => $FONT_FIXED,
1802	fontsize => $::CFG->{log_fontsize},
1803	indent => -4,
1804	can_hover => 1,
1805	can_events => 1,
1806	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1807	;
1808		2007
1809	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2008	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1810	title => "Setup",	2009	title => "Setup",
1811	name => "setup_dialog",	2010	name => "setup_dialog",
1812	x => 'center',	2011	x => 'center',
…		…
1816	force_h => $::HEIGHT * 0.6,	2015	force_h => $::HEIGHT * 0.6,
1817	has_close_button => 1,	2016	has_close_button => 1,
1818	;	2017	;
1819		2018
1820	$METASERVER = metaserver_dialog;	2019	$METASERVER = metaserver_dialog;
		2020	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1821		2021
1822	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2022	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1823	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2023	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1824		2024
1825	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	2025	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1826	"Configure the server to play on, your username, password and other server-related options.");	2026	"Configure the server to play on, your username, password and other server-related options.");
1827	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	2027	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1828	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	2028	"Configure various client-specific settings.");
1829	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	2029	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1830	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	2030	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1831	$SETUP_NOTEBOOK->add (Audio => audio_setup,	2031	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1832	"Configure the use of audio, sound effects and background music.");	2032	"Configure the use of audio, sound effects and background music.");
1833	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	2033	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1834	"Lets you define, edit and delete key bindings."	2034	"Lets you define, edit and delete key bindings."
1835	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	2035	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1836	. "with nothing set and the recording started. After doing the actions you "	2036	. "with nothing set and the recording started. After doing the actions you "
1837	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	2037	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1838	. "After pressing the combo the binding will be saved automatically and the "	2038	. "After pressing the combo the binding will be saved automatically and the "
1839	. "binding editor closes");	2039	. "binding editor closes");
1840	$SETUP_NOTEBOOK->add (Debug => debug_setup,	2040	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1841	"Some debuggin' options. Do not ask.");	2041	"Some debuggin' options. Do not ask.");
1842		2042
1843	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2043	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1844		2044
1845	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2045	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1846	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2046	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1847		2047
1848	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	2048	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1849	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2049	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1850		2050
1851	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	2051	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
1852		2052
1853	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2053	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1886	}	2086	}
1887		2087
1888	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2088	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1889	}	2089	}
1890		2090
1891	sub setup_build_button {
1892	my ($enabled) = @_;
1893	if ($enabled) {
1894	$BUILD_BUTTON ||= new CFPlus::UI::Button
1895	text => "Build",
1896	tooltip => "Opens the ingame builder",
1897	on_activate => sub {
1898	if ($CONN) {
1899	$CONN->send_ext_req (builder_player_items => sub {
1900	open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901	});
1902	}
1903	0
1904	};
1905	$BUTTONBAR->add ($BUILD_BUTTON);
1906	} else {
1907	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1908	}
1909	}
1910
1911	sub open_ingame_editor {
1912	my ($msg) = @_;
1913
1914	my $win = new CFPlus::UI::Toplevel
1915	x => 0,
1916	y => 'center',
1917	z => 4,
1918	name => 'builder_window',
1919	force_w => int $WIDTH * 1/4,
1920	force_h => int $HEIGHT * 3/4,
1921	title => "In game builder",
1922	has_close_button => 1;
1923
1924	my $r = new CFPlus::UI::ScrolledWindow (
1925	expand => 1,
1926	scroll_y => 1
1927	);
1928	$r->add (my $vb = new CFPlus::UI::VBox);
1929	$win->add ($r);
1930
1931
1932	$vb->add (
1933	new CFPlus::UI::Button
1934	text => "Disable build mode",
1935	on_activate => sub { $::IN_BUILD_MODE = undef }
1936	);
1937	$vb->add (
1938	new CFPlus::UI::Button
1939	text => "ERASE",
1940	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1941	);
1942
1943	for my $itemarchname (
1944	sort {
1945	$msg->{items}->{$a}->{build_arch_name}
1946	cmp $msg->{items}->{$b}->{build_arch_name}
1947	} keys %{$msg->{items}}
1948	) {
1949	my $info = $msg->{items}->{$itemarchname};
1950	$vb->add (
1951	new CFPlus::UI::Button text => $info->{build_arch_name},
1952	on_activate => sub {
1953	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1954
1955	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1956	build_mode_query_arch_info ();
1957	}
1958	}
1959	);
1960	}
1961
1962	$win->show;
1963	}
1964
1965	sub build_mode_query_arch_info {
1966	my ($iteminfo) = $::IN_BUILD_MODE;
1967	my $itemarchname = $iteminfo->{item};
1968	my $info = $iteminfo->{info};
1969
1970	my $dialog = new CFPlus::UI::Toplevel
1971	x => "center",
1972	y => "center",
1973	z => 50,
1974	force_w => int $WIDTH * 1/2,
1975	title => "Enter information for placement of '$itemarchname'",
1976	has_close_button => 1;
1977
1978	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1979
1980	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
1981	my $row = 0;
1982	if ($info->{has_name}) {
1983	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1984	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1985	}
1986	if ($info->{has_text}) {
1987	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1988	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1989	}
1990	if ($info->{has_connection}) {
1991	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1992	$table->add (1, $row++,
1993	new CFPlus::UI::Entry
1994	expand => 1,
1995	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1996	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1997	);
1998	}
1999
2000	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2001	$hb->add (new CFPlus::UI::Button
2002	text => "Close",
2003	expand => 1,
2004	on_activate => sub { $dialog->hide; 0 },
2005	);
2006	$dialog->show;
2007	}
2008
2009	sub video_shutdown {	2091	sub video_shutdown {
2010	CFPlus::OpenGL::shutdown;	2092	CFPlus::OpenGL::shutdown;
2011		2093
2012	undef $SDL_ACTIVE;	2094	undef $SDL_ACTIVE;
2013	}	2095	}
2014		2096
2015	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2016	my $bgmusic;#TODO#hack#d#
2017
2018	sub audio_channel_finished {
2019	my ($channel) = @_;
2020
2021	#warn "channel $channel finished\n";#d#
2022	}
2023
2024	sub audio_music_finished {
2025	return unless $CFG->{bgm_enable};
2026
2027	# TODO: hack, do play loop and mood music
2028	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2029	$bgmusic->play (0);
2030
2031	push @bgmusic, shift @bgmusic;
2032	}
2033
2034	sub audio_init {
2035	if ($CFG->{audio_enable}) {
2036	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2037	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
2038
2039	unless ($SDL_MIXER) {
2040	status "Unable to open sound device: there will be no sound";
2041	return;
2042	}
2043
2044	CFPlus::Mix_AllocateChannels 8;
2045	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2046
2047	audio_music_finished;
2048
2049	local $_;
2050	while (<$fh>) {
2051	next if /^\s*#/;
2052	next if /^\s*$/;
2053
2054	my ($file, $volume, $event) = split /\s+/, $_, 3;
2055
2056	push @SOUNDS, "$volume,$file";
2057
2058	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
2059	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2060	$chunk->volume ($volume * 128 / 100);
2061	$chunk
2062	};
2063	}
2064	} else {
2065	status "unable to open sound config: $!";
2066	}
2067	}
2068	}
2069
2070	sub audio_shutdown {
2071	CFPlus::Mix_CloseAudio if $SDL_MIXER;
2072	undef $SDL_MIXER;
2073	@SOUNDS = ();
2074	%AUDIO_CHUNKS = ();
2075	}
2076
2077	my %animate_object;	2097	my %animate_object;
2078	my $animate_timer;	2098	my $animate_timer;
2079		2099
2080	my $fps = 9;	2100	my $fps = 9;
2081
2082	my %demo;#d#
2083		2101
2084	sub force_refresh {	2102	sub force_refresh {
2085	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2103	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2086	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2104	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2087		2105
2088	$CFPlus::UI::ROOT->draw;	2106	$CFPlus::UI::ROOT->draw;
2089		2107
2090	$WANT_REFRESH = 0;	2108	$WANT_REFRESH = 0;
2091	$CAN_REFRESH = 0;	2109	$CAN_REFRESH = 0;
2092	$LAST_REFRESH = $NOW;	2110	$LAST_REFRESH = $NOW;
2093		2111
2094	CFPlus::SDL_GL_SwapBuffers;	2112	CFPlus::SDL_GL_SwapBuffers;
2095	}	2113	}
2096		2114
2097	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2115	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2098	$NOW = time;	2116	$NOW = time;
2099		2117
2100	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2118	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2101	for CFPlus::SDL_PollEvent;	2119	for CFPlus::poll_events;
2102		2120
2103	if (%animate_object) {	2121	if (%animate_object) {
2104	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2122	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2105	$WANT_REFRESH++;	2123	++$WANT_REFRESH;
2106	}	2124	}
2107		2125
2108	if ($WANT_REFRESH) {	2126	if ($WANT_REFRESH) {
2109	force_refresh;	2127	force_refresh;
2110	} else {	2128	} else {
…		…
2120	sub animation_stop {	2138	sub animation_stop {
2121	my ($widget) = @_;	2139	my ($widget) = @_;
2122	delete $animate_object{$widget};	2140	delete $animate_object{$widget};
2123	}	2141	}
2124		2142
2125	# check once/second for faces that need to be prefetched
2126	# this should, of course, only run on demand, but
2127	# SDL forces worse things on us....
2128
2129	Event->timer (after => 1, interval => 0.25, cb => sub {
2130	$CONN->face_prefetch
2131	if $CONN;
2132	});
2133
2134	%SDL_CB = (	2143	%SDL_CB = (
2135	CFPlus::SDL_QUIT => sub {	2144	CFPlus::SDL_QUIT => sub {
2136	Event::unloop -1;	2145	exit;
2137	},	2146	},
2138	CFPlus::SDL_VIDEORESIZE => sub {	2147	CFPlus::SDL_VIDEORESIZE => sub {
2139	},	2148	},
2140	CFPlus::SDL_VIDEOEXPOSE => sub {	2149	CFPlus::SDL_VIDEOEXPOSE => sub {
2141	CFPlus::UI::full_refresh;	2150	CFPlus::UI::full_refresh;
2142	},	2151	},
2143	CFPlus::SDL_ACTIVEEVENT => sub {	2152	CFPlus::SDL_ACTIVEEVENT => sub {
2144	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2153	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2154	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2155	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2156	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2157	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2158	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2145	},	2159	},
2146	CFPlus::SDL_KEYDOWN => sub {	2160	CFPlus::SDL_KEYDOWN => sub {
2147	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {	2161	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2148	# alt-enter	2162	# alt-enter
2149	$FULLSCREEN_ENABLE->toggle;	2163	$FULLSCREEN_ENABLE->toggle;
…		…
2170		2184
2171	$SIG{INT} = $SIG{TERM} = sub { exit };	2185	$SIG{INT} = $SIG{TERM} = sub { exit };
2172		2186
2173	{	2187	{
2174	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";	2188	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2189	CFPlus::DB::Server::run;
		2190
2175	CFPlus::UI::set_layout ($::CFG->{layout});	2191	CFPlus::UI::set_layout ($::CFG->{layout});
2176		2192
2177	my %DEF_CFG = (	2193	my %DEF_CFG = (
2178	sdl_mode => 0,	2194	sdl_mode => 0,
2179	width => 640,
2180	height => 480,
2181	fullscreen => 0,	2195	fullscreen => 0,
2182	fast => 0,	2196	fast => 0,
2183	map_scale => 1,	2197	map_scale => 1,
2184	fow_enable => 1,	2198	fow_enable => 1,
2185	fow_intensity => 0.45,	2199	fow_intensity => 0,
2186	fow_smooth => 0,	2200	map_smoothing => 1,
2187	gui_fontsize => 1,	2201	gui_fontsize => 1,
2188	log_fontsize => 0.7,	2202	log_fontsize => 0.7,
2189	gauge_fontsize => 1,	2203	gauge_fontsize => 1,
2190	gauge_size => 0.35,	2204	gauge_size => 0.35,
2191	stat_fontsize => 0.7,	2205	stat_fontsize => 0.7,
2192	mapsize => 100,	2206	mapsize => 100,
2193	say_command => 'chat',
2194	audio_enable => 1,	2207	audio_enable => 1,
		2208	effects_enable => 1,
		2209	effects_volume => 1,
2195	bgm_enable => 1,	2210	bgm_enable => 1,
2196	bgm_volume => 0.25,	2211	bgm_volume => 0.5,
2197	face_prefetch => 0,
2198	output_sync => 1,	2212	output_sync => 1,
2199	output_count => 1,	2213	output_count => 1,
		2214	output_rate => "",
2200	pickup => 0,	2215	pickup => 0,
2201	inv_sort => "mtime",	2216	inv_sort => "mtime",
2202	default => "profile", # default profile	2217	default => "profile", # default profile
2203	show_tips => 1,	2218	show_tips => 1,
		2219	logview_max_par => 1000,
2204	);	2220	);
2205		2221
2206	while (my ($k, $v) = each %DEF_CFG) {	2222	while (my ($k, $v) = each %DEF_CFG) {
2207	$CFG->{$k} = $v unless exists $CFG->{$k};	2223	$CFG->{$k} = $v unless exists $CFG->{$k};
2208	}	2224	}
2209		2225
2210	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2226	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2227	$PROFILE = $CFG->{profile}{default};
		2228
		2229	# convert old bindings (only default profile matters)
		2230	if (my $bindings = delete $PROFILE->{bindings}) {
		2231	while (my ($mod, $syms) = each %$bindings) {
		2232	while (my ($sym, $cmds) = each %$syms) {
		2233	push @{ $PROFILE->{macro} }, {
		2234	accelkey => [$mod*1, $sym*1],
		2235	action => $cmds,
		2236	};
		2237	}
		2238	}
		2239	}
2211		2240
2212	sdl_init;	2241	sdl_init;
2213		2242
2214	@SDL_MODES = reverse	2243	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2215	grep $_->[0] >= 640 && $_->[1] >= 480,	2244	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2216	CFPlus::SDL_ListModes;
2217
2218	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2245	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2246
		2247	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2219		2248
2220	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2249	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2221		2250
2222	{	2251	{
2223	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2252	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
…		…
2264		2293
2265	Event::loop;	2294	Event::loop;
2266	#CFPlus::SDL_Quit;	2295	#CFPlus::SDL_Quit;
2267	#CFPlus::_exit 0;	2296	#CFPlus::_exit 0;
2268		2297
		2298	END {
		2299	video_shutdown;
		2300	audio_shutdown;
2269	END { CFPlus::SDL_Quit }	2301	CFPlus::SDL_Quit;
		2302	CFPlus::DB::Server::stop;
		2303	}
2270		2304
2271	=head1 NAME	2305	=head1 NAME
2272		2306
2273	cfplus - A Crossfire+ and Crossfire game client	2307	cfplus - A Crossfire TRT and Crossfire game client
2274		2308
2275	=head1 SYNOPSIS	2309	=head1 SYNOPSIS
2276		2310
2277	Just run it - no commandline arguments are supported.	2311	Just run it - no commandline arguments are supported.
2278		2312
2279	=head1 USAGE	2313	=head1 USAGE
2280		2314
2281	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2315	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2282	fullscreen and interactively.	2316	be used in fullscreen mode and interactively.
2283		2317
2284	=head1 DEBUGGING	2318	=head1 DEBUGGING
2285		2319
2286		2320
2287	CFPLUS_DEBUG - environment variable	2321	CFPLUS_DEBUG - environment variable

Diff Legend

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