ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.117 by elmex, Tue Aug 15 06:30:05 2006 UTC

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

Diff Legend

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