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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.118 by root, Tue Aug 22 06:37:30 2006 UTC

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

Diff Legend

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