ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.98 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.104 by root, Sun Jul 30 13:14:15 2006 UTC

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

Diff Legend

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