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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC

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

Diff Legend

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