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.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.106 by root, Sun Aug 13 02:43:22 2006 UTC

…		…
32	use Crossfire;	32	use Crossfire;
33	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
34		34
35	use Compress::LZF;	35	use Compress::LZF;
36		36
37	use CFClient;	37	use CFPlus;
38	use CFClient::OpenGL ();	38	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	39	use CFPlus::Protocol;
40	use CFClient::UI;	40	use CFPlus::UI;
41	use CFClient::Pod;	41	use CFPlus::Pod;
42	use CFClient::BindingEditor;	42	use CFPlus::BindingEditor;
43	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
44		44
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	46	$SIG{PIPE} = 'IGNORE';
47		47
		48	$Event::Eval = 0;
48	$Event::DIED = sub {	49	$Event::DIED = sub {
49	# TODO: display dialog box or so	50	# TODO: display dialog box or so
50	Carp::confess $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
51	CFClient::error $_[1];	52	CFPlus::error $_[1];
52	};	53	};
53		54
54	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	55	$SIG{__DIE__} = sub {
		56	return if CFPlus::in_destruct;
		57	Carp::cluck $_[0];
		58	CFPlus::error $_[0];
		59	return;#d#
		60	#return unless defined $^S && !$^S;
		61	$Event::DIED->(undef, $_[0]);
		62	};
55		63
56	our $VERSION = '0.1';	64	our $VERSION = '0.1';
57		65
58	my $MAX_FPS = 60;	66	my $MAX_FPS = 60;
59	my $MIN_FPS = 5; # unused as of yet	67	my $MIN_FPS = 5; # unused as of yet
…		…
131	our $BIND_UPD_CB;	139	our $BIND_UPD_CB;
132		140
133	our $PICKUP_CFG;	141	our $PICKUP_CFG;
134		142
135	sub status {	143	sub status {
136	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	144	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137	}	145	}
138		146
139	sub debug {	147	sub debug {
140	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
141	}	149	}
…		…
147		155
148	# server query dialog	156	# server query dialog
149	sub server_query {	157	sub server_query {
150	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
151		159
152	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
153	x => "center",	161	x => "center",
154	y => "center",	162	y => "center",
155	title => "Server Query",	163	title => "Server Query",
156	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
157	;	165	;
158		166
159	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
160	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
161	ellipsise => 0,	169	ellipsise => 0,
162	text => $prompt;	170	text => $prompt;
163		171
164	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
165	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
166		174
167	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
168	text => "No",	176	text => "No",
169	on_activate => sub {	177	on_activate => sub {
170	$conn->send ("reply n");	178	$conn->send ("reply n");
171	$dialog->destroy;	179	$dialog->destroy;
172	0	180	0
173	}	181	}
174	);	182	);
175	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
176	text => "Yes",	184	text => "Yes",
177	on_activate => sub {	185	on_activate => sub {
178	$conn->send ("reply y");	186	$conn->send ("reply y");
179	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
180	0	188	0
…		…
187	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
188		196
189	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	197	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
191		199
192	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
193	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
194	ellipsise => 0,	202	ellipsise => 0,
195	markup => "\nOr use your keyboard and the text entry below:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
196		204
197	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
198		206
199	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
200	text => "Next Race",	208	text => "Next Race",
201	on_activate => sub {	209	on_activate => sub {
202	$conn->send ("reply n");	210	$conn->send ("reply n");
203	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
204	0	212	0
205	},	213	},
206	);	214	);
207	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
208	text => "Accept",	216	text => "Accept",
209	on_activate => sub {	217	on_activate => sub {
210	$conn->send ("reply d");	218	$conn->send ("reply d");
211	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
212	0	220	0
213	},	221	},
214	);	222	);
215		223
216	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
217	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
218	ellipsise => 0,	226	ellipsise => 0,
219	markup =>	227	markup =>
220	"<big><b>Character Creation: Race</b></big>\n\n"	228	"<big><b>Character Creation: Race</b></big>\n\n"
221	. "Look at the <b>Messages</b> window to see a description of this race "	229	. "Look at the <b>Messages</b> window to see a description of this race "
…		…
234	}	242	}
235		243
236	$STATS_PAGE->show;	244	$STATS_PAGE->show;
237	$MESSAGE_WINDOW->hide;	245	$MESSAGE_WINDOW->hide;
238		246
239	unshift @dialog, new CFClient::UI::Label	247	unshift @dialog, new CFPlus::UI::Label
240	max_w => $::WIDTH * 0.4,	248	max_w => $::WIDTH * 0.4,
241	ellipsise => 0,	249	ellipsise => 0,
242	markup => "\nOr use your keyboard and the text entry below:\n";	250	markup => "\nOr use your keyboard and the text entry below:\n";
243		251
244	unshift @dialog, my $table = new CFClient::UI::Table;	252	unshift @dialog, my $table = new CFPlus::UI::Table;
245		253
246	# left: re-roll	254	# left: re-roll
247	$table->add (0, 0, new CFClient::UI::Button	255	$table->add (0, 0, new CFPlus::UI::Button
248	text => "Roll Again",	256	text => "Roll Again",
249	on_activate => sub {	257	on_activate => sub {
250	$conn->send ("reply y");	258	$conn->send ("reply y");
251	destroy_query_dialog $conn;	259	destroy_query_dialog $conn;
252	0	260	0
253	},	261	},
254	);	262	);
255		263
256	# center: swap stats	264	# center: swap stats
257	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	265	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258	expand => 1,	266	expand => 1,
259	value => $_,	267	value => $_,
260	options => [	268	options => [
261	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
266	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	274	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	275	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268	],	276	],
269	), 1 .. 2;	277	), 1 .. 2;
270		278
271	$table->add (2, 0, new CFClient::UI::Button	279	$table->add (2, 0, new CFPlus::UI::Button
272	text => "Swap Stats",	280	text => "Swap Stats",
273	on_activate => sub {	281	on_activate => sub {
274	$conn->{stat_change_with} = $sw2->{value};	282	$conn->{stat_change_with} = $sw2->{value};
275	$conn->send ("reply $sw1->{value}");	283	$conn->send ("reply $sw1->{value}");
276	destroy_query_dialog $conn;	284	destroy_query_dialog $conn;
277	0	285	0
278	},	286	},
279	);	287	);
280	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	288	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281		289
282	# right: accept	290	# right: accept
283	$table->add (4, 0, new CFClient::UI::Button	291	$table->add (4, 0, new CFPlus::UI::Button
284	text => "Accept",	292	text => "Accept",
285	on_activate => sub {	293	on_activate => sub {
286	$conn->send ("reply n");	294	$conn->send ("reply n");
287	$STATS_PAGE->hide;	295	$STATS_PAGE->hide;
288	destroy_query_dialog $conn;	296	destroy_query_dialog $conn;
289	0	297	0
290	},	298	},
291	);	299	);
292		300
293	unshift @dialog, my $hbox = new CFClient::UI::HBox;	301	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294	for (	302	for (
295	[Str => CS_STAT_STR],	303	[Str => CS_STAT_STR],
296	[Dex => CS_STAT_DEX],	304	[Dex => CS_STAT_DEX],
297	[Con => CS_STAT_CON],	305	[Con => CS_STAT_CON],
298	[Int => CS_STAT_INT],	306	[Int => CS_STAT_INT],
299	[Wis => CS_STAT_WIS],	307	[Wis => CS_STAT_WIS],
300	[Pow => CS_STAT_POW],	308	[Pow => CS_STAT_POW],
301	[Cha => CS_STAT_CHA],	309	[Cha => CS_STAT_CHA],
302	) {	310	) {
303	my ($name, $id) = @$_;	311	my ($name, $id) = @$_;
304	$hbox->add (new CFClient::UI::Label	312	$hbox->add (new CFPlus::UI::Label
305	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306	align => 0,	314	align => 0,
307	expand => 1,	315	expand => 1,
308	can_events => 1,	316	can_events => 1,
309	can_hover => 1,	317	can_hover => 1,
310	tooltip => $CFClient::STAT_TOOLTIP{$name},	318	tooltip => $CFPlus::STAT_TOOLTIP{$name},
311	);	319	);
312	}	320	}
313		321
314	unshift @dialog, new CFClient::UI::Label	322	unshift @dialog, new CFPlus::UI::Label
315	max_w => $::WIDTH * 0.4,	323	max_w => $::WIDTH * 0.4,
316	ellipsise => 0,	324	ellipsise => 0,
317	markup =>	325	markup =>
318	"<big><b>Character Creation: Stats</b></big>\n\n"	326	"<big><b>Character Creation: Stats</b></big>\n\n"
319	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"	327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
…		…
321	. "They will be modified later by both the race and the class you choose.\n\n"	329	. "They will be modified later by both the race and the class you choose.\n\n"
322	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"	330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323	;	331	;
324	}	332	}
325		333
326	push @dialog, my $entry = new CFClient::UI::Entry	334	push @dialog, my $entry = new CFPlus::UI::Entry
327	on_changed => sub {	335	on_changed => sub {
328	$conn->send ("reply $_[1]");	336	$conn->send ("reply $_[1]");
329	destroy_query_dialog $conn;	337	destroy_query_dialog $conn;
330	0	338	0
331	},	339	},
…		…
334	$entry->grab_focus;	342	$entry->grab_focus;
335		343
336	} else {	344	} else {
337	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	345	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338		346
339	push @dialog, my $entry = new CFClient::UI::Entry	347	push @dialog, my $entry = new CFPlus::UI::Entry
340	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341	on_activate => sub {	349	on_activate => sub {
342	$conn->send ("reply $_[1]");	350	$conn->send ("reply $_[1]");
343	destroy_query_dialog $conn;	351	destroy_query_dialog $conn;
344	0	352	0
…		…
360		368
361	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	369	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362		370
363	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
364		372
365	$MAP = new CFClient::Map $mapsize, $mapsize;	373	$MAP = new CFPlus::Map $mapsize, $mapsize;
366		374
367	$CONN = eval {	375	$CONN = eval {
368	new CFClient::Protocol	376	new CFPlus::Protocol
369	host => $host,	377	host => $host,
370	port => $port || 13327,	378	port => $port || 13327,
371	user => $CFG->{profile}{default}{user},	379	user => $CFG->{profile}{default}{user},
372	pass => $CFG->{profile}{default}{password},	380	pass => $CFG->{profile}{default}{password},
373	mapw => $mapsize,	381	mapw => $mapsize,
…		…
392	$chunk->play;	400	$chunk->play;
393	},	401	},
394	};	402	};
395		403
396	if ($CONN) {	404	if ($CONN) {
397	CFClient::lowdelay fileno $CONN->{fh};	405	CFPlus::lowdelay fileno $CONN->{fh};
398		406
399	status "login successful";	407	status "login successful";
400	} else {	408	} else {
401	status "unable to connect";	409	status "unable to connect";
402	stop_game();	410	stop_game();
…		…
420		428
421	undef $MAP;	429	undef $MAP;
422	}	430	}
423		431
424	sub graphics_setup {	432	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	433	my $vbox = new CFPlus::UI::VBox;
426		434
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	435	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		436
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	437	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	438	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431		439
432	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	440	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
433	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	441	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434		442
435	$mode_slider->connect (changed => sub {	443	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	444	my ($self, $value) = @_;
437		445
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	446	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
440	});	448	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	449	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		450
443	my $row = 1;	451	my $row = 1;
444		452
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	453	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	455	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	456	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	458	);
451		459
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	460	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453	$table->add (1, $row++, new CFClient::UI::CheckBox	461	$table->add (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	462	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	463	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	465	);
458		466
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	467	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	471	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	472	);
465		473
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	474	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467	$table->add (1, $row++, new CFClient::UI::CheckBox	475	$table->add (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	476	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	477	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	479	);
472		480
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	481	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474	$table->add (1, $row++, new CFClient::UI::Slider	482	$table->add (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	484	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	486	);
479		487
480	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	488	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481	$table->add (1, $row++, new CFClient::UI::CheckBox	489	$table->add (1, $row++, new CFPlus::UI::CheckBox
482	state => $CFG->{fow_smooth},	490	state => $CFG->{fow_smooth},
483	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	491	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484	on_changed => sub {	492	on_changed => sub {
485	my ($self, $value) = @_;	493	my ($self, $value) = @_;
486	$CFG->{fow_smooth} = $value;	494	$CFG->{fow_smooth} = $value;
487	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	495	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488	0	496	0
489	}	497	}
490	);	498	);
491		499
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	500	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493	$table->add (1, $row++, new CFClient::UI::Slider	501	$table->add (1, $row++, new CFPlus::UI::Slider
494	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	503	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497	);	505	);
498		506
499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	507	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500	$table->add (1, $row++, new CFClient::UI::Slider	508	$table->add (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	510	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	512	);
505		513
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	514	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507	$table->add (1, $row++, new CFClient::UI::Slider	515	$table->add (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	517	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	518	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	519	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	520	&set_gauge_window_fontsize;
513	0	521	0
514	}	522	}
515	);	523	);
516		524
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	527	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	528	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	529	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	530	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	532	0
525	}	533	}
526	);	534	);
527		535
528	$table->add (1, $row++, new CFClient::UI::Button	536	$table->add (1, $row++, new CFPlus::UI::Button
529	expand => 1, align => 0, text => "Apply",	537	expand => 1, align => 0, text => "Apply",
530	tooltip => "Apply the video settings",	538	tooltip => "Apply the video settings",
531	on_activate => sub {	539	on_activate => sub {
532	video_shutdown ();	540	video_shutdown ();
533	video_init ();	541	video_init ();
…		…
537		545
538	$vbox	546	$vbox
539	}	547	}
540		548
541	sub audio_setup {	549	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	550	my $vbox = new CFPlus::UI::VBox;
543		551
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	552	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		553
546	my $row = 0;	554	my $row = 0;
547		555
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	556	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549	$table->add (1, $row++, new CFClient::UI::CheckBox	557	$table->add (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	558	state => $CFG->{audio_enable},
551	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	559	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
552	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	561	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	562	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	563	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	564	# $CFG->{effects_volume} = $_[1];
557	# });	565	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	566	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	567	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	568	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	569	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	570	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	572	);
565	$hbox->add (new CFClient::UI::Slider	573	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	575	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	576	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	577	);
570		578
571	$table->add (1, $row++, new CFClient::UI::Button	579	$table->add (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	580	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	581	tooltip => "Apply the audio settings",
574	on_activate => sub {	582	on_activate => sub {
575	audio_shutdown ();	583	audio_shutdown ();
576	audio_init ();	584	audio_init ();
…		…
588	}	596	}
589		597
590	sub make_gauge_window {	598	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	599	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		600
593	my $win = new CFClient::UI::Frame (	601	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	602	force_x => 0,
595	force_y => "max",	603	force_y => "max",
596	force_w => $WIDTH,	604	force_w => $WIDTH,
597	force_h => $gh,	605	force_h => $gh,
598	);	606	);
599		607
600	$win->add (my $hbox = new CFClient::UI::HBox	608	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	609	children => [
602	(new CFClient::UI::HBox expand => 1),	610	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	611	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	612	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	613	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	614	]),
607	(my $vbox = new CFClient::UI::VBox),	615	(my $vbox = new CFPlus::UI::VBox),
608	],	616	],
609	);	617	);
610		618
611	$vbox->add (new CFClient::UI::HBox	619	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	620	expand => 1,
613	children => [	621	children => [
614	(new CFClient::UI::Empty expand => 1),	622	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	623	(my $hb = new CFPlus::UI::HBox),
616	],	624	],
617	);	625	);
618		626
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	627	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
620	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");	628	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
621	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	629	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
622	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");	630	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
623	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	631	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
624	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");	632	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
625	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	633	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
626	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");	634	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
627		635
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	636	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
629	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");	637	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
630	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	638	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
631	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");	639	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632		640
633	$GAUGES = {	641	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	642	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	643	food => $fg, mana => $mg, hp => $hg, grace => $gg
…		…
639		647
640	$win	648	$win
641	}	649	}
642		650
643	sub debug_setup {	651	sub debug_setup {
644	my $table = new CFClient::UI::Table;	652	my $table = new CFPlus::UI::Table;
645		653
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	654	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	655	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	656	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	657	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	658	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	659	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	660	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	661	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
654		662
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	663	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656		664
657	for my $x (0..2) {	665	for my $x (0..2) {
658	for my $y (0 .. 2) {	666	for my $y (0 .. 2) {
659	$table->add ($x + 3, $y,	667	$table->add ($x + 3, $y,
660	new CFClient::UI::Entry	668	new CFPlus::UI::Entry
661	text => $default_smooth[$x * 3 + $y],	669	text => $default_smooth[$x * 3 + $y],
662	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	670	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663	);	671	);
664	}	672	}
665	}	673	}
…		…
667		675
668	$table	676	$table
669	}	677	}
670		678
671	sub stats_window {	679	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	680	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	681	expand => 1,
674	scroll_y => 1	682	scroll_y => 1
675	);	683	);
676	$r->add (my $vb = new CFClient::UI::VBox);	684	$r->add (my $vb = new CFPlus::UI::VBox);
677		685
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	686	$vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	687	can_hover => 1, can_events => 1,
680	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	688	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	689	$vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	690	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	691	tooltip => "The map you are currently on (if supported by the server).");
684		692
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	693	$vb->add (my $hb0 = new CFPlus::UI::HBox);
686	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	694	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	695	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	696	tooltip => "The weight of the player including all inventory items.");
689	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	697	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690	can_hover => 1, can_events => 1,	698	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	699	tooltip => "The weight limit: you cannot carry more than this.");
692		700
693
694	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	701	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
695	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	702	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
696		703
697	my $color2 = [1, 1, 0];	704	my $color2 = [1, 1, 0];
698		705
699	for (	706	for (
700	[0, 0, st_str => "Str", 30],	707	[0, 0, st_str => "Str", 30],
…		…
712	[2, 4, st_spd => "Spd", 10.54],	719	[2, 4, st_spd => "Spd", 10.54],
713	[2, 5, st_wspd => "WSp", 10.54],	720	[2, 5, st_wspd => "WSp", 10.54],
714	) {	721	) {
715	my ($col, $row, $id, $label, $template) = @$_;	722	my ($col, $row, $id, $label, $template) = @$_;
716		723
717	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
718	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	726	align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label});
720	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	727	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
721	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	729	align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label});
723	}	730	}
724		731
725	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	732	$vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
726		733
727	my $row = 0;	734	my $row = 0;
728	my $col = 0;	735	my $col = 0;
729		736
730	my %resist_names = (	737	my %resist_names = (
…		…
769	drain acid pois para deat phys	776	drain acid pois para deat phys
770	blind fear tund elec cold ghit/)	777	blind fear tund elec cold ghit/)
771	{	778	{
772	$tbl2->add ($col, $row,	779	$tbl2->add ($col, $row,
773	$STATWIDS->{"res_$_"} =	780	$STATWIDS->{"res_$_"} =
774	new CFClient::UI::Label	781	new CFPlus::UI::Label
775	font => $FONT_FIXED,	782	font => $FONT_FIXED,
776	template => "-100%",	783	template => "-100%",
777	align => +1,	784	align => +1,
778	valign => 0,	785	valign => 0,
779	can_events => 1,	786	can_events => 1,
780	can_hover => 1,	787	can_hover => 1,
781	tooltip => $resist_names{$_}->[1],	788	tooltip => $resist_names{$_}->[1],
782	);	789	);
783	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	790	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
784	font => $FONT_FIXED,	791	font => $FONT_FIXED,
785	can_hover => 1,	792	can_hover => 1,
786	can_events => 1,	793	can_events => 1,
787	path => "ui/resist/resist_$_.png",	794	path => "ui/resist/resist_$_.png",
788	tooltip => $resist_names{$_}->[1],	795	tooltip => $resist_names{$_}->[1],
789	);	796	);
790	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	797	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
791	text => $resist_names{$_}->[0],	798	text => $resist_names{$_}->[0],
792	font => $FONT_FIXED,	799	font => $FONT_FIXED,
793	can_hover => 1,	800	can_hover => 1,
794	can_events => 1,	801	can_events => 1,
795	tooltip => $resist_names{$_}->[1],	802	tooltip => $resist_names{$_}->[1],
…		…
806		813
807	$r	814	$r
808	}	815	}
809		816
810	sub skill_window {	817	sub skill_window {
811	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	818	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
812	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	819	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813	$sw	820	$sw
814	}	821	}
815		822
816	sub formsep($) {	823	sub formsep($) {
817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
828	return if $METASERVER_ATIME > time;	835	return if $METASERVER_ATIME > time;
829	$METASERVER_ATIME = time + 60;	836	$METASERVER_ATIME = time + 60;
830		837
831	my $table = $METASERVER->{table};	838	my $table = $METASERVER->{table};
832	$table->clear;	839	$table->clear;
833	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	840	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834		841
835	my $buf;	842	my $buf;
836		843
837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	844	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
838		845
…		…
861	"The time this server has been running without being restarted.",	868	"The time this server has been running without being restarted.",
862	"The server software version - a '+' indicates a Crossfire+ server.",	869	"The server software version - a '+' indicates a Crossfire+ server.",
863	"Short information about this server provided by its admins.",	870	"Short information about this server provided by its admins.",
864	);	871	);
865	my @col = qw(#Users Host Uptime Version Description);	872	my @col = qw(#Users Host Uptime Version Description);
866	$table->add ($_, 0, new CFClient::UI::Label	873	$table->add ($_, 0, new CFPlus::UI::Label
867	can_hover => 1, can_events => 1,	874	can_hover => 1, can_events => 1,
868	align => 0, fg => [1, 1, 0],	875	align => 0, fg => [1, 1, 0],
869	text => $col[$_], tooltip => $tip[$_])	876	text => $col[$_], tooltip => $tip[$_])
870	for 0 .. $#col;	877	for 0 .. $#col;
871		878
…		…
892		899
893	$m = [$users, $host, $uptime, $version, $desc];	900	$m = [$users, $host, $uptime, $version, $desc];
894		901
895	$y++;	902	$y++;
896		903
897	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	904	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
898	(new CFClient::UI::Button	905	(new CFPlus::UI::Button
899	text => "Use",	906	text => "Use",
900	tooltip => "Put this server into the <b>Host:Port</b> field",	907	tooltip => "Put this server into the <b>Host:Port</b> field",
901	on_activate => sub {	908	on_activate => sub {
902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
903	$METASERVER->hide;	910	$METASERVER->hide;
904	0	911	0
905	},	912	},
906	),	913	),
907	(new CFClient::UI::Empty expand => 1),	914	(new CFPlus::UI::Empty expand => 1),
908	]);	915	]);
909		916
910	$table->add ($_, $y, new CFClient::UI::Label	917	$table->add ($_, $y, new CFPlus::UI::Label
911	ellipsise => 0,	918	ellipsise => 0,
912	align => $align[$_],	919	align => $align[$_],
913	text => $m->[$_],	920	text => $m->[$_],
914	tooltip => $tip[$_],	921	tooltip => $tip[$_],
915	can_hover => 1,	922	can_hover => 1,
…		…
920	}	927	}
921	});	928	});
922	}	929	}
923		930
924	sub metaserver_dialog {	931	sub metaserver_dialog {
925	my $vbox = new CFClient::UI::VBox;	932	my $vbox = new CFPlus::UI::VBox;
926	my $table = new CFClient::UI::Table;	933	my $table = new CFPlus::UI::Table;
927	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	934	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
928		935
929	my $dialog = new CFClient::UI::FancyFrame	936	my $dialog = new CFPlus::UI::FancyFrame
930	title => "Server List",	937	title => "Server List",
931	name => 'metaserver_dialog',	938	name => 'metaserver_dialog',
932	x => 'center',	939	x => 'center',
933	y => 'center',	940	y => 'center',
934	z => 3,	941	z => 3,
…		…
944		951
945	$dialog	952	$dialog
946	}	953	}
947		954
948	sub server_setup {	955	sub server_setup {
949	my $vbox = new CFClient::UI::VBox;	956	my $vbox = new CFPlus::UI::VBox;
950		957
951	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	958	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
952	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	959	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
953		960
954	{	961	{
955	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	962	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
956		963
957	$vbox->add (	964	$vbox->add (
958	$HOST_ENTRY = new CFClient::UI::Entry	965	$HOST_ENTRY = new CFPlus::UI::Entry
959	expand => 1,	966	expand => 1,
960	text => $CFG->{profile}{default}{host},	967	text => $CFG->{profile}{default}{host},
961	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	968	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
962	on_changed => sub {	969	on_changed => sub {
963	my ($self, $value) = @_;	970	my ($self, $value) = @_;
964	$CFG->{profile}{default}{host} = $value;	971	$CFG->{profile}{default}{host} = $value;
965	0	972	0
966	}	973	}
967	);	974	);
968		975
969	$vbox->add (new CFClient::UI::Button	976	$vbox->add (new CFPlus::UI::Button
970	expand => 1,	977	expand => 1,
971	text => "Server List",	978	text => "Server List",
972	other => $METASERVER,	979	other => $METASERVER,
973	tooltip => "Show a list of available crossfire servers",	980	tooltip => "Show a list of available crossfire servers",
974	on_activate => sub { $METASERVER->toggle_visibility; 0 },	981	on_activate => sub { $METASERVER->toggle_visibility; 0 },
975	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
976	);	983	);
977	}	984	}
978		985
979	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	986	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
980	$table->add (1, 4, new CFClient::UI::Entry	987	$table->add (1, 4, new CFPlus::UI::Entry
981	text => $CFG->{profile}{default}{user},	988	text => $CFG->{profile}{default}{user},
982	tooltip => "The name of your character on the server",	989	tooltip => "The name of your character on the server",
983	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
984	);	991	);
985		992
986	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	993	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
987	$table->add (1, 5, new CFClient::UI::Entry	994	$table->add (1, 5, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{password},	995	text => $CFG->{profile}{default}{password},
989	hidden => 1,	996	hidden => 1,
990	tooltip => "The password for your character",	997	tooltip => "The password for your character",
991	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
992	);	999	);
993		1000
994	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1001	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
995	$table->add (1, 7, new CFClient::UI::Slider	1002	$table->add (1, 7, new CFPlus::UI::Slider
996	force_w => 100,	1003	force_w => 100,
997	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],
998	tooltip => "This is the size of the portion of the map update the server sends you. "	1005	tooltip => "This is the size of the portion of the map update the server sends you. "
999	. "If you set this to a high value you will be able to see further, "	1006	. "If you set this to a high value you will be able to see further, "
1000	. "but you also increase bandwidth requirements and latency. "	1007	. "but you also increase bandwidth requirements and latency. "
1001	. "This option is only used once at log-in.",	1008	. "This option is only used once at log-in.",
1002	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1009	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1003	);	1010	);
1004		1011
1005	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1012	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1006	$table->add (1, 8, new CFClient::UI::CheckBox	1013	$table->add (1, 8, new CFPlus::UI::CheckBox
1007	state => $CFG->{face_prefetch},	1014	state => $CFG->{face_prefetch},
1008	tooltip => "<b>Background Image Prefetch</b>\n\n"	1015	tooltip => "<b>Background Image Prefetch</b>\n\n"
1009	. "If enabled, the client automatically pre-fetches images from the server. "	1016	. "If enabled, the client automatically pre-fetches images from the server. "
1010	. "This might increase or create lag, but increases the chances "	1017	. "This might increase or create lag, but increases the chances "
1011	. "of faces being ready for display when you encounter them. "	1018	. "of faces being ready for display when you encounter them. "
…		…
1013	. "so only set it if you really need to prefetch images. "	1020	. "so only set it if you really need to prefetch images. "
1014	. "This option can be set and unset any time.",	1021	. "This option can be set and unset any time.",
1015	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1016	);	1023	);
1017		1024
1018	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1025	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1019	$table->add (1, 9, new CFClient::UI::Entry	1026	$table->add (1, 9, new CFPlus::UI::Entry
1020	text => $CFG->{output_count},	1027	text => $CFG->{output_count},
1021	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1022	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1023	);	1030	);
1024		1031
1025	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1032	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1026	$table->add (1, 10, new CFClient::UI::Entry	1033	$table->add (1, 10, new CFPlus::UI::Entry
1027	text => $CFG->{output_sync},	1034	text => $CFG->{output_sync},
1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1035	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1030	);	1037	);
1031		1038
1032	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1039	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1033	expand => 1,	1040	expand => 1,
1034	align => 0,	1041	align => 0,
1035	text => "Login",	1042	text => "Login",
1036	on_activate => sub {	1043	on_activate => sub {
1037	$CONN ? stop_game	1044	$CONN ? stop_game
1038	: start_game;	1045	: start_game;
1039	0	1046	0
1040	},	1047	},
1041	);	1048	);
1042		1049
1043	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1050	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1044	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1051	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1045	text => $CFG->{say_command},	1052	text => $CFG->{say_command},
1046	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1053	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1047	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1054	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1048	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1055	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1049	on_changed => sub {	1056	on_changed => sub {
…		…
1051	$CFG->{say_command} = $value;	1058	$CFG->{say_command} = $value;
1052	0	1059	0
1053	}	1060	}
1054	);	1061	);
1055		1062
1056	$vbox->add (new CFClient::UI::Label	1063	$vbox->add (new CFPlus::UI::Label
1057	text => "Server Info",	1064	text => "Server Info",
1058	fontsize => 1.2,	1065	fontsize => 1.2,
1059	padding_y => 8,	1066	padding_y => 8,
1060	fg => [1, 1, 0, 1],	1067	fg => [1, 1, 0, 1],
1061	);	1068	);
1062		1069
1063	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1070	$vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1064		1071
1065	$vbox	1072	$vbox
1066	}	1073	}
1067		1074
1068	sub message_window {	1075	sub message_window {
1069	my $window = new CFClient::UI::FancyFrame	1076	my $window = new CFPlus::UI::FancyFrame
1070	name => "message_window",	1077	name => "message_window",
1071	title => "Messages",	1078	title => "Messages",
1072	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1073	x => "max",	1080	x => "max",
1074	y => 0,	1081	y => 0,
1075	force_w => $::WIDTH * 0.4,	1082	force_w => $::WIDTH * 0.4,
1076	force_h => $::HEIGHT * 0.5,	1083	force_h => $::HEIGHT * 0.5,
1077	child => (my $vbox = new CFClient::UI::VBox),	1084	child => (my $vbox = new CFPlus::UI::VBox),
1078	has_close_button => 1;	1085	has_close_button => 1;
1079		1086
1080	$vbox->add ($LOGVIEW);	1087	$vbox->add ($LOGVIEW);
1081		1088
1082	$vbox->add (my $input = new CFClient::UI::Entry	1089	$vbox->add (my $input = new CFPlus::UI::Entry
1083	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1090	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1084	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1091	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1085	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1092	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1086	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1093	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1087	on_focus_in => sub {	1094	on_focus_in => sub {
…		…
1126	};	1133	};
1127		1134
1128	$window	1135	$window
1129	}	1136	}
1130		1137
		1138	sub open_string_query {
		1139	my $cb = $_[1];
		1140	my $dialog = new CFPlus::UI::FancyFrame
		1141	x => "center",
		1142	y => "center",
		1143	z => 50,
		1144	force_w => $WIDTH * 4/5,
		1145	title => $_[0];
		1146
		1147	$dialog->add (
		1148	my $e = new CFPlus::UI::Entry
		1149	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1150	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1151	);
		1152
		1153	$e->grab_focus;
		1154	$dialog->show;
		1155	}
		1156
1131	sub open_quit_dialog {	1157	sub open_quit_dialog {
1132	unless ($QUIT_DIALOG) {	1158	unless ($QUIT_DIALOG) {
1133	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1159	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1134	x => "center",	1160	x => "center",
1135	y => "center",	1161	y => "center",
1136	z => 50,	1162	z => 50,
1137	title => "Really Quit?",	1163	title => "Really Quit?",
1138	on_key_down => sub {	1164	on_key_down => sub {
1139	my ($dialog, $ev) = @_;	1165	my ($dialog, $ev) = @_;
1140	$ev->{sym} == 27 and $dialog->hide;	1166	$ev->{sym} == 27 and $dialog->hide;
1141	}	1167	}
1142	;	1168	;
1143		1169
1144	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1170	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1145		1171
1146	$vb->add (new CFClient::UI::Label	1172	$vb->add (new CFPlus::UI::Label
1147	text => "You should find a savebed and apply it first!",	1173	text => "You should find a savebed and apply it first!",
1148	max_w => $WIDTH * 0.25,	1174	max_w => $WIDTH * 0.25,
1149	ellipsize => 0,	1175	ellipsize => 0,
1150	);	1176	);
1151	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1177	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1152	$hb->add (new CFClient::UI::Button	1178	$hb->add (new CFPlus::UI::Button
1153	text => "Ok",	1179	text => "Ok",
1154	expand => 1,	1180	expand => 1,
1155	on_activate => sub { $QUIT_DIALOG->hide; 0 },	1181	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1156	);	1182	);
1157	$hb->add (new CFClient::UI::Button	1183	$hb->add (new CFPlus::UI::Button
1158	text => "Quit anyway",	1184	text => "Quit anyway",
1159	expand => 1,	1185	expand => 1,
1160	on_activate => sub { exit },	1186	on_activate => sub { exit },
1161	);	1187	);
1162	}	1188	}
…		…
1164	$QUIT_DIALOG->show;	1190	$QUIT_DIALOG->show;
1165	$QUIT_DIALOG->grab_focus;	1191	$QUIT_DIALOG->grab_focus;
1166	}	1192	}
1167		1193
1168	sub autopickup_setup {	1194	sub autopickup_setup {
1169	my $table = new CFClient::UI::Table;	1195	my $table = new CFPlus::UI::Table;
1170		1196
1171	for (	1197	for (
1172	["General", 0, 0,	1198	["General", 0, 0,
1173	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1199	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1174	["Inhibit autopickup" => PICKUP_INHIBIT],	1200	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1208	],	1234	],
1209	["Weight/Value ratio", 2, 17]	1235	["Weight/Value ratio", 2, 17]
1210	)	1236	)
1211	{	1237	{
1212	my ($title, $x, $y, @bits) = @$_;	1238	my ($title, $x, $y, @bits) = @$_;
1213	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1239	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1214		1240
1215	for (@bits) {	1241	for (@bits) {
1216	++$y;	1242	++$y;
1217		1243
1218	my $mask = $_->[1];	1244	my $mask = $_->[1];
1219	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1245	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1220	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1246	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1221	state => $::CFG->{pickup} & $mask,	1247	state => $::CFG->{pickup} & $mask,
1222	on_changed => sub {	1248	on_changed => sub {
1223	my ($box, $value) = @_;	1249	my ($box, $value) = @_;
1224		1250
1225	if ($value) {	1251	if ($value) {
…		…
1236		1262
1237	${$_->[2]} = $checkbox if $_->[2];	1263	${$_->[2]} = $checkbox if $_->[2];
1238	}	1264	}
1239	}	1265	}
1240		1266
1241	$table->add (2, 18, new CFClient::UI::ValSlider	1267	$table->add (2, 18, new CFPlus::UI::ValSlider
1242	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1268	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1243	template => ">= 99",	1269	template => ">= 99",
1244	to_value => sub { ">= " . 5 * $_[0] },	1270	to_value => sub { ">= " . 5 * $_[0] },
1245	on_changed => sub {	1271	on_changed => sub {
1246	my ($slider, $value) = @_;	1272	my ($slider, $value) = @_;
…		…
1249	$::CFG->{pickup} |= int $value	1275	$::CFG->{pickup} |= int $value
1250	if $value;	1276	if $value;
1251	1;	1277	1;
1252	});	1278	});
1253		1279
1254	$table->add (3, 18, new CFClient::UI::Button	1280	$table->add (3, 18, new CFPlus::UI::Button
1255	text => "set",	1281	text => "set",
1256	on_activate => sub {	1282	on_activate => sub {
1257	$::CONN->send_command ("pickup $::CFG->{pickup}")	1283	$::CONN->send_command ("pickup $::CFG->{pickup}")
1258	if defined $::CONN;	1284	if defined $::CONN;
1259	0	1285	0
1260	});	1286	});
1261		1287
1262	$table	1288	$table
1263	}	1289	}
1264		1290
		1291	my %SORT_ORDER = (
		1292	type => undef,
		1293	mtime => sub { sort {
		1294	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1295	or $b->{mtime} <=> $a->{mtime}
		1296	or $a->{type} <=> $b->{type}
		1297	} @_ },
		1298	weight => sub { sort {
		1299	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1300	or $a->{type} <=> $b->{type}
		1301	} @_ },
		1302	);
		1303
1265	sub inventory_widget {	1304	sub inventory_widget {
1266	my $hb = new CFClient::UI::HBox homogeneous => 1;	1305	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1267		1306
1268	$hb->add (my $vb1 = new CFClient::UI::VBox);	1307	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1269	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1308	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1270		1309
1271	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1310	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1272		1311
1273	use sort 'stable';	1312	use sort 'stable';
1274		1313
1275	$hb1->add (new CFClient::UI::Combobox	1314	$hb1->add (new CFPlus::UI::Selector
1276	value => undef,	1315	value => $::CFG->{inv_sort},
1277	options => [	1316	options => [
1278	[undef, "Type/Name"],	1317	[type => "Type/Name"],
1279	[	1318	[mtime => "Recent/Normal/Locked"],
1280	sub { sort {
1281	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282	or $a->{type} <=> $b->{type}
1283	} @_ },
1284	"Weight/Type",	1319	[weight => "Weight/Type"],
1285	],
1286	[sub { } => "#TODO#"],
1287	],	1320	],
1288	on_changed => sub {	1321	on_changed => sub {
		1322	$::CFG->{inv_sort} = $_[1];
1289	$INV->set_sort_order ($_[1]);	1323	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1290	},	1324	},
1291	);	1325	);
1292	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1326	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1293	#TODO# update to weigh/maxweight	1327	#TODO# update to weigh/maxweight
1294	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1328	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1295		1329
1296	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1330	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1297	$sw1->add ($INV = new CFClient::UI::Inventory);	1331	$sw1->add ($INV = new CFPlus::UI::Inventory);
1298		1332
1299	$hb->add (my $vb2 = new CFClient::UI::VBox);	1333	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1300		1334
1301	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1335	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1302		1336
1303	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1337	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw2->add ($INVR = new CFClient::UI::Inventory);	1338	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1305		1339
1306	# XXX: Call after $INVR = ... because set_opencont sets the items	1340	# XXX: Call after $INVR = ... because set_opencont sets the items
1307	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1341	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1308		1342
1309	$hb	1343	$hb
1310	}	1344	}
1311		1345
1312	sub toggle_player_page {	1346	sub toggle_player_page {
…		…
1319	$PL_WINDOW->show;	1353	$PL_WINDOW->show;
1320	}	1354	}
1321	}	1355	}
1322		1356
1323	sub player_window {	1357	sub player_window {
1324	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1358	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1325	x => "center",	1359	x => "center",
1326	y => "center",	1360	y => "center",
1327	force_w => $WIDTH * 9/10,	1361	force_w => $WIDTH * 9/10,
1328	force_h => $HEIGHT * 9/10,	1362	force_h => $HEIGHT * 9/10,
1329	title => "Player",	1363	title => "Player",
…		…
1331	has_close_button => 1	1365	has_close_button => 1
1332	;	1366	;
1333		1367
1334	my $ntb =	1368	my $ntb =
1335	$PL_NOTEBOOK =	1369	$PL_NOTEBOOK =
1336	new CFClient::UI::Notebook expand => 1, debug => 1;	1370	new CFPlus::UI::Notebook expand => 1, debug => 1;
1337		1371
1338	$ntb->add (	1372	$ntb->add (
1339	"Statistics (F2)" => $STATS_PAGE = stats_window,	1373	"Statistics (F2)" => $STATS_PAGE = stats_window,
1340	"Shows statistics, where all your Stats and Resistances are shown."	1374	"Shows statistics, where all your Stats and Resistances are shown."
1341	);	1375	);
1342	$ntb->add (	1376	$ntb->add (
1343	"Skills (F3)" => $SKILL_PAGE = skill_window,	1377	"Skills (F3)" => $SKILL_PAGE = skill_window,
1344	"Shows all your Skills."	1378	"Shows all your Skills."
1345	);	1379	);
1346		1380
1347	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1381	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1348	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1382	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1349	$ntb->add (	1383	$ntb->add (
1350	"Spellbook (F4)" => $spellsw,	1384	"Spellbook (F4)" => $spellsw,
1351	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1385	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1352	);	1386	);
1353	$ntb->add (	1387	$ntb->add (
…		…
1365	sub update_bindings {	1399	sub update_bindings {
1366	$BIND_UPD_CB->() if $BIND_UPD_CB;	1400	$BIND_UPD_CB->() if $BIND_UPD_CB;
1367	}	1401	}
1368		1402
1369	sub keyboard_setup {	1403	sub keyboard_setup {
1370	my $binding_list = new CFClient::UI::VBox;	1404	my $binding_list = new CFPlus::UI::VBox;
1371		1405
1372	my $refresh;	1406	my $refresh;
1373	$refresh = $BIND_UPD_CB = sub {	1407	$refresh = $BIND_UPD_CB = sub {
1374	$binding_list->clear ();	1408	$binding_list->clear ();
1375		1409
…		…
1377	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1411	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1378	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1412	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1379	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1413	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1380		1414
1381	my $lbl = join "; ", @$cmds;	1415	my $lbl = join "; ", @$cmds;
1382	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1416	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1383	$binding_list->add (my $hb = new CFClient::UI::HBox);	1417	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1384	$hb->add (new CFClient::UI::Button	1418	$hb->add (new CFPlus::UI::Button
1385	text => "delete",	1419	text => "delete",
1386	tooltip => "Deletes the binding",	1420	tooltip => "Deletes the binding",
1387	on_activate => sub {	1421	on_activate => sub {
1388	$binding_list->remove ($hb);	1422	$binding_list->remove ($hb);
1389	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1423	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1390	0	1424	0
1391	});	1425	});
1392		1426
1393	$hb->add (new CFClient::UI::Button	1427	$hb->add (new CFPlus::UI::Button
1394	text => "edit",	1428	text => "edit",
1395	tooltip => "Edits the binding",	1429	tooltip => "Edits the binding",
1396	on_activate => sub {	1430	on_activate => sub {
1397	$::BIND_EDITOR->set_binding (	1431	$::BIND_EDITOR->set_binding (
1398	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1432	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
…		…
1411	$::BIND_EDITOR->show;	1445	$::BIND_EDITOR->show;
1412	$SETUP_DIALOG->hide;	1446	$SETUP_DIALOG->hide;
1413	0	1447	0
1414	});	1448	});
1415		1449
1416	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1450	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1417	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1451	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1418	}	1452	}
1419	}	1453	}
1420	};	1454	};
1421		1455
1422	my $vb = new CFClient::UI::VBox;	1456	my $vb = new CFPlus::UI::VBox;
1423	$vb->add (my $hb = new CFClient::UI::HBox);	1457	$vb->add (my $hb = new CFPlus::UI::HBox);
1424	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1458	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1425	$hb->add (new CFClient::UI::CheckBox	1459	$hb->add (new CFPlus::UI::CheckBox
1426	expand => 1,	1460	expand => 1,
1427	state => $CFG->{shift_fire_stop},	1461	state => $CFG->{shift_fire_stop},
1428	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1462	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1429	on_changed => sub {	1463	on_changed => sub {
1430	my ($cbox, $value) = @_;	1464	my ($cbox, $value) = @_;
1431	$CFG->{shift_fire_stop} = $value;	1465	$CFG->{shift_fire_stop} = $value;
1432	0	1466	0
1433	});	1467	});
1434		1468
1435	$vb->add ($binding_list);	1469	$vb->add ($binding_list);
1436	$vb->add (my $hb = new CFClient::UI::HBox);	1470	$vb->add (my $hb = new CFPlus::UI::HBox);
1437		1471
1438	$hb->add (new CFClient::UI::Button	1472	$hb->add (new CFPlus::UI::Button
1439	text => "record new",	1473	text => "record new",
1440	expand => 1,	1474	expand => 1,
1441	tooltip => "This button opens the binding editor with an empty binding.",	1475	tooltip => "This button opens the binding editor with an empty binding.",
1442	on_activate => sub {	1476	on_activate => sub {
1443	$::BIND_EDITOR->set_binding (undef, undef, [],	1477	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1457	$::BIND_EDITOR->show;	1491	$::BIND_EDITOR->show;
1458	0	1492	0
1459	},	1493	},
1460	);	1494	);
1461		1495
1462	$hb->add (new CFClient::UI::Button	1496	$hb->add (new CFPlus::UI::Button
1463	text => "close",	1497	text => "close",
1464	tooltip => "Closes the binding window",	1498	tooltip => "Closes the binding window",
1465	expand => 1,	1499	expand => 1,
1466	on_activate => sub {	1500	on_activate => sub {
1467	$SETUP_DIALOG->hide;	1501	$SETUP_DIALOG->hide;
…		…
1472	$refresh->();	1506	$refresh->();
1473		1507
1474	$vb	1508	$vb
1475	}	1509	}
1476		1510
1477	# just weirdness, pls. ignore
1478	sub load_html_page {
1479	my ($viewer, $base) = @_;
1480
1481	$viewer->clear;
1482
1483	require LWP::Simple;
1484	require HTML::Parser;
1485	require URI;
1486
1487	my $page = LWP::Simple::get ($base)
1488	or return;
1489
1490	my @s = { };
1491	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1492
1493	my $parser = HTML::Parser->new (
1494	text_h => [sub {
1495	my ($text) = @_;
1496	$text =~ s/\s+/ /g;
1497	$s[-1]{text} .= CFClient::asxml $text;
1498	}, "dtext"],
1499	start_h => [sub {
1500	my ($tag, $attr) = @_;
1501	if ($passthrough{$tag}) {
1502	$s[-1]{text} .= "<$tag>";
1503	} elsif ($tag eq "h1") {
1504	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1505	} elsif ($tag eq "h2") {
1506	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1507	} elsif ($tag eq "h3") {
1508	push @s, { text => "<span size='large'>" };
1509	} elsif ($tag eq "a") {
1510	push @s, { text => "", url => $attr->{href} };
1511	} elsif ($tag eq "p") {
1512	push @s, { };
1513	} elsif ($tag eq "img") {
1514	eval {
1515	push @{$s[-1]{obj}}, new CFClient::UI::Image
1516	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1517	$s[-1]{text} .= "\x{fffc}";
1518	};
1519	}
1520	}, "tagname, attr"],
1521	end_h => [sub {
1522	my ($tag) = @_;
1523	if ($passthrough{$tag}) {
1524	$s[-1]{text} .= "</$tag>";
1525	} elsif ($tag =~ /^h\d$/) {
1526	$s[-1]{text} .= "</span>";
1527	push @s, { };
1528	} elsif ($tag eq "a") {
1529	my $S = pop @s;
1530	$s[-1]{text} .= "\x{fffc}";
1531	push @{$s[-1]{obj}}, new CFClient::UI::Label
1532	fg => [0.8, 0.8, 1],
1533	markup => "<u>$S->{text}</u>",
1534	fontsize => 0.8,
1535	can_events => 1,
1536	can_focus => 1,
1537	on_button_up => sub {
1538	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1539	},
1540	;
1541	}
1542	}, "tagname"],
1543	);
1544
1545	$parser->parse ($page);
1546	$parser->eof;
1547
1548	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1549	for @s;
1550
1551	$viewer->set_offset (0);
1552	}
1553
1554	sub help_window {	1511	sub help_window {
1555	my $win = new CFClient::UI::FancyFrame	1512	my $win = new CFPlus::UI::FancyFrame
1556	x => 'center',	1513	x => 'center',
1557	y => 'center',	1514	y => 'center',
1558	z => 2,	1515	z => 2,
1559	name => 'doc_browser',	1516	name => 'doc_browser',
1560	force_w => int $WIDTH * 7/8,	1517	force_w => int $WIDTH * 7/8,
1561	force_h => int $HEIGHT * 7/8,	1518	force_h => int $HEIGHT * 7/8,
1562	title => "Help Browser",	1519	title => "Help Browser",
1563	has_close_button => 1;	1520	has_close_button => 1;
1564		1521
1565	$win->add (my $vbox = new CFClient::UI::VBox);	1522	$win->add (my $vbox = new CFPlus::UI::VBox);
1566		1523
1567	$vbox->add (my $buttons = new CFClient::UI::HBox);	1524	$vbox->add (my $buttons = new CFPlus::UI::HBox);
1568	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1525	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1569	expand => 1, fontsize => 0.8, padding_x => 4);	1526	expand => 1, fontsize => 0.8, padding_x => 4);
1570		1527
1571	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1528	$buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1572	$buttons->add (my $combo = new CFClient::UI::Combobox	1529	$buttons->add (my $combo = new CFPlus::UI::Selector
1573	value => undef,	1530	value => undef,
1574	options => [	1531	options => [
1575	[intro => "Introduction"],	1532	[intro => "Introduction"],
1576	[manual => "Main Manual"],	1533	[manual => "Main Manual"],
1577	[skill_help => "Skill Reference"],	1534	[skill_help => "Skill Reference"],
1578	[command_help => "Command Reference"],	1535	[command_help => "Command Reference"],
1579	[dmcommand_help => "DM Commands"],	1536	[dmcommand_help => "DM Commands"],
1580	[COPYING => "License Terms"],	1537	[COPYING => "License Terms"],
1581	[test => "test (do not select)"], #d#TODO
1582	],	1538	],
1583	on_changed => sub {	1539	on_changed => sub {
1584	my ($self, $pod) = @_;	1540	my ($self, $pod) = @_;
1585		1541
1586	if ($pod eq "test") {#d#TODO
1587	eval {
1588	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1589	};
1590	warn "$@" if $@;
1591	return;
1592	}
1593
1594	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1595	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1596
1597	#use Data::Dumper; warn Dumper $pom;#d#
1598
1599	$viewer->clear;	1542	$viewer->clear;
1600		1543	$viewer->add_paragraph (CFPlus::Pod::section pod => $pod);
1601	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1602	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1603	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1604	# ]);#d#
1605
1606	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1607	for @$pom;
1608
1609	$viewer->set_offset (0);	1544	$viewer->set_offset (0);
1610		1545
1611	0	1546	0
1612	},	1547	},
1613	on_visibility_change => sub {	1548	on_visibility_change => sub {
…		…
1621		1556
1622	$win	1557	$win
1623	}	1558	}
1624		1559
1625	sub sdl_init {	1560	sub sdl_init {
1626	CFClient::SDL_Init	1561	CFPlus::SDL_Init
1627	and die "SDL::Init failed!\n";	1562	and die "SDL::Init failed!\n";
1628	}	1563	}
1629		1564
1630	sub video_init {	1565	sub video_init {
1631	sdl_init;	1566	sdl_init;
…		…
1636		1571
1637	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1572	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1638	$FULLSCREEN = $CFG->{fullscreen};	1573	$FULLSCREEN = $CFG->{fullscreen};
1639	$FAST = $CFG->{fast};	1574	$FAST = $CFG->{fast};
1640		1575
1641	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1576	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1642	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1577	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1643		1578
1644	$SDL_ACTIVE = 1;	1579	$SDL_ACTIVE = 1;
1645	$LAST_REFRESH = time - 0.01;	1580	$LAST_REFRESH = time - 0.01;
1646		1581
1647	CFClient::OpenGL::init;	1582	CFPlus::OpenGL::init;
1648		1583
1649	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1584	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1650		1585
1651	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1586	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1652		1587
1653	#############################################################################	1588	#############################################################################
1654		1589
1655	if ($DEBUG_STATUS) {	1590	if ($DEBUG_STATUS) {
1656	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1591	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1657	} else {	1592	} else {
1658	# create the widgets	1593	# create the widgets
1659		1594
1660	$DEBUG_STATUS = new CFClient::UI::Label	1595	$DEBUG_STATUS = new CFPlus::UI::Label
1661	padding => 0,	1596	padding => 0,
1662	z => 100,	1597	z => 100,
1663	force_x => "max",	1598	force_x => "max",
1664	force_y => 0;	1599	force_y => 0;
1665	$DEBUG_STATUS->show;	1600	$DEBUG_STATUS->show;
1666		1601
1667	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1602	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1668		1603
1669	$STATUSBOX = new CFClient::UI::Statusbox;	1604	$STATUSBOX = new CFPlus::UI::Statusbox;
1670	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1605	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1671		1606
1672	(new CFClient::UI::Frame	1607	(new CFPlus::UI::Frame
1673	bg => [0, 0, 0, 0.4],	1608	bg => [0, 0, 0, 0.4],
1674	force_x => 0,	1609	force_x => 0,
1675	force_y => "max",	1610	force_y => "max",
1676	child => $STATUSBOX,	1611	child => $STATUSBOX,
1677	)->show;	1612	)->show;
1678		1613
1679	CFClient::UI::FancyFrame->new (	1614	CFPlus::UI::FancyFrame->new (
1680	title => "Map",	1615	title => "Map",
1681	name => "mapmap",	1616	name => "mapmap",
1682	x => 0,	1617	x => 0,
1683	y => $FONTSIZE + 8,	1618	y => $FONTSIZE + 8,
1684	border_bg => [1, 1, 1, 192/255],	1619	border_bg => [1, 1, 1, 192/255],
1685	bg => [1, 1, 1, 0],	1620	bg => [1, 1, 1, 0],
1686	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1621	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1687	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1622	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1688	),	1623	),
1689	)->show;	1624	)->show;
1690		1625
1691	$MAPWIDGET = new CFClient::MapWidget;	1626	$MAPWIDGET = new CFPlus::MapWidget;
1692	$MAPWIDGET->connect (activate_console => sub {	1627	$MAPWIDGET->connect (activate_console => sub {
1693	my ($mapwidget, $preset) = @_;	1628	my ($mapwidget, $preset) = @_;
1694		1629
1695	if ($CONSOLE) {	1630	if ($CONSOLE) {
1696	$CONSOLE->{input}->{auto_activated} = 1;	1631	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1702	}	1637	}
1703	});	1638	});
1704	$MAPWIDGET->show;	1639	$MAPWIDGET->show;
1705	$MAPWIDGET->grab_focus;	1640	$MAPWIDGET->grab_focus;
1706		1641
1707	$LOGVIEW = new CFClient::UI::TextScroller	1642	$LOGVIEW = new CFPlus::UI::TextScroller
1708	expand => 1,	1643	expand => 1,
1709	font => $FONT_FIXED,	1644	font => $FONT_FIXED,
1710	fontsize => $::CFG->{log_fontsize},	1645	fontsize => $::CFG->{log_fontsize},
1711	indent => -4,	1646	indent => -4,
1712	can_hover => 1,	1647	can_hover => 1,
1713	can_events => 1,	1648	can_events => 1,
1714	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1649	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1715	;	1650	;
1716		1651
1717	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1652	$SETUP_DIALOG = new CFPlus::UI::FancyFrame
1718	title => "Setup",	1653	title => "Setup",
1719	name => "setup_dialog",	1654	name => "setup_dialog",
1720	x => 'center',	1655	x => 'center',
1721	y => 'center',	1656	y => 'center',
1722	z => 2,	1657	z => 2,
…		…
1725	has_close_button => 1,	1660	has_close_button => 1,
1726	;	1661	;
1727		1662
1728	$METASERVER = metaserver_dialog;	1663	$METASERVER = metaserver_dialog;
1729		1664
1730	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1665	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1731	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1666	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1732		1667
1733	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1668	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1734	"Configure the server to play on, your username, password and other server-related options.");	1669	"Configure the server to play on, your username, password and other server-related options.");
1735	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1670	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1736	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1671	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1746	. "After pressing the combo the binding will be saved automatically and the "	1681	. "After pressing the combo the binding will be saved automatically and the "
1747	. "binding editor closes");	1682	. "binding editor closes");
1748	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1683	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1749	"Some debuggin' options. Do not ask.");	1684	"Some debuggin' options. Do not ask.");
1750		1685
1751	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1686	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1752		1687
1753	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1688	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1754	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1689	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1755		1690
1756	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1691	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1757	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1692	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1758		1693
1759	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1694	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1760		1695
1761	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1696	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1762	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1697	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1763		1698
1764	$BUTTONBAR->add (new CFClient::UI::Button	1699	$BUTTONBAR->add (new CFPlus::UI::Button
1765	text => "Save Config",	1700	text => "Save Config",
1766	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1701	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1767	on_activate => sub {	1702	on_activate => sub {
1768	$::CFG->{layout} = CFClient::UI::get_layout;	1703	$::CFG->{layout} = CFPlus::UI::get_layout;
1769	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1704	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1770	status "Configuration Saved";	1705	status "Configuration Saved";
1771	0	1706	0
1772	},	1707	},
1773	);	1708	);
1774		1709
1775	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1710	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1776	tooltip => "View Documentation");	1711	tooltip => "View Documentation");
1777		1712
1778	$BUTTONBAR->add (new CFClient::UI::Button	1713	$BUTTONBAR->add (new CFPlus::UI::Button
1779	text => "Quit",	1714	text => "Quit",
1780	tooltip => "Terminates the program",	1715	tooltip => "Terminates the program",
1781	on_activate => sub {	1716	on_activate => sub {
1782	if ($CONN) {	1717	if ($CONN) {
1783	open_quit_dialog;	1718	open_quit_dialog;
…		…
1794		1729
1795	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1730	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1796	}	1731	}
1797		1732
1798	sub video_shutdown {	1733	sub video_shutdown {
1799	CFClient::OpenGL::shutdown;	1734	CFPlus::OpenGL::shutdown;
1800		1735
1801	undef $SDL_ACTIVE;	1736	undef $SDL_ACTIVE;
1802	}	1737	}
1803		1738
1804	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1739	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1812		1747
1813	sub audio_music_finished {	1748	sub audio_music_finished {
1814	return unless $CFG->{bgm_enable};	1749	return unless $CFG->{bgm_enable};
1815		1750
1816	# TODO: hack, do play loop and mood music	1751	# TODO: hack, do play loop and mood music
1817	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1752	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1818	$bgmusic->play (0);	1753	$bgmusic->play (0);
1819		1754
1820	push @bgmusic, shift @bgmusic;	1755	push @bgmusic, shift @bgmusic;
1821	}	1756	}
1822		1757
1823	sub audio_init {	1758	sub audio_init {
1824	if ($CFG->{audio_enable}) {	1759	if ($CFG->{audio_enable}) {
1825	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1760	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1826	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1761	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1827		1762
1828	unless ($SDL_MIXER) {	1763	unless ($SDL_MIXER) {
1829	status "Unable to open sound device: there will be no sound";	1764	status "Unable to open sound device: there will be no sound";
1830	return;	1765	return;
1831	}	1766	}
1832		1767
1833	CFClient::Mix_AllocateChannels 8;	1768	CFPlus::Mix_AllocateChannels 8;
1834	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1769	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1835		1770
1836	audio_music_finished;	1771	audio_music_finished;
1837		1772
1838	while (<$fh>) {	1773	while (<$fh>) {
1839	next if /^\s*#/;	1774	next if /^\s*#/;
…		…
1842	my ($file, $volume, $event) = split /\s+/, $_, 3;	1777	my ($file, $volume, $event) = split /\s+/, $_, 3;
1843		1778
1844	push @SOUNDS, "$volume,$file";	1779	push @SOUNDS, "$volume,$file";
1845		1780
1846	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1781	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1847	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1782	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1848	$chunk->volume ($volume * 128 / 100);	1783	$chunk->volume ($volume * 128 / 100);
1849	$chunk	1784	$chunk
1850	};	1785	};
1851	}	1786	}
1852	} else {	1787	} else {
…		…
1854	}	1789	}
1855	}	1790	}
1856	}	1791	}
1857		1792
1858	sub audio_shutdown {	1793	sub audio_shutdown {
1859	CFClient::Mix_CloseAudio if $SDL_MIXER;	1794	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1860	undef $SDL_MIXER;	1795	undef $SDL_MIXER;
1861	@SOUNDS = ();	1796	@SOUNDS = ();
1862	%AUDIO_CHUNKS = ();	1797	%AUDIO_CHUNKS = ();
1863	}	1798	}
1864		1799
…		…
1871		1806
1872	sub force_refresh {	1807	sub force_refresh {
1873	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1808	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1874	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1809	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1875		1810
1876	$CFClient::UI::ROOT->draw;	1811	$CFPlus::UI::ROOT->draw;
1877		1812
1878	$WANT_REFRESH = 0;	1813	$WANT_REFRESH = 0;
1879	$CAN_REFRESH = 0;	1814	$CAN_REFRESH = 0;
1880	$LAST_REFRESH = $NOW;	1815	$LAST_REFRESH = $NOW;
1881		1816
1882	CFClient::SDL_GL_SwapBuffers;	1817	CFPlus::SDL_GL_SwapBuffers;
1883	}	1818	}
1884		1819
1885	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1820	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1886	$NOW = time;	1821	$NOW = time;
1887		1822
1888	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1823	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1889	for CFClient::SDL_PollEvent;	1824	for CFPlus::SDL_PollEvent;
1890		1825
1891	if (%animate_object) {	1826	if (%animate_object) {
1892	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1827	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1893	$WANT_REFRESH++;	1828	$WANT_REFRESH++;
1894	}	1829	}
…		…
1918	$CONN->face_prefetch	1853	$CONN->face_prefetch
1919	if $CONN;	1854	if $CONN;
1920	});	1855	});
1921		1856
1922	%SDL_CB = (	1857	%SDL_CB = (
1923	CFClient::SDL_QUIT => sub {	1858	CFPlus::SDL_QUIT => sub {
1924	Event::unloop -1;	1859	Event::unloop -1;
1925	},	1860	},
1926	CFClient::SDL_VIDEORESIZE => sub {	1861	CFPlus::SDL_VIDEORESIZE => sub {
1927	},	1862	},
1928	CFClient::SDL_VIDEOEXPOSE => sub {	1863	CFPlus::SDL_VIDEOEXPOSE => sub {
1929	CFClient::UI::full_refresh;	1864	CFPlus::UI::full_refresh;
1930	},	1865	},
1931	CFClient::SDL_ACTIVEEVENT => sub {	1866	CFPlus::SDL_ACTIVEEVENT => sub {
1932	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1867	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1933	},	1868	},
1934	CFClient::SDL_KEYDOWN => sub {	1869	CFPlus::SDL_KEYDOWN => sub {
1935	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1870	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1936	# alt-enter	1871	# alt-enter
1937	$FULLSCREEN_ENABLE->toggle;	1872	$FULLSCREEN_ENABLE->toggle;
1938	video_shutdown;	1873	video_shutdown;
1939	video_init;	1874	video_init;
1940	} else {	1875	} else {
1941	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1876	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1942	}	1877	}
1943	},	1878	},
1944	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1879	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1945	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1880	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1946	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1881	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1947	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1882	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1948	CFClient::SDL_USEREVENT => sub {	1883	CFPlus::SDL_USEREVENT => sub {
1949	if ($_[0]{code} == 1) {	1884	if ($_[0]{code} == 1) {
1950	audio_channel_finished $_[0]{data1};	1885	audio_channel_finished $_[0]{data1};
1951	} elsif ($_[0]{code} == 0) {	1886	} elsif ($_[0]{code} == 0) {
1952	audio_music_finished;	1887	audio_music_finished;
1953	}	1888	}
…		…
1957	#############################################################################	1892	#############################################################################
1958		1893
1959	$SIG{INT} = $SIG{TERM} = sub { exit };	1894	$SIG{INT} = $SIG{TERM} = sub { exit };
1960		1895
1961	{	1896	{
1962	local $SIG{__DIE__} = sub {
1963	return unless defined $^S && !$^S;
1964	Carp::confess $_[0];#d#TODO: remove when stable
1965	CFClient::fatal $_[0];
1966	};
1967
1968	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1897	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1969	CFClient::UI::set_layout ($::CFG->{layout});	1898	CFPlus::UI::set_layout ($::CFG->{layout});
1970		1899
1971	my %DEF_CFG = (	1900	my %DEF_CFG = (
1972	sdl_mode => 0,	1901	sdl_mode => 0,
1973	width => 640,	1902	width => 640,
1974	height => 480,	1903	height => 480,
…		…
1990	bgm_volume => 0.25,	1919	bgm_volume => 0.25,
1991	face_prefetch => 0,	1920	face_prefetch => 0,
1992	output_sync => 1,	1921	output_sync => 1,
1993	output_count => 1,	1922	output_count => 1,
1994	pickup => 0,	1923	pickup => 0,
		1924	inv_sort => "mtime",
1995	default => "profile", # default profile	1925	default => "profile", # default profile
1996	);	1926	);
1997		1927
1998	while (my ($k, $v) = each %DEF_CFG) {	1928	while (my ($k, $v) = each %DEF_CFG) {
1999	$CFG->{$k} = $v unless exists $CFG->{$k};	1929	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
2003		1933
2004	sdl_init;	1934	sdl_init;
2005		1935
2006	@SDL_MODES = reverse	1936	@SDL_MODES = reverse
2007	grep $_->[0] >= 640 && $_->[1] >= 480,	1937	grep $_->[0] >= 640 && $_->[1] >= 480,
2008	CFClient::SDL_ListModes;	1938	CFPlus::SDL_ListModes;
2009		1939
2010	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1940	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2011		1941
2012	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1942	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2013		1943
2014	{	1944	{
2015	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1945	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2016	DejaVuSans.ttf	1946	DejaVuSans.ttf
2017	DejaVuSansMono.ttf	1947	DejaVuSansMono.ttf
2018	DejaVuSans-Bold.ttf	1948	DejaVuSans-Bold.ttf
2019	DejaVuSansMono-Bold.ttf	1949	DejaVuSansMono-Bold.ttf
2020	DejaVuSans-Oblique.ttf	1950	DejaVuSans-Oblique.ttf
2021	DejaVuSansMono-Oblique.ttf	1951	DejaVuSansMono-Oblique.ttf
2022	DejaVuSans-BoldOblique.ttf	1952	DejaVuSans-BoldOblique.ttf
2023	DejaVuSansMono-BoldOblique.ttf	1953	DejaVuSansMono-BoldOblique.ttf
2024	);	1954	);
2025		1955
2026	CFClient::add_font $_ for @fonts;	1956	CFPlus::add_font $_ for @fonts;
2027		1957
2028	CFClient::pango_init;	1958	CFPlus::pango_init;
2029		1959
2030	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	1960	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2031	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	1961	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2032		1962
2033	$FONT_PROP->make_default;	1963	$FONT_PROP->make_default;
2034	}	1964	}
2035		1965
2036	# compare mono (ft) vs. rgba (cairo)	1966	# compare mono (ft) vs. rgba (cairo)
2037	# ft - 1.8s, cairo 3s, even in alpha-only mode	1967	# ft - 1.8s, cairo 3s, even in alpha-only mode
2038	# for my $rgba (0..1) {	1968	# for my $rgba (0..1) {
2039	# my $t1 = Time::HiRes::time;	1969	# my $t1 = Time::HiRes::time;
2040	# for (1..1000) {	1970	# for (1..1000) {
2041	# my $layout = CFClient::Layout->new ($rgba);	1971	# my $layout = CFPlus::Layout->new ($rgba);
2042	# $layout->set_text ("hallo" x 100);	1972	# $layout->set_text ("hallo" x 100);
2043	# $layout->render;	1973	# $layout->render;
2044	# }	1974	# }
2045	# my $t2 = Time::HiRes::time;	1975	# my $t2 = Time::HiRes::time;
2046	# warn $t2-$t1;	1976	# warn $t2-$t1;
…		…
2049	video_init;	1979	video_init;
2050	audio_init;	1980	audio_init;
2051	}	1981	}
2052		1982
2053	Event::loop;	1983	Event::loop;
2054	#CFClient::SDL_Quit;	1984	#CFPlus::SDL_Quit;
2055	#CFClient::_exit 0;	1985	#CFPlus::_exit 0;
2056		1986
2057	END { CFClient::SDL_Quit }	1987	END { CFPlus::SDL_Quit }
2058		1988
2059	=head1 NAME	1989	=head1 NAME
2060		1990
2061	cfplus - A Crossfire+ and Crossfire game client	1991	cfplus - A Crossfire+ and Crossfire game client
2062		1992

Diff Legend

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