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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.152 by root, Tue Apr 24 01:13:15 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4
		5	# do splash-screen thingy on win32
		6	BEGIN {
		7	if (%PAR::LibCache && $^O eq "MSWin32") {
		8	while (my ($filename, $zip) = each %PAR::LibCache) {
		9	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		10	}
		11
		12	require Win32::GUI::SplashScreen;
		13
		14	Win32::GUI::SplashScreen::Show (
		15	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		16	);
		17
		18	$startup_done = sub {
		19	Win32::GUI::SplashScreen::Done (1);
		20	};
		21	}
		22	}
2		23
3	use strict;	24	use strict;
4	use utf8;	25	use utf8;
		26
		27	use Carp 'verbose';
5		28
6	# do things only needed for single-binary version (par)	29	# do things only needed for single-binary version (par)
7	BEGIN {	30	BEGIN {
8	if (%PAR::LibCache) {	31	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	32	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		33
11	while (my ($filename, $zip) = each %PAR::LibCache) {	34	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	35	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	36	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	38	unless -e "$ENV{PAR_TEMP}/$1";
16	}	39	}
17	}	40	}
18		41
…		…
32	use Crossfire;	55	use Crossfire;
33	use Crossfire::Protocol::Constants;	56	use Crossfire::Protocol::Constants;
34		57
35	use Compress::LZF;	58	use Compress::LZF;
36		59
37	use CFClient;	60	use CFPlus;
38	use CFClient::OpenGL ();	61	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	62	use CFPlus::Protocol;
		63	use CFPlus::DB;
40	use CFClient::UI;	64	use CFPlus::UI;
		65	use CFPlus::UI::Inventory;
		66	use CFPlus::UI::SpellList;
41	use CFClient::Pod;	67	use CFPlus::Pod;
42	use CFClient::BindingEditor;
43	use CFClient::MapWidget;	68	use CFPlus::MapWidget;
		69	use CFPlus::Macro;
44		70
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	71	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	72	$SIG{PIPE} = 'IGNORE';
47		73
		74	$Event::Eval = 1;
48	$Event::DIED = sub {	75	$Event::DIED = sub {
49	# TODO: display dialog box or so	76	CFPlus::fatal Carp::longmess $_[1]
50	Carp::confess $_[1];#d#TODO: remove when stable
51	CFClient::error $_[1];
52	};	77	};
53
54	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
55
56	our $VERSION = '0.1';
57		78
58	my $MAX_FPS = 60;	79	my $MAX_FPS = 60;
59	my $MIN_FPS = 5; # unused as of yet	80	my $MIN_FPS = 5; # unused as of yet
60		81
61	our $META_SERVER = "crossfire.real-time.com:13326";	82	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
62		83
63	our $LAST_REFRESH;	84	our $LAST_REFRESH;
64	our $NOW;	85	our $NOW;
65		86
66	our $CFG;	87	our $CFG;
67	our $CONN;	88	our $CONN;
		89	our $PROFILE; # current profile
68	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	90	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
69		91
70	our $WANT_REFRESH;	92	our $WANT_REFRESH;
71	our $CAN_REFRESH;	93	our $CAN_REFRESH;
72		94
…		…
103		125
104	our $INVENTORY_PAGE;	126	our $INVENTORY_PAGE;
105	our $STATS_PAGE;	127	our $STATS_PAGE;
106	our $SKILL_PAGE;	128	our $SKILL_PAGE;
107	our $SPELL_PAGE;	129	our $SPELL_PAGE;
		130	our $SPELL_LIST;
108		131
109	our $HELP_WINDOW;	132	our $HELP_WINDOW;
110	our $MESSAGE_WINDOW;	133	our $MESSAGE_WINDOW;
111	our $FLOORBOX;	134	our $FLOORBOX;
112	our $GAUGES;	135	our $GAUGES;
…		…
125		148
126	our $INV;	149	our $INV;
127	our $INVR;	150	our $INVR;
128	our $INV_RIGHT_HB;	151	our $INV_RIGHT_HB;
129		152
130	our $BIND_EDITOR;
131	our $BIND_UPD_CB;
132
133	our $PICKUP_CFG;	153	our $PICKUP_CFG;
134		154
		155	our $IN_BUILD_MODE;
		156	our $BUILD_BUTTON;
		157
135	sub status {	158	sub status {
136	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137	}	160	}
138		161
139	sub debug {	162	sub debug {
140	$DEBUG_STATUS->set_text ($_[0]);	163	$DEBUG_STATUS->set_text ($_[0]);
		164	}
		165
		166	sub message {
		167	my ($para) = @_;
		168
		169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		170
		171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		172
		173	$LOGVIEW->add_paragraph ($para);
		174	$LOGVIEW->scroll_to_bottom;
141	}	175	}
142		176
143	sub destroy_query_dialog {	177	sub destroy_query_dialog {
144	(delete $_[0]{query_dialog})->destroy	178	(delete $_[0]{query_dialog})->destroy
145	if $_[0]{query_dialog};	179	if $_[0]{query_dialog};
146	}	180	}
147		181
		182	# FIXME: a very ugly hack to wait for stat update look below! #d#
		183	our $QUERY_TIMER; #d#
		184
148	# server query dialog	185	# server query dialog
149	sub server_query {	186	sub server_query {
150	my ($conn, $flags, $prompt) = @_;	187	my ($conn, $flags, $prompt) = @_;
151		188
		189	# FIXME: a very ugly hack to wait for stat update #d#
		190	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		191	unless ($QUERY_TIMER) {
		192	$QUERY_TIMER =
		193	Event->timer (
		194	after => 1,
		195	cb => sub {
		196	server_query ($conn, $flags, $prompt, 1);
		197	$QUERY_TIMER = undef
		198	}
		199	);
		200	return;
		201	}
		202	}
		203
152	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	204	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
153	x => "center",	205	x => "center",
154	y => "center",	206	y => "center",
155	title => "Server Query",	207	title => "Server Query",
156	child => my $vbox = new CFClient::UI::VBox,	208	child => my $vbox = new CFPlus::UI::VBox,
157	;	209	;
158		210
159	my @dialog = my $label = new CFClient::UI::Label	211	my @dialog = my $label = new CFPlus::UI::Label
160	max_w => $::WIDTH * 0.4,	212	max_w => $::WIDTH * 0.8,
161	ellipsise => 0,	213	ellipsise => 0,
162	text => $prompt;	214	text => $prompt;
163		215
164	if ($flags & CS_QUERY_YESNO) {	216	if ($flags & CS_QUERY_YESNO) {
165	push @dialog, my $hbox = new CFClient::UI::HBox;	217	push @dialog, my $hbox = new CFPlus::UI::HBox;
166		218
167	$hbox->add (new CFClient::UI::Button	219	$hbox->add (new CFPlus::UI::Button
168	text => "No",	220	text => "No",
169	on_activate => sub {	221	on_activate => sub {
170	$conn->send ("reply n");	222	$conn->send ("reply n");
171	$dialog->destroy;	223	$dialog->destroy;
172	0	224	0
173	}	225	}
174	);	226	);
175	$hbox->add (new CFClient::UI::Button	227	$hbox->add (new CFPlus::UI::Button
176	text => "Yes",	228	text => "Yes",
177	on_activate => sub {	229	on_activate => sub {
178	$conn->send ("reply y");	230	$conn->send ("reply y");
179	destroy_query_dialog $conn;	231	destroy_query_dialog $conn;
180	0	232	0
…		…
182	);	234	);
183		235
184	$dialog->grab_focus;	236	$dialog->grab_focus;
185		237
186	} elsif ($flags & CS_QUERY_SINGLECHAR) {	238	} elsif ($flags & CS_QUERY_SINGLECHAR) {
187	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
188
189	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	239	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190	$MESSAGE_WINDOW->show;	240	$dialog->{tooltip} = "#charcreation_focus";
191		241
192	unshift @dialog, new CFClient::UI::Label	242	unshift @dialog, new CFPlus::UI::Label
193	max_w => $::WIDTH * 0.4,	243	max_w => $::WIDTH * 0.8,
194	ellipsise => 0,	244	ellipsise => 0,
195	markup => "\nOr use your keyboard and the text entry below:\n";	245	markup => "\nOr use your keyboard and the text entry below:\n";
196		246
197	unshift @dialog, my $table = new CFClient::UI::Table;	247	unshift @dialog, my $table = new CFPlus::UI::Table;
198		248
199	$table->add (0, 0, new CFClient::UI::Button	249	$table->add (0, 0, new CFPlus::UI::Button
200	text => "Next Race",	250	text => "Next Race",
201	on_activate => sub {	251	on_activate => sub {
202	$conn->send ("reply n");	252	$conn->send ("reply n");
203	destroy_query_dialog $conn;	253	destroy_query_dialog $conn;
204	0	254	0
205	},	255	},
206	);	256	);
207	$table->add (2, 0, new CFClient::UI::Button	257	$table->add (2, 0, new CFPlus::UI::Button
208	text => "Accept",	258	text => "Accept",
209	on_activate => sub {	259	on_activate => sub {
210	$conn->send ("reply d");	260	$conn->send ("reply d");
211	destroy_query_dialog $conn;	261	destroy_query_dialog $conn;
212	0	262	0
213	},	263	},
214	);	264	);
215		265
		266	if ($conn->{chargen_race_description}) {
		267	unshift @dialog, new CFPlus::UI::Label
		268	max_w => $::WIDTH * 0.8,
		269	ellipsise => 0,
		270	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		271	;
		272	}
		273
		274	if ($conn->{chargen_race_title}) {
		275	unshift @dialog, new CFPlus::UI::Face
		276	face => $conn->{player}{face},
		277	bg => [.2, .2, .2, 1],
		278	min_w => 64,
		279	min_h => 64,
		280	;
		281	}
		282
		283	if ($conn->{chargen_race_title}) {
		284	unshift @dialog, new CFPlus::UI::Label
		285	allign => 1,
		286	ellipsise => 0,
		287	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		288	;
		289	}
		290
216	unshift @dialog, new CFClient::UI::Label	291	unshift @dialog, new CFPlus::UI::Label
217	max_w => $::WIDTH * 0.4,	292	max_w => $::WIDTH * 0.4,
218	ellipsise => 0,	293	ellipsise => 0,
219	markup =>	294	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	;	295	;
228		296
229	} elsif ($prompt =~ /roll new stats/) {	297	} elsif ($prompt =~ /roll new stats/) {
230	if (my $stat = delete $conn->{stat_change_with}) {	298	if (my $stat = delete $conn->{stat_change_with}) {
231	$conn->send ("reply $stat");	299	$conn->send ("reply $stat");
…		…
234	}	302	}
235		303
236	$STATS_PAGE->show;	304	$STATS_PAGE->show;
237	$MESSAGE_WINDOW->hide;	305	$MESSAGE_WINDOW->hide;
238		306
239	unshift @dialog, new CFClient::UI::Label	307	unshift @dialog, new CFPlus::UI::Label
240	max_w => $::WIDTH * 0.4,	308	max_w => $::WIDTH * 0.4,
241	ellipsise => 0,	309	ellipsise => 0,
242	markup => "\nOr use your keyboard and the text entry below:\n";	310	markup => "\nOr use your keyboard and the text entry below:\n";
243		311
244	unshift @dialog, my $table = new CFClient::UI::Table;	312	unshift @dialog, my $table = new CFPlus::UI::Table;
245		313
246	# left: re-roll	314	# left: re-roll
247	$table->add (0, 0, new CFClient::UI::Button	315	$table->add (0, 0, new CFPlus::UI::Button
248	text => "Roll Again",	316	text => "Roll Again",
249	on_activate => sub {	317	on_activate => sub {
250	$conn->send ("reply y");	318	$conn->send ("reply y");
251	destroy_query_dialog $conn;	319	destroy_query_dialog $conn;
252	0	320	0
253	},	321	},
254	);	322	);
255		323
256	# center: swap stats	324	# center: swap stats
257	my ($sw1, $sw2) = map +(new CFClient::UI::Selector	325	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258	expand => 1,	326	expand => 1,
259	value => $_,	327	value => $_,
260	options => [	328	options => [
261	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	329	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	330	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
266	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	334	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	335	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268	],	336	],
269	), 1 .. 2;	337	), 1 .. 2;
270		338
271	$table->add (2, 0, new CFClient::UI::Button	339	$table->add (2, 0, new CFPlus::UI::Button
272	text => "Swap Stats",	340	text => "Swap Stats",
273	on_activate => sub {	341	on_activate => sub {
274	$conn->{stat_change_with} = $sw2->{value};	342	$conn->{stat_change_with} = $sw2->{value};
275	$conn->send ("reply $sw1->{value}");	343	$conn->send ("reply $sw1->{value}");
276	destroy_query_dialog $conn;	344	destroy_query_dialog $conn;
277	0	345	0
278	},	346	},
279	);	347	);
280	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	348	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281		349
282	# right: accept	350	# right: accept
283	$table->add (4, 0, new CFClient::UI::Button	351	$table->add (4, 0, new CFPlus::UI::Button
284	text => "Accept",	352	text => "Accept",
285	on_activate => sub {	353	on_activate => sub {
286	$conn->send ("reply n");	354	$conn->send ("reply n");
287	$STATS_PAGE->hide;	355	$STATS_PAGE->hide;
288	destroy_query_dialog $conn;	356	destroy_query_dialog $conn;
289	0	357	0
290	},	358	},
291	);	359	);
292		360
293	unshift @dialog, my $hbox = new CFClient::UI::HBox;	361	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294	for (	362	for (
295	[Str => CS_STAT_STR],	363	[Str => CS_STAT_STR],
296	[Dex => CS_STAT_DEX],	364	[Dex => CS_STAT_DEX],
297	[Con => CS_STAT_CON],	365	[Con => CS_STAT_CON],
298	[Int => CS_STAT_INT],	366	[Int => CS_STAT_INT],
299	[Wis => CS_STAT_WIS],	367	[Wis => CS_STAT_WIS],
300	[Pow => CS_STAT_POW],	368	[Pow => CS_STAT_POW],
301	[Cha => CS_STAT_CHA],	369	[Cha => CS_STAT_CHA],
302	) {	370	) {
303	my ($name, $id) = @$_;	371	my ($name, $id) = @$_;
304	$hbox->add (new CFClient::UI::Label	372	$hbox->add (new CFPlus::UI::Label
305	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	373	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306	align => 0,	374	align => 0,
307	expand => 1,	375	expand => 1,
308	can_events => 1,	376	can_events => 1,
309	can_hover => 1,	377	can_hover => 1,
310	tooltip => $CFClient::STAT_TOOLTIP{$name},	378	tooltip => "#stat_$name",
311	);	379	);
312	}	380	}
313		381
314	unshift @dialog, new CFClient::UI::Label	382	unshift @dialog, new CFPlus::UI::Label
315	max_w => $::WIDTH * 0.4,	383	max_w => $::WIDTH * 0.4,
316	ellipsise => 0,	384	ellipsise => 0,
317	markup =>	385	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	;	386	;
324	}	387	}
325		388
326	push @dialog, my $entry = new CFClient::UI::Entry	389	push @dialog, my $entry = new CFPlus::UI::Entry
327	on_changed => sub {	390	on_changed => sub {
328	$conn->send ("reply $_[1]");	391	$conn->send ("reply $_[1]");
329	destroy_query_dialog $conn;	392	destroy_query_dialog $conn;
330	0	393	0
331	},	394	},
…		…
334	$entry->grab_focus;	397	$entry->grab_focus;
335		398
336	} else {	399	} else {
337	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	400	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338		401
339	push @dialog, my $entry = new CFClient::UI::Entry	402	push @dialog, my $entry = new CFPlus::UI::Entry
340	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	403	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341	on_activate => sub {	404	on_activate => sub {
342	$conn->send ("reply $_[1]");	405	$conn->send ("reply $_[1]");
343	destroy_query_dialog $conn;	406	destroy_query_dialog $conn;
344	0	407	0
…		…
358	$LOGIN_BUTTON->set_text ("Logout");	421	$LOGIN_BUTTON->set_text ("Logout");
359	$SETUP_DIALOG->hide;	422	$SETUP_DIALOG->hide;
360		423
361	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	424	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362		425
363	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	426	my ($host, $port) = split /:/, $PROFILE->{host};
364		427
365	$MAP = new CFClient::Map $mapsize, $mapsize;	428	$MAP = new CFPlus::Map;
366		429
367	$CONN = eval {	430	$CONN = eval {
368	new CFClient::Protocol	431	new CFPlus::Protocol
369	host => $host,	432	host => $host,
370	port => $port || 13327,	433	port => $port || 13327,
371	user => $CFG->{profile}{default}{user},	434	user => $PROFILE->{user},
372	pass => $CFG->{profile}{default}{password},	435	pass => $PROFILE->{password},
373	mapw => $mapsize,	436	mapw => $mapsize,
374	maph => $mapsize,	437	maph => $mapsize,
		438
		439	client => "cfplus $CFPlus::VERSION $] $^O",
375		440
376	map_widget => $MAPWIDGET,	441	map_widget => $MAPWIDGET,
377	logview => $LOGVIEW,	442	logview => $LOGVIEW,
378	statusbox => $STATUSBOX,	443	statusbox => $STATUSBOX,
379	map => $MAP,	444	map => $MAP,
380	mapmap => $MAPMAP,	445	mapmap => $MAPMAP,
381	query => \&server_query,	446	query => \&server_query,
382		447
		448	setup_req => {
		449	smoothing => $CFG->{map_smoothing}*1,
		450	},
		451
383	sound_play => sub {	452	sound_play => sub {
384	my ($x, $y, $soundnum, $type) = @_;	453	my ($x, $y, $soundnum, $type) = @_;
385		454
386	$SDL_MIXER	455	$SDL_MIXER
387	or return;	456	or return;
…		…
392	$chunk->play;	461	$chunk->play;
393	},	462	},
394	};	463	};
395		464
396	if ($CONN) {	465	if ($CONN) {
397	CFClient::lowdelay fileno $CONN->{fh};	466	CFPlus::lowdelay fileno $CONN->{fh};
398		467
399	status "login successful";	468	status "login successful";
400	} else {	469	} else {
401	status "unable to connect";	470	status "unable to connect";
402	stop_game();	471	stop_game();
…		…
406	sub stop_game {	475	sub stop_game {
407	$LOGIN_BUTTON->set_text ("Login");	476	$LOGIN_BUTTON->set_text ("Login");
408	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	477	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
409	$SETUP_DIALOG->show;	478	$SETUP_DIALOG->show;
410	$PL_WINDOW->hide;	479	$PL_WINDOW->hide;
411	$SPELL_PAGE->clear_spells;	480	$SPELL_LIST->clear_spells;
412		481
413	return unless $CONN;	482	return unless $CONN;
414		483
415	status "connection closed";	484	status "connection closed";
416		485
…		…
420		489
421	undef $MAP;	490	undef $MAP;
422	}	491	}
423		492
424	sub graphics_setup {	493	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	494	my $vbox = new CFPlus::UI::VBox;
426		495
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	496	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		497
		498	my $row = 0;
		499
		500	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		501	$table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		502	can_events => 1,
		503	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		504
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	505	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	506	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
431		507
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]);	508	$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");	509	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434		510
435	$mode_slider->connect (changed => sub {	511	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	512	my ($self, $value) = @_;
437		513
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	514	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
439	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	515	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
440	});	516	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	517	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		518
443	my $row = 1;
444
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	519	$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	520	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	521	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	522	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	523	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	524	);
451		525
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	526	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453	$table->add (1, $row++, new CFClient::UI::CheckBox	527	$table->add (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	528	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	529	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	530	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	531	);
458		532
		533	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		534	$table->add (1, $row++, new CFPlus::UI::Slider
		535	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		536	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		537	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		538	);
		539
		540	$table->add (1, $row++, new CFPlus::UI::Button
		541	expand => 1, align => 0, text => "Apply",
		542	tooltip => "Apply the video settings above.",
		543	on_activate => sub {
		544	video_shutdown ();
		545	video_init ();
		546	0
		547	}
		548	);
		549
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	550	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460	$table->add (1, $row++, new CFClient::UI::Slider	551	$table->add (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	552	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	553	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	554	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	555	);
465		556
		557	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
		558	$table->add (1, $row++, new CFPlus::UI::CheckBox
		559	state => $CFG->{map_smoothing},
		560	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		561	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		562	. "Changes take effect at next connection only.",
		563	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		564	);
		565
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	566	$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	567	$table->add (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	568	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	569	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 }	570	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	571	);
472		572
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	573	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474	$table->add (1, $row++, new CFClient::UI::Slider	574	$table->add (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	575	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.",	576	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 }	577	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	578	);
479		579
480	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	580	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481	$table->add (1, $row++, new CFClient::UI::CheckBox	581	$table->add (1, $row++, new CFPlus::UI::CheckBox
482	state => $CFG->{fow_smooth},	582	state => $CFG->{fow_smooth},
483	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	583	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484	on_changed => sub {	584	on_changed => sub {
485	my ($self, $value) = @_;	585	my ($self, $value) = @_;
486	$CFG->{fow_smooth} = $value;	586	$CFG->{fow_smooth} = $value;
487	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	587	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488	0	588	0
489	}	589	}
490	);	590	);
491		591
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493	$table->add (1, $row++, new CFClient::UI::Slider
494	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.",
496	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497	);
498
499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	592	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500	$table->add (1, $row++, new CFClient::UI::Slider	593	$table->add (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	594	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.",	595	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 },	596	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	597	);
505		598
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	599	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507	$table->add (1, $row++, new CFClient::UI::Slider	600	$table->add (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	601	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.",	602	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	603	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	604	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	605	&set_gauge_window_fontsize;
513	0	606	0
514	}	607	}
515	);	608	);
516		609
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	610	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518	$table->add (1, $row++, new CFClient::UI::Slider	611	$table->add (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	612	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	613	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	614	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	615	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	616	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	617	0
525	}	618	}
526	);	619	);
527		620
528	$table->add (1, $row++, new CFClient::UI::Button
529	expand => 1, align => 0, text => "Apply",
530	tooltip => "Apply the video settings",
531	on_activate => sub {
532	video_shutdown ();
533	video_init ();
534	0
535	}
536	);
537
538	$vbox	621	$vbox
539	}	622	}
540		623
541	sub audio_setup {	624	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	625	my $vbox = new CFPlus::UI::VBox;
543		626
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	627	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		628
546	my $row = 0;	629	my $row = 0;
547		630
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	631	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549	$table->add (1, $row++, new CFClient::UI::CheckBox	632	$table->add (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	633	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.",	634	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 }	635	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	636	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	637	# $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 {	638	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	639	# $CFG->{effects_volume} = $_[1];
557	# });	640	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	641	$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);	642	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	643	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	644	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	645	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 }	646	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	647	);
565	$hbox->add (new CFClient::UI::Slider	648	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	649	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	650	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	651	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	652	);
570		653
571	$table->add (1, $row++, new CFClient::UI::Button	654	$table->add (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	655	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	656	tooltip => "Apply the audio settings",
574	on_activate => sub {	657	on_activate => sub {
575	audio_shutdown ();	658	audio_shutdown ();
576	audio_init ();	659	audio_init ();
…		…
588	}	671	}
589		672
590	sub make_gauge_window {	673	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	674	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		675
593	my $win = new CFClient::UI::Frame (	676	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	677	force_x => 0,
595	force_y => "max",	678	force_y => "max",
596	force_w => $WIDTH,	679	force_w => $WIDTH,
597	force_h => $gh,	680	force_h => $gh,
598	);	681	);
599		682
600	$win->add (my $hbox = new CFClient::UI::HBox	683	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	684	children => [
602	(new CFClient::UI::HBox expand => 1),	685	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	686	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	687	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	688	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	689	]),
607	(my $vbox = new CFClient::UI::VBox),	690	(my $vbox = new CFPlus::UI::VBox),
608	],	691	],
609	);	692	);
610		693
611	$vbox->add (new CFClient::UI::HBox	694	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	695	expand => 1,
613	children => [	696	children => [
614	(new CFClient::UI::Empty expand => 1),	697	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	698	(my $hb = new CFPlus::UI::HBox),
616	],	699	],
617	);	700	);
618		701
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	702	$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',	703	$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',	704	$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',	705	$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		706
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	707	$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,	708	$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		709
633	$GAUGES = {	710	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	711	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	712	food => $fg, mana => $mg, hp => $hg, grace => $gg
636	};	713	};
…		…
639		716
640	$win	717	$win
641	}	718	}
642		719
643	sub debug_setup {	720	sub debug_setup {
644	my $table = new CFClient::UI::Table;	721	my $table = new CFPlus::UI::Table;
645		722
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	723	$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 });	724	$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");	725	$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 });	726	$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");	727	$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 });	728	$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");	729	$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 });	730	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		731	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
654		732
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	733	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656		734
657	for my $x (0..2) {	735	for my $x (0..2) {
658	for my $y (0 .. 2) {	736	for my $y (0 .. 2) {
659	$table->add ($x + 3, $y,	737	$table->add ($x + 3, $y,
660	new CFClient::UI::Entry	738	new CFPlus::UI::Entry
661	text => $default_smooth[$x * 3 + $y],	739	text => $default_smooth[$x * 3 + $y],
662	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	740	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663	);	741	);
664	}	742	}
665	}	743	}
666		744
		745	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
667		746
668	$table	747	$table
669	}	748	}
670		749
671	sub stats_window {	750	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	751	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	752	expand => 1,
674	scroll_y => 1	753	scroll_y => 1
675	);	754	);
676	$r->add (my $vb = new CFClient::UI::VBox);	755	$r->add (my $vb = new CFPlus::UI::VBox);
677		756
		757	$vb->add (new CFPlus::UI::FancyFrame
		758	label => "Player",
		759	child => (my $pi = new CFPlus::UI::VBox),
		760	);
		761
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	762	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	763	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.");	764	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,	765	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	766	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	767	tooltip => "The map you are currently on (if supported by the server).");
684		768
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	769	$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,	770	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	771	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	772	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,	773	$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,	774	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	775	tooltip => "The weight limit: you cannot carry more than this.");
692		776
		777	$vb->add (new CFPlus::UI::FancyFrame
		778	label => "Primary/Secondary Statistics",
693	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	779	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		780	);
694	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	781	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695		782
696	my $color2 = [1, 1, 0];	783	my $color2 = [1, 1, 0];
697		784
698	for (	785	for (
699	[0, 0, st_str => "Str", 30],	786	[0, 0, st_str => "Str", 30],
…		…
711	[2, 4, st_spd => "Spd", 10.54],	798	[2, 4, st_spd => "Spd", 10.54],
712	[2, 5, st_wspd => "WSp", 10.54],	799	[2, 5, st_wspd => "WSp", 10.54],
713	) {	800	) {
714	my ($col, $row, $id, $label, $template) = @$_;	801	my ($col, $row, $id, $label, $template) = @$_;
715		802
716	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	803	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	804	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	805	align => +1, template => $template, tooltip => "#stat_$label");
719	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	806	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
720	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	807	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	808	align => -1, text => $label, tooltip => "#stat_$label");
722	}	809	}
723		810
		811	$vb->add (new CFPlus::UI::FancyFrame
		812	label => "Resistancies",
724	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	813	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		814	);
725		815
726	my $row = 0;	816	my $row = 0;
727	my $col = 0;	817	my $col = 0;
728		818
729	my %resist_names = (	819	my %resist_names = (
…		…
768	drain acid pois para deat phys	858	drain acid pois para deat phys
769	blind fear tund elec cold ghit/)	859	blind fear tund elec cold ghit/)
770	{	860	{
771	$tbl2->add ($col, $row,	861	$tbl2->add ($col, $row,
772	$STATWIDS->{"res_$_"} =	862	$STATWIDS->{"res_$_"} =
773	new CFClient::UI::Label	863	new CFPlus::UI::Label
774	font => $FONT_FIXED,	864	font => $FONT_FIXED,
775	template => "-100%",	865	template => "-100%",
776	align => +1,	866	align => +1,
777	valign => 0,	867	valign => 0,
778	can_events => 1,	868	can_events => 1,
779	can_hover => 1,	869	can_hover => 1,
780	tooltip => $resist_names{$_}->[1],	870	tooltip => $resist_names{$_}->[1],
781	);	871	);
782	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	872	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
783	font => $FONT_FIXED,	873	font => $FONT_FIXED,
784	can_hover => 1,	874	can_hover => 1,
785	can_events => 1,	875	can_events => 1,
786	path => "ui/resist/resist_$_.png",	876	path => "ui/resist/resist_$_.png",
787	tooltip => $resist_names{$_}->[1],	877	tooltip => $resist_names{$_}->[1],
788	);	878	);
789	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	879	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
790	text => $resist_names{$_}->[0],	880	text => $resist_names{$_}->[0],
791	font => $FONT_FIXED,	881	font => $FONT_FIXED,
792	can_hover => 1,	882	can_hover => 1,
793	can_events => 1,	883	can_events => 1,
794	tooltip => $resist_names{$_}->[1],	884	tooltip => $resist_names{$_}->[1],
…		…
805		895
806	$r	896	$r
807	}	897	}
808		898
809	sub skill_window {	899	sub skill_window {
810	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	900	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
811	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	901	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
812	$sw	902	$sw
813	}	903	}
814		904
815	sub formsep($) {	905	sub formsep($) {
816	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	906	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
827	return if $METASERVER_ATIME > time;	917	return if $METASERVER_ATIME > time;
828	$METASERVER_ATIME = time + 60;	918	$METASERVER_ATIME = time + 60;
829		919
830	my $table = $METASERVER->{table};	920	my $table = $METASERVER->{table};
831	$table->clear;	921	$table->clear;
832	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	922	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
833		923
834	my $buf;	924	my $ok = 0;
835		925
836	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	926	CFPlus::background {
		927	my $ua = CFPlus::lwp_useragent;
837		928
838	unless ($fh) {	929	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
839	$label->set_text ("unable to contact metaserver: $!");	930	} sub {
840	return;	931	my ($msg) = @_;
841	}	932	if ($msg) {
842
843	Event->io (fd => $fh, poll => 'r', cb => sub {
844	my $res = sysread $fh, $buf, 8192, length $buf;
845
846	if (!defined $res) {
847	$_[0]->w->cancel;
848	$label->set_text ("error while retrieving server list: $!");
849	} elsif ($res == 0) {
850	$_[0]->w->cancel;
851	status "server list retrieved";
852
853	utf8::decode $buf if utf8::valid $buf;
854
855	$table->clear;	933	$table->clear;
856		934
857	my @tip = (	935	my @tip = (
858	"The current number of users logged in on the server.",	936	"The current number of users logged in on the server.",
859	"The hostname of the server.",	937	"The hostname of the server.",
860	"The time this server has been running without being restarted.",	938	"The time this server has been running without being restarted.",
861	"The server software version - a '+' indicates a Crossfire+ server.",	939	"The server software version - a '+' indicates a Crossfire+ server.",
862	"Short information about this server provided by its admins.",	940	"Short information about this server provided by its admins.",
863	);	941	);
864	my @col = qw(#Users Host Uptime Version Description);	942	my @col = qw(#Users Host Uptime Version Description);
865	$table->add ($_, 0, new CFClient::UI::Label	943	$table->add ($_, 0, new CFPlus::UI::Label
866	can_hover => 1, can_events => 1,	944	can_hover => 1, can_events => 1,
867	align => 0, fg => [1, 1, 0],	945	align => 0, fg => [1, 1, 0],
868	text => $col[$_], tooltip => $tip[$_])	946	text => $col[$_], tooltip => $tip[$_])
869	for 0 .. $#col;	947	for 0 .. $#col;
870		948
871	my @align = qw(1 0 1 1 -1);	949	my @align = qw(1 0 1 1 -1);
872		950
873	my $y = 0;	951	my $y = 0;
874	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	952	for my $m (@{ $msg->{servers} }) {
875	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	953	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		954	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
876		955
877	for ($desc) {	956	for ($desc) {
878	s/<br>/\n/gi;	957	s/<br>/\n/gi;
879	s/<li>/\n· /gi;	958	s/<li>/\n· /gi;
880	s/<.*?>//sgi;	959	s/<.*?>//sgi;
881	s/&/&amp;/g;	960	s/&amp;/&/g;
882	s/</&lt;/g;	961	s/&lt;/</g;
883	s/>/&gt;/g;	962	s/&gt;/>/g;
884	}	963	}
885		964
886	$uptime = sprintf "%dd %02d:%02d:%02d",	965	$uptime = sprintf "%dd %02d:%02d:%02d",
887	(int $m->[8] / 86400),	966	(int $uptime / 86400),
888	(int $m->[8] / 3600) % 24,	967	(int $uptime / 3600) % 24,
889	(int $m->[8] / 60) % 60,	968	(int $uptime / 60) % 60,
890	$m->[8] % 60;	969	$uptime % 60;
891		970
892	$m = [$users, $host, $uptime, $version, $desc];	971	$m = [$users, $host, $uptime, $version, $desc];
893		972
894	$y++;	973	$y++;
895		974
896	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	975	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
897	(new CFClient::UI::Button	976	(new CFPlus::UI::Button
898	text => "Use",	977	text => "Use",
899	tooltip => "Put this server into the <b>Host:Port</b> field",	978	tooltip => "Put this server into the <b>Host:Port</b> field",
900	on_activate => sub {	979	on_activate => sub {
901	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	980	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902	$METASERVER->hide;	981	$METASERVER->hide;
903	0	982	0
904	},	983	},
905	),	984	),
906	(new CFClient::UI::Empty expand => 1),	985	(new CFPlus::UI::Empty expand => 1),
907	]);	986	]);
908		987
909	$table->add ($_, $y, new CFClient::UI::Label	988	$table->add ($_, $y, new CFPlus::UI::Label
		989	max_w => $::WIDTH * 0.4,
910	ellipsise => 0,	990	ellipsise => 0,
911	align => $align[$_],	991	align => $align[$_],
912	text => $m->[$_],	992	text => $m->[$_],
913	tooltip => $tip[$_],	993	tooltip => $tip[$_],
		994	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
914	can_hover => 1,	995	can_hover => 1,
915	can_events => 1,	996	can_events => 1,
916	fontsize => 0.8)	997	fontsize => 0.8)
917	for 0 .. $#$m;	998	for 0 .. $#$m;
918	}	999	}
		1000	} else {
		1001	$ok or $label->set_text ("error while contacting metaserver");
919	}	1002	}
920	});	1003	};
		1004
921	}	1005	}
922		1006
923	sub metaserver_dialog {	1007	sub metaserver_dialog {
924	my $vbox = new CFClient::UI::VBox;	1008	my $vbox = new CFPlus::UI::VBox;
925	my $table = new CFClient::UI::Table;	1009	my $table = new CFPlus::UI::Table;
926	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1010	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927		1011
928	my $dialog = new CFClient::UI::FancyFrame	1012	my $dialog = new CFPlus::UI::Toplevel
929	title => "Server List",	1013	title => "Server List",
930	name => 'metaserver_dialog',	1014	name => 'metaserver_dialog',
931	x => 'center',	1015	x => 'center',
932	y => 'center',	1016	y => 'center',
933	z => 3,	1017	z => 3,
		1018	force_w => $::WIDTH * 0.9,
934	force_h => $::HEIGHT * 0.4,	1019	force_h => $::HEIGHT * 0.7,
935	child => $vbox,	1020	child => $vbox,
936	has_close_button => 1,	1021	has_close_button => 1,
937	table => $table,	1022	table => $table,
938	on_visibility_change => sub {	1023	on_visibility_change => sub {
939	update_metaserver ($_[0]) if $_[1];	1024	update_metaserver ($_[0]) if $_[1];
…		…
943		1028
944	$dialog	1029	$dialog
945	}	1030	}
946		1031
947	sub server_setup {	1032	sub server_setup {
948	my $vbox = new CFClient::UI::VBox;	1033	my $vbox = new CFPlus::UI::VBox;
949		1034
		1035	$vbox->add (new CFPlus::UI::FancyFrame
		1036	label => "Connection Settings",
950	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1037	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1038	);
951	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1039	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
952		1040
953	{	1041	{
954	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1042	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
955		1043
956	$vbox->add (	1044	$vbox->add (
957	$HOST_ENTRY = new CFClient::UI::Entry	1045	$HOST_ENTRY = new CFPlus::UI::Entry
958	expand => 1,	1046	expand => 1,
959	text => $CFG->{profile}{default}{host},	1047	text => $CFG->{profile}{default}{host},
960	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1048	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
961	on_changed => sub {	1049	on_changed => sub {
962	my ($self, $value) = @_;	1050	my ($self, $value) = @_;
963	$CFG->{profile}{default}{host} = $value;	1051	$CFG->{profile}{default}{host} = $value;
964	0	1052	0
965	}	1053	}
966	);	1054	);
967		1055
968	$vbox->add (new CFClient::UI::Button	1056	$vbox->add (new CFPlus::UI::Button
969	expand => 1,	1057	expand => 1,
970	text => "Server List",	1058	text => "Server List",
971	other => $METASERVER,	1059	other => $METASERVER,
972	tooltip => "Show a list of available crossfire servers",	1060	tooltip => "Show a list of available crossfire servers",
973	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1061	on_activate => sub { $METASERVER->toggle_visibility; 0 },
974	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1062	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
975	);	1063	);
976	}	1064	}
977		1065
978	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1066	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
979	$table->add (1, 4, new CFClient::UI::Entry	1067	$table->add (1, 4, new CFPlus::UI::Entry
980	text => $CFG->{profile}{default}{user},	1068	text => $CFG->{profile}{default}{user},
981	tooltip => "The name of your character on the server",	1069	tooltip => "The name of your character on the server",
982	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1070	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
983	);	1071	);
984		1072
985	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1073	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
986	$table->add (1, 5, new CFClient::UI::Entry	1074	$table->add (1, 5, new CFPlus::UI::Entry
987	text => $CFG->{profile}{default}{password},	1075	text => $CFG->{profile}{default}{password},
988	hidden => 1,	1076	hidden => 1,
989	tooltip => "The password for your character",	1077	tooltip => "The password for your character",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1078	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
991	);	1079	);
992		1080
993	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1081	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
994	$table->add (1, 7, new CFClient::UI::Slider	1082	$table->add (1, 7, new CFPlus::UI::Slider
995	force_w => 100,	1083	force_w => 100,
996	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1084	range => [$CFG->{mapsize}, 10, 100, 0, 1],
997	tooltip => "This is the size of the portion of the map update the server sends you. "	1085	tooltip => "This is the size of the portion of the map update the server sends you. "
998	. "If you set this to a high value you will be able to see further, "	1086	. "If you set this to a high value you will be able to see further, "
999	. "but you also increase bandwidth requirements and latency. "	1087	. "but you also increase bandwidth requirements and latency. "
1000	. "This option is only used once at log-in.",	1088	. "This option is only used once at log-in.",
1001	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1089	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1002	);	1090	);
1003		1091
1004	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1092	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1005	$table->add (1, 8, new CFClient::UI::CheckBox	1093	$table->add (1, 8, new CFPlus::UI::CheckBox
1006	state => $CFG->{face_prefetch},	1094	state => $CFG->{face_prefetch},
1007	tooltip => "<b>Background Image Prefetch</b>\n\n"	1095	tooltip => "<b>Background Image Prefetch</b>\n\n"
1008	. "If enabled, the client automatically pre-fetches images from the server. "	1096	. "If enabled, the client automatically pre-fetches images from the server. "
1009	. "This might increase or create lag, but increases the chances "	1097	. "This might increase or create lag, but increases the chances "
1010	. "of faces being ready for display when you encounter them. "	1098	. "of faces being ready for display when you encounter them. "
…		…
1012	. "so only set it if you really need to prefetch images. "	1100	. "so only set it if you really need to prefetch images. "
1013	. "This option can be set and unset any time.",	1101	. "This option can be set and unset any time.",
1014	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1102	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1015	);	1103	);
1016		1104
		1105	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
		1106	$table->add (1, 9, new CFPlus::UI::Entry
		1107	text => $CFG->{output_rate},
		1108	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
		1109	. "when sending images, to ensure interactiveness. When 0 or unset, the server "
		1110	. "default will be used, which is usually around 100kb/s.",
		1111	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
		1112	);
		1113
1017	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1114	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1018	$table->add (1, 9, new CFClient::UI::Entry	1115	$table->add (1, 10, new CFPlus::UI::Entry
1019	text => $CFG->{output_count},	1116	text => $CFG->{output_count},
1020	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1117	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1021	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1118	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1022	);	1119	);
1023		1120
1024	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1121	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1025	$table->add (1, 10, new CFClient::UI::Entry	1122	$table->add (1, 11, new CFPlus::UI::Entry
1026	text => $CFG->{output_sync},	1123	text => $CFG->{output_sync},
1027	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1124	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1028	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1125	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1029	);	1126	);
1030		1127
1031	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1128	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1032	expand => 1,	1129	expand => 1,
1033	align => 0,	1130	align => 0,
1034	text => "Login",	1131	text => "Login",
1035	on_activate => sub {	1132	on_activate => sub {
1036	$CONN ? stop_game	1133	$CONN ? stop_game
1037	: start_game;	1134	: start_game;
1038	0	1135	0
1039	},	1136	},
1040	);	1137	);
1041		1138
		1139	$vbox->add (new CFPlus::UI::FancyFrame
		1140	label => "Server Info",
		1141	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1142	);
		1143
		1144	$vbox
		1145	}
		1146
		1147	sub client_setup {
		1148	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1149
		1150	my $row = 0;
		1151
1042	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1152	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1043	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1153	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1044	text => $CFG->{say_command},	1154	text => $CFG->{say_command},
1045	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	1155	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1046	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1156	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1157	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048	on_changed => sub {	1158	on_changed => sub {
1049	my ($self, $value) = @_;	1159	my ($self, $value) = @_;
1050	$CFG->{say_command} = $value;	1160	$CFG->{say_command} = $value;
1051	0	1161	0
1052	}	1162	}
1053	);	1163	);
1054		1164
1055	$vbox->add (new CFClient::UI::Label	1165	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1056	text => "Server Info",	1166	$table->add (1, $row++, new CFPlus::UI::CheckBox
1057	fontsize => 1.2,	1167	state => $CFG->{show_tips},
1058	padding_y => 8,	1168	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1059	fg => [1, 1, 0, 1],	1169	on_changed => sub {
		1170	my ($self, $value) = @_;
		1171	$CFG->{show_tips} = $value;
		1172	0
		1173	}
1060	);	1174	);
1061		1175
1062	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1176	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
		1177	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
		1178	text => $CFG->{logview_max_par},
		1179	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
		1180	. "sends more messages than this number, older messages get removed to save memory and "
		1181	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
		1182	on_changed => sub {
		1183	my ($self, $value) = @_;
		1184	$LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
		1185	0
		1186	},
		1187	);
1063		1188
1064	$vbox	1189	$table
1065	}	1190	}
1066		1191
1067	sub message_window {	1192	sub message_window {
1068	my $window = new CFClient::UI::FancyFrame	1193	my $window = new CFPlus::UI::Toplevel
1069	name => "message_window",	1194	name => "message_window",
1070	title => "Messages",	1195	title => "Messages",
1071	border_bg => [1, 1, 1, 1],	1196	border_bg => [1, 1, 1, 1],
1072	x => "max",	1197	x => "max",
1073	y => 0,	1198	y => 0,
1074	force_w => $::WIDTH * 0.4,	1199	force_w => $::WIDTH * 0.4,
1075	force_h => $::HEIGHT * 0.5,	1200	force_h => $::HEIGHT * 0.5,
1076	child => (my $vbox = new CFClient::UI::VBox),	1201	child => (my $vbox = new CFPlus::UI::VBox),
1077	has_close_button => 1;	1202	has_close_button => 1;
1078		1203
1079	$vbox->add ($LOGVIEW);	1204	$vbox->add ($LOGVIEW);
1080		1205
1081	$vbox->add (my $input = new CFClient::UI::Entry	1206	$vbox->add (my $input = new CFPlus::UI::Entry
1082	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1207	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1083	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1208	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1084	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1209	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1085	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1210	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086	on_focus_in => sub {	1211	on_focus_in => sub {
…		…
1125	};	1250	};
1126		1251
1127	$window	1252	$window
1128	}	1253	}
1129		1254
1130	sub open_quit_dialog {
1131	unless ($QUIT_DIALOG) {
1132	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1133	x => "center",
1134	y => "center",
1135	z => 50,
1136	title => "Really Quit?",
1137	on_key_down => sub {
1138	my ($dialog, $ev) = @_;
1139	$ev->{sym} == 27 and $dialog->hide;
1140	}
1141	;
1142
1143	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1144
1145	$vb->add (new CFClient::UI::Label
1146	text => "You should find a savebed and apply it first!",
1147	max_w => $WIDTH * 0.25,
1148	ellipsize => 0,
1149	);
1150	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1151	$hb->add (new CFClient::UI::Button
1152	text => "Ok",
1153	expand => 1,
1154	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1155	);
1156	$hb->add (new CFClient::UI::Button
1157	text => "Quit anyway",
1158	expand => 1,
1159	on_activate => sub { exit },
1160	);
1161	}
1162
1163	$QUIT_DIALOG->show;
1164	$QUIT_DIALOG->grab_focus;
1165	}
1166
1167	sub autopickup_setup {	1255	sub autopickup_setup {
1168	my $table = new CFClient::UI::Table;	1256	my $table = new CFPlus::UI::Table;
1169		1257
1170	for (	1258	for (
1171	["General", 0, 0,	1259	["General", 0, 0,
1172	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1260	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173	["Inhibit autopickup" => PICKUP_INHIBIT],	1261	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1187	["Boots" => PICKUP_BOOTS],	1275	["Boots" => PICKUP_BOOTS],
1188	["Gloves" => PICKUP_GLOVES],	1276	["Gloves" => PICKUP_GLOVES],
1189	["Cloaks" => PICKUP_CLOAK],	1277	["Cloaks" => PICKUP_CLOAK],
1190	],	1278	],
1191		1279
1192	["Readables", 2, 2,	1280	["Readables", 2, 0,
1193	["Spellbooks" => PICKUP_SPELLBOOK],	1281	["Spellbooks" => PICKUP_SPELLBOOK],
1194	["Skillscrolls" => PICKUP_SKILLSCROLL],	1282	["Skillscrolls" => PICKUP_SKILLSCROLL],
1195	["Normal Books/Scrolls" => PICKUP_READABLES],	1283	["Normal Books/Scrolls" => PICKUP_READABLES],
1196	],	1284	],
1197	["Misc", 2, 7,	1285	["Misc", 2, 5,
1198	["Food" => PICKUP_FOOD],	1286	["Food" => PICKUP_FOOD],
1199	["Drinks" => PICKUP_DRINK],	1287	["Drinks" => PICKUP_DRINK],
1200	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1288	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1201	["Keys" => PICKUP_KEY],	1289	["Keys" => PICKUP_KEY],
1202	["Magical Items" => PICKUP_MAGICAL],	1290	["Magical Items" => PICKUP_MAGICAL],
1203	["Potions" => PICKUP_POTION],	1291	["Potions" => PICKUP_POTION],
1204	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1292	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1205	["Ignore cursed" => PICKUP_NOT_CURSED],	1293	["Ignore cursed" => PICKUP_NOT_CURSED],
1206	["Jewelery" => PICKUP_JEWELS],	1294	["Jewelery" => PICKUP_JEWELS],
		1295	["Flesh" => PICKUP_FLESH],
1207	],	1296	],
1208	["Weight/Value ratio", 2, 17]	1297	["Weight/Value ratio", 2, 17]
1209	)	1298	)
1210	{	1299	{
1211	my ($title, $x, $y, @bits) = @$_;	1300	my ($title, $x, $y, @bits) = @$_;
1212	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1301	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1213		1302
1214	for (@bits) {	1303	for (@bits) {
1215	++$y;	1304	++$y;
1216		1305
1217	my $mask = $_->[1];	1306	my $mask = $_->[1];
1218	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1307	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1219	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1308	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220	state => $::CFG->{pickup} & $mask,	1309	state => $::CFG->{pickup} & $mask,
1221	on_changed => sub {	1310	on_changed => sub {
1222	my ($box, $value) = @_;	1311	my ($box, $value) = @_;
1223		1312
1224	if ($value) {	1313	if ($value) {
…		…
1235		1324
1236	${$_->[2]} = $checkbox if $_->[2];	1325	${$_->[2]} = $checkbox if $_->[2];
1237	}	1326	}
1238	}	1327	}
1239		1328
1240	$table->add (2, 18, new CFClient::UI::ValSlider	1329	$table->add (2, 18, new CFPlus::UI::ValSlider
1241	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1330	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242	template => ">= 99",	1331	template => ">= 99",
1243	to_value => sub { ">= " . 5 * $_[0] },	1332	to_value => sub { ">= " . 5 * $_[0] },
1244	on_changed => sub {	1333	on_changed => sub {
1245	my ($slider, $value) = @_;	1334	my ($slider, $value) = @_;
…		…
1248	$::CFG->{pickup} |= int $value	1337	$::CFG->{pickup} |= int $value
1249	if $value;	1338	if $value;
1250	1;	1339	1;
1251	});	1340	});
1252		1341
1253	$table->add (3, 18, new CFClient::UI::Button	1342	$table->add (3, 18, new CFPlus::UI::Button
1254	text => "set",	1343	text => "set",
1255	on_activate => sub {	1344	on_activate => sub {
1256	$::CONN->send_command ("pickup $::CFG->{pickup}")	1345	$::CONN->send_command ("pickup $::CFG->{pickup}")
1257	if defined $::CONN;	1346	if defined $::CONN;
1258	0	1347	0
…		…
1261	$table	1350	$table
1262	}	1351	}
1263		1352
1264	my %SORT_ORDER = (	1353	my %SORT_ORDER = (
1265	type => undef,	1354	type => undef,
1266	mtime => sub { sort {	1355	mtime => sub {
		1356	my $NOW = time;
		1357	sort {
		1358	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1359	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1360
1267	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)	1361	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268	or $b->{mtime} <=> $a->{mtime}	1362	or $btime <=> $atime
1269	or $a->{type} <=> $b->{type}	1363	or $a->{type} <=> $b->{type}
		1364	} @_
1270	} @_ },	1365	},
1271	weight => sub { sort {	1366	weight => sub { sort {
1272	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)	1367	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273	or $a->{type} <=> $b->{type}	1368	or $a->{type} <=> $b->{type}
1274	} @_ },	1369	} @_ },
1275	);	1370	);
1276		1371
1277	sub inventory_widget {	1372	sub inventory_widget {
1278	my $hb = new CFClient::UI::HBox homogeneous => 1;	1373	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279		1374
1280	$hb->add (my $vb1 = new CFClient::UI::VBox);	1375	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1281	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1376	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282		1377
1283	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1378	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284		1379
1285	use sort 'stable';	1380	use sort 'stable';
1286		1381
1287	$hb1->add (new CFClient::UI::Selector	1382	$hb1->add (new CFPlus::UI::Selector
1288	value => $::CFG->{inv_sort},	1383	value => $::CFG->{inv_sort},
1289	options => [	1384	options => [
1290	[type => "Type/Name"],	1385	[type => "Type/Name"],
1291	[mtime => "Recent/Normal/Locked"],	1386	[mtime => "Recent/Normal/Locked"],
1292	[weight => "Weight/Type"],	1387	[weight => "Weight/Type"],
…		…
1294	on_changed => sub {	1389	on_changed => sub {
1295	$::CFG->{inv_sort} = $_[1];	1390	$::CFG->{inv_sort} = $_[1];
1296	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1391	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1297	},	1392	},
1298	);	1393	);
1299	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1394	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1300	#TODO# update to weigh/maxweight	1395	#TODO# update to weigh/maxweight
1301	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1396	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302		1397
1303	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1398	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw1->add ($INV = new CFClient::UI::Inventory);	1399	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1400	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1305		1401
1306	$hb->add (my $vb2 = new CFClient::UI::VBox);	1402	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1307		1403
1308	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1404	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1309		1405
1310	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1406	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311	$sw2->add ($INVR = new CFClient::UI::Inventory);	1407	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1312		1408
1313	# XXX: Call after $INVR = ... because set_opencont sets the items	1409	# XXX: Call after $INVR = ... because set_opencont sets the items
1314	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1410	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315		1411
1316	$hb	1412	$hb
1317	}	1413	}
1318		1414
1319	sub toggle_player_page {	1415	sub toggle_player_page {
…		…
1326	$PL_WINDOW->show;	1422	$PL_WINDOW->show;
1327	}	1423	}
1328	}	1424	}
1329		1425
1330	sub player_window {	1426	sub player_window {
1331	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1427	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1332	x => "center",	1428	x => "center",
1333	y => "center",	1429	y => "center",
1334	force_w => $WIDTH * 9/10,	1430	force_w => $WIDTH * 9/10,
1335	force_h => $HEIGHT * 9/10,	1431	force_h => $HEIGHT * 9/10,
1336	title => "Player",	1432	title => "Player",
…		…
1338	has_close_button => 1	1434	has_close_button => 1
1339	;	1435	;
1340		1436
1341	my $ntb =	1437	my $ntb =
1342	$PL_NOTEBOOK =	1438	$PL_NOTEBOOK =
1343	new CFClient::UI::Notebook expand => 1, debug => 1;	1439	new CFPlus::UI::Notebook expand => 1, debug => 1;
1344		1440
1345	$ntb->add (	1441	$ntb->add (
1346	"Statistics (F2)" => $STATS_PAGE = stats_window,	1442	"Statistics (F2)" => $STATS_PAGE = stats_window,
1347	"Shows statistics, where all your Stats and Resistances are shown."	1443	"Shows statistics, where all your Stats and Resistances are shown."
1348	);	1444	);
1349	$ntb->add (	1445	$ntb->add (
1350	"Skills (F3)" => $SKILL_PAGE = skill_window,	1446	"Skills (F3)" => $SKILL_PAGE = skill_window,
1351	"Shows all your Skills."	1447	"Shows all your Skills."
1352	);	1448	);
1353		1449
1354	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1450	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1451	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1356	$ntb->add (	1452	$ntb->add (
1357	"Spellbook (F4)" => $spellsw,	1453	"Spellbook (F4)" => $spellsw,
1358	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1454	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1359	);	1455	);
1360	$ntb->add (	1456	$ntb->add (
…		…
1367		1463
1368	$plwin->add ($ntb);	1464	$plwin->add ($ntb);
1369	$plwin	1465	$plwin
1370	}	1466	}
1371		1467
1372	sub update_bindings {
1373	$BIND_UPD_CB->() if $BIND_UPD_CB;
1374	}
1375
1376	sub keyboard_setup {	1468	sub keyboard_setup {
1377	my $binding_list = new CFClient::UI::VBox;	1469	CFPlus::Macro::keyboard_setup
1378
1379	my $refresh;
1380	$refresh = $BIND_UPD_CB = sub {
1381	$binding_list->clear ();
1382
1383	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1384	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1385	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1386	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1387
1388	my $lbl = join "; ", @$cmds;
1389	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1390	$binding_list->add (my $hb = new CFClient::UI::HBox);
1391	$hb->add (new CFClient::UI::Button
1392	text => "delete",
1393	tooltip => "Deletes the binding",
1394	on_activate => sub {
1395	$binding_list->remove ($hb);
1396	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397	0
1398	});
1399
1400	$hb->add (new CFClient::UI::Button
1401	text => "edit",
1402	tooltip => "Edits the binding",
1403	on_activate => sub {
1404	$::BIND_EDITOR->set_binding (
1405	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1406	sub {
1407	my ($nmod, $nsym, $ncmds) = @_;
1408	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1409	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1410	$refresh->();
1411	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1412	$SETUP_DIALOG->show;
1413	},
1414	sub {
1415	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416	$SETUP_DIALOG->show;
1417	});
1418	$::BIND_EDITOR->show;
1419	$SETUP_DIALOG->hide;
1420	0
1421	});
1422
1423	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1424	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1425	}
1426	}
1427	};
1428
1429	my $vb = new CFClient::UI::VBox;
1430	$vb->add (my $hb = new CFClient::UI::HBox);
1431	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1432	$hb->add (new CFClient::UI::CheckBox
1433	expand => 1,
1434	state => $CFG->{shift_fire_stop},
1435	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436	on_changed => sub {
1437	my ($cbox, $value) = @_;
1438	$CFG->{shift_fire_stop} = $value;
1439	0
1440	});
1441
1442	$vb->add ($binding_list);
1443	$vb->add (my $hb = new CFClient::UI::HBox);
1444
1445	$hb->add (new CFClient::UI::Button
1446	text => "record new",
1447	expand => 1,
1448	tooltip => "This button opens the binding editor with an empty binding.",
1449	on_activate => sub {
1450	$::BIND_EDITOR->set_binding (undef, undef, [],
1451	sub {
1452	my ($mod, $sym, $cmds) = @_;
1453	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1454	$refresh->();
1455	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1456	$SETUP_DIALOG->show;
1457	},
1458	sub {
1459	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1460	$SETUP_DIALOG->show;
1461	},
1462	);
1463	$SETUP_DIALOG->hide;
1464	$::BIND_EDITOR->show;
1465	0
1466	},
1467	);
1468
1469	$hb->add (new CFClient::UI::Button
1470	text => "close",
1471	tooltip => "Closes the binding window",
1472	expand => 1,
1473	on_activate => sub {
1474	$SETUP_DIALOG->hide;
1475	0
1476	}
1477	);
1478
1479	$refresh->();
1480
1481	$vb
1482	}
1483
1484	# just weirdness, pls. ignore
1485	sub load_html_page {
1486	my ($viewer, $base) = @_;
1487
1488	$viewer->clear;
1489
1490	require LWP::Simple;
1491	require HTML::Parser;
1492	require URI;
1493
1494	my $page = LWP::Simple::get ($base)
1495	or return;
1496
1497	my @s = { };
1498	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500	my $parser = HTML::Parser->new (
1501	text_h => [sub {
1502	my ($text) = @_;
1503	$text =~ s/\s+/ /g;
1504	$s[-1]{text} .= CFClient::asxml $text;
1505	}, "dtext"],
1506	start_h => [sub {
1507	my ($tag, $attr) = @_;
1508	if ($passthrough{$tag}) {
1509	$s[-1]{text} .= "<$tag>";
1510	} elsif ($tag eq "h1") {
1511	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512	} elsif ($tag eq "h2") {
1513	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514	} elsif ($tag eq "h3") {
1515	push @s, { text => "<span size='large'>" };
1516	} elsif ($tag eq "a") {
1517	push @s, { text => "", url => $attr->{href} };
1518	} elsif ($tag eq "p") {
1519	push @s, { };
1520	} elsif ($tag eq "img") {
1521	eval {
1522	push @{$s[-1]{obj}}, new CFClient::UI::Image
1523	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524	$s[-1]{text} .= "\x{fffc}";
1525	};
1526	}
1527	}, "tagname, attr"],
1528	end_h => [sub {
1529	my ($tag) = @_;
1530	if ($passthrough{$tag}) {
1531	$s[-1]{text} .= "</$tag>";
1532	} elsif ($tag =~ /^h\d$/) {
1533	$s[-1]{text} .= "</span>";
1534	push @s, { };
1535	} elsif ($tag eq "a") {
1536	my $S = pop @s;
1537	$s[-1]{text} .= "\x{fffc}";
1538	push @{$s[-1]{obj}}, new CFClient::UI::Label
1539	fg => [0.8, 0.8, 1],
1540	markup => "<u>$S->{text}</u>",
1541	fontsize => 0.8,
1542	can_events => 1,
1543	can_focus => 1,
1544	on_button_up => sub {
1545	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546	},
1547	;
1548	}
1549	}, "tagname"],
1550	);
1551
1552	$parser->parse ($page);
1553	$parser->eof;
1554
1555	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556	for @s;
1557
1558	$viewer->set_offset (0);
1559	}	1470	}
1560		1471
1561	sub help_window {	1472	sub help_window {
1562	my $win = new CFClient::UI::FancyFrame	1473	my $win = new CFPlus::UI::Toplevel
1563	x => 'center',	1474	x => 'center',
1564	y => 'center',	1475	y => 'center',
1565	z => 2,	1476	z => 4,
1566	name => 'doc_browser',	1477	name => 'doc_browser',
1567	force_w => int $WIDTH * 7/8,	1478	force_w => int $WIDTH * 7/8,
1568	force_h => int $HEIGHT * 7/8,	1479	force_h => int $HEIGHT * 7/8,
1569	title => "Help Browser",	1480	title => "Help Browser",
1570	has_close_button => 1;	1481	has_close_button => 1;
1571		1482
1572	$win->add (my $vbox = new CFClient::UI::VBox);	1483	$win->add (my $vbox = new CFPlus::UI::VBox);
1573		1484
1574	$vbox->add (my $buttons = new CFClient::UI::HBox);	1485	$vbox->add (new CFPlus::UI::FancyFrame
		1486	label => "Navigation",
		1487	child => (my $buttons = new CFPlus::UI::HBox),
		1488	);
1575	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1489	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576	expand => 1, fontsize => 0.8, padding_x => 4);	1490	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1577		1491
1578	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1492	my @history;
1579	$buttons->add (my $combo = new CFClient::UI::Selector	1493	my @future;
1580	value => undef,	1494	my $curnode;
1581	options => [	1495
1582	[intro => "Introduction"],	1496	my $load_node; $load_node = sub {
1583	[manual => "Main Manual"],	1497	my ($node, $para) = @_;
1584	[skill_help => "Skill Reference"],	1498
1585	[command_help => "Command Reference"],	1499	$buttons->clear;
1586	[dmcommand_help => "DM Commands"],	1500
1587	[COPYING => "License Terms"],	1501	$buttons->add (new CFPlus::UI::Button
1588	[test => "test (do not select)"], #d#TODO	1502	text => "⇤",
1589	],	1503	tooltip => "back to the starting page",
1590	on_changed => sub {	1504	on_activate => sub {
1591	my ($self, $pod) = @_;	1505	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1506	unshift @future, @history;
		1507	@history = ();
		1508	$load_node->(@{shift @future});
		1509	},
		1510	);
1592		1511
1593	if ($pod eq "test") {#d#TODO	1512	if (@history) {
1594	eval {	1513	$buttons->add (new CFPlus::UI::Button
1595	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1514	text => "⋘",
		1515	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1516	on_activate => sub {
		1517	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1518	$load_node->(@{pop @history});
1596	};	1519	},
1597	warn "$@" if $@;	1520	);
1598	return;	1521	}
		1522
		1523	if (@future) {
		1524	$buttons->add (new CFPlus::UI::Button
		1525	text => "⋙",
		1526	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1527	on_activate => sub {
		1528	push @history, [$curnode, $viewer->current_paragraph];
		1529	$load_node->(@{shift @future});
		1530	},
		1531	);
		1532	}
		1533
		1534	$buttons->add (new CFPlus::UI::Label text => " ");
		1535
		1536	my @path = CFPlus::Pod::full_path_of $node;
		1537	pop @path; # drop current node
		1538
		1539	for my $node (@path) {
		1540	$buttons->add (new CFPlus::UI::Button
		1541	text => $node->{kw}[0],
		1542	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1543	on_activate => sub {
		1544	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1545	$load_node->($node);
		1546	},
		1547	);
		1548	$buttons->add (new CFPlus::UI::Label text => "/");
		1549	}
		1550
		1551	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1552
		1553	$curnode = $node;
		1554
		1555	$viewer->clear;
		1556	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1557	$viewer->scroll_to ($para);
		1558	};
		1559
		1560	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1561
		1562	$CFPlus::Pod::goto_document = sub {
		1563	my (@path) = @_;
		1564
		1565	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1566
		1567	$load_node->((CFPlus::Pod::find @path)[0]);
		1568	$win->show;
		1569	};
		1570
		1571	$win
		1572	}
		1573
		1574	sub open_string_query {
		1575	my ($title, $cb, $txt, $tooltip) = @_;
		1576	my $dialog = new CFPlus::UI::Toplevel
		1577	x => "center",
		1578	y => "center",
		1579	z => 50,
		1580	force_w => $WIDTH * 4/5,
		1581	title => $title;
		1582
		1583	$dialog->add (
		1584	my $e = new CFPlus::UI::Entry
		1585	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1586	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1587	tooltip => $tooltip
		1588	);
		1589
		1590	$e->grab_focus;
		1591	$e->set_text ($txt) if $txt;
		1592	$dialog->show;
		1593	}
		1594
		1595	sub open_quit_dialog {
		1596	unless ($QUIT_DIALOG) {
		1597	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1598	x => "center",
		1599	y => "center",
		1600	z => 50,
		1601	title => "Really Quit?",
		1602	on_key_down => sub {
		1603	my ($dialog, $ev) = @_;
		1604	$ev->{sym} == 27 and $dialog->hide;
1599	}	1605	}
		1606	;
1600		1607
1601	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1608	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1602	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603		1609
1604	#use Data::Dumper; warn Dumper $pom;#d#	1610	$vb->add (new CFPlus::UI::Label
		1611	text => "You should find a savebed and apply it first!",
		1612	max_w => $WIDTH * 0.25,
		1613	ellipsize => 0,
		1614	);
		1615	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1616	$hb->add (new CFPlus::UI::Button
		1617	text => "Ok",
		1618	expand => 1,
		1619	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1620	);
		1621	$hb->add (new CFPlus::UI::Button
		1622	text => "Quit anyway",
		1623	expand => 1,
		1624	on_activate => sub { exit },
		1625	);
		1626	}
1605		1627
1606	$viewer->clear;	1628	$QUIT_DIALOG->show;
		1629	$QUIT_DIALOG->grab_focus;
		1630	}
1607		1631
1608	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1632	sub show_tip_of_the_day {
1609	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1633	# find all tips
1610	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1634	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1611	# ]);#d#	1635
		1636	CFPlus::DB::get state => "tip_of_the_day", sub {
		1637	my ($todindex) = @_;
		1638	$todindex = 0 if $todindex >= @tod;
		1639	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1640
		1641	# create dialog
		1642	my $dialog;
		1643
		1644	my $close = sub {
		1645	$dialog->destroy;
		1646	};
		1647
		1648	$dialog = new CFPlus::UI::Toplevel
		1649	x => "center",
		1650	y => "center",
		1651	z => 3,
		1652	name => 'tip_of_the_day',
		1653	force_w => int $WIDTH * 4/9,
		1654	force_h => int $WIDTH * 2/9,
		1655	title => "Tip of the day #" . (1 + $todindex),
		1656	child => my $vbox = new CFPlus::UI::VBox,
		1657	has_close_button => 1,
		1658	on_delete => $close,
		1659	;
		1660
		1661	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1662	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1663	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1664
		1665	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1666
		1667	$table->add (0, 0, new CFPlus::UI::Button
		1668	text => "Close",
		1669	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1670	on_activate => $close,
		1671	);
		1672
		1673	$table->add (2, 0, new CFPlus::UI::Button
		1674	text => "Next",
		1675	tooltip => "Show the next <b>Tip of the day</b>.",
		1676	on_activate => sub {
		1677	$close->();
		1678	&show_tip_of_the_day;
1612		1679	},
1613	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614	for @$pom;
1615
1616	$viewer->set_offset (0);
1617
1618	0
1619	},	1680	);
1620	on_visibility_change => sub {	1681
1621	my ($self, $visible) = @_;	1682	$dialog->show;
1622	return unless $visible;
1623	return if $self->{value};
1624	$self->set_value ("intro");
1625	0
1626	},
1627	);	1683	};
1628
1629	$win
1630	}	1684	}
1631		1685
1632	sub sdl_init {	1686	sub sdl_init {
1633	CFClient::SDL_Init	1687	CFPlus::SDL_Init
1634	and die "SDL::Init failed!\n";	1688	and die "SDL::Init failed!\n";
1635	}	1689	}
1636		1690
1637	sub video_init {	1691	sub video_init {
1638	sdl_init;	1692	sdl_init;
…		…
1643		1697
1644	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1698	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645	$FULLSCREEN = $CFG->{fullscreen};	1699	$FULLSCREEN = $CFG->{fullscreen};
1646	$FAST = $CFG->{fast};	1700	$FAST = $CFG->{fast};
1647		1701
1648	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1702	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1649	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1703	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650		1704
1651	$SDL_ACTIVE = 1;	1705	$SDL_ACTIVE = 1;
1652	$LAST_REFRESH = time - 0.01;	1706	$LAST_REFRESH = time - 0.01;
1653		1707
1654	CFClient::OpenGL::init;	1708	CFPlus::OpenGL::init;
1655		1709
1656	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1710	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657		1711
1658	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1712	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659		1713
1660	#############################################################################	1714	#############################################################################
1661		1715
1662	if ($DEBUG_STATUS) {	1716	if ($DEBUG_STATUS) {
1663	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1717	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664	} else {	1718	} else {
1665	# create the widgets	1719	# create the widgets
1666		1720
1667	$DEBUG_STATUS = new CFClient::UI::Label	1721	$DEBUG_STATUS = new CFPlus::UI::Label
1668	padding => 0,	1722	padding => 0,
1669	z => 100,	1723	z => 100,
1670	force_x => "max",	1724	force_x => "max",
1671	force_y => 0;	1725	force_y => 0;
1672	$DEBUG_STATUS->show;	1726	$DEBUG_STATUS->show;
1673		1727
1674	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1675
1676	$STATUSBOX = new CFClient::UI::Statusbox;	1728	$STATUSBOX = new CFPlus::UI::Statusbox;
1677	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1729	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1678		1730
1679	(new CFClient::UI::Frame	1731	(new CFPlus::UI::Frame
1680	bg => [0, 0, 0, 0.4],	1732	bg => [0, 0, 0, 0.4],
1681	force_x => 0,	1733	force_x => 0,
1682	force_y => "max",	1734	force_y => "max",
1683	child => $STATUSBOX,	1735	child => $STATUSBOX,
1684	)->show;	1736	)->show;
1685		1737
1686	CFClient::UI::FancyFrame->new (	1738	CFPlus::UI::Toplevel->new (
1687	title => "Map",	1739	title => "Map",
1688	name => "mapmap",	1740	name => "mapmap",
1689	x => 0,	1741	x => 0,
1690	y => $FONTSIZE + 8,	1742	y => $FONTSIZE + 8,
1691	border_bg => [1, 1, 1, 192/255],	1743	border_bg => [1, 1, 1, 192/255],
1692	bg => [1, 1, 1, 0],	1744	bg => [1, 1, 1, 0],
1693	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1745	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1694	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1746	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1695	),	1747	),
1696	)->show;	1748	)->show;
1697		1749
1698	$MAPWIDGET = new CFClient::MapWidget;	1750	$MAPWIDGET = new CFPlus::MapWidget;
1699	$MAPWIDGET->connect (activate_console => sub {	1751	$MAPWIDGET->connect (activate_console => sub {
1700	my ($mapwidget, $preset) = @_;	1752	my ($mapwidget, $preset) = @_;
1701		1753
1702	if ($CONSOLE) {	1754	if ($CONSOLE) {
1703	$CONSOLE->{input}->{auto_activated} = 1;	1755	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1709	}	1761	}
1710	});	1762	});
1711	$MAPWIDGET->show;	1763	$MAPWIDGET->show;
1712	$MAPWIDGET->grab_focus;	1764	$MAPWIDGET->grab_focus;
1713		1765
1714	$LOGVIEW = new CFClient::UI::TextScroller	1766	$LOGVIEW = new CFPlus::UI::TextScroller
1715	expand => 1,	1767	expand => 1,
1716	font => $FONT_FIXED,	1768	font => $FONT_FIXED,
1717	fontsize => $::CFG->{log_fontsize},	1769	fontsize => $::CFG->{log_fontsize},
1718	indent => -4,	1770	indent => -4,
1719	can_hover => 1,	1771	can_hover => 1,
1720	can_events => 1,	1772	can_events => 1,
		1773	max_par => $CFG->{logview_max_par},
1721	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1774	tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1722	;	1775	;
1723		1776
1724	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1777	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1725	title => "Setup",	1778	title => "Setup",
1726	name => "setup_dialog",	1779	name => "setup_dialog",
1727	x => 'center',	1780	x => 'center',
1728	y => 'center',	1781	y => 'center',
1729	z => 2,	1782	z => 2,
…		…
1732	has_close_button => 1,	1785	has_close_button => 1,
1733	;	1786	;
1734		1787
1735	$METASERVER = metaserver_dialog;	1788	$METASERVER = metaserver_dialog;
1736		1789
1737	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1790	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1738	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1791	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739		1792
1740	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1793	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1741	"Configure the server to play on, your username, password and other server-related options.");	1794	"Configure the server to play on, your username, password and other server-related options.");
		1795	$SETUP_NOTEBOOK->add (Client => client_setup,
		1796	"Configure various client-specific settings.");
1742	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1797	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1743	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1798	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1744	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1799	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1745	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1800	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1746	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1801	$SETUP_NOTEBOOK->add (Audio => audio_setup,
…		…
1753	. "After pressing the combo the binding will be saved automatically and the "	1808	. "After pressing the combo the binding will be saved automatically and the "
1754	. "binding editor closes");	1809	. "binding editor closes");
1755	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1810	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1756	"Some debuggin' options. Do not ask.");	1811	"Some debuggin' options. Do not ask.");
1757		1812
1758	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1813	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1759		1814
1760	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1815	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1761	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1816	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1762		1817
1763	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1818	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1764	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1819	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1765		1820
1766	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	1821	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
1767		1822
1768	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1823	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1769	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1824	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1770		1825
1771	$BUTTONBAR->add (new CFClient::UI::Button	1826	$BUTTONBAR->add (new CFPlus::UI::Button
1772	text => "Save Config",	1827	text => "Save Config",
1773	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1828	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1774	on_activate => sub {	1829	on_activate => sub {
1775	$::CFG->{layout} = CFClient::UI::get_layout;	1830	$::CFG->{layout} = CFPlus::UI::get_layout;
1776	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1831	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777	status "Configuration Saved";	1832	status "Configuration Saved";
1778	0	1833	0
1779	},	1834	},
1780	);	1835	);
1781		1836
1782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1837	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1783	tooltip => "View Documentation");	1838	tooltip => "View Documentation");
1784		1839
		1840
1785	$BUTTONBAR->add (new CFClient::UI::Button	1841	$BUTTONBAR->add (new CFPlus::UI::Button
1786	text => "Quit",	1842	text => "Quit",
1787	tooltip => "Terminates the program",	1843	tooltip => "Terminates the program",
1788	on_activate => sub {	1844	on_activate => sub {
1789	if ($CONN) {	1845	if ($CONN) {
1790	open_quit_dialog;	1846	open_quit_dialog;
…		…
1800	}	1856	}
1801		1857
1802	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1858	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1803	}	1859	}
1804		1860
		1861	sub setup_build_button {
		1862	my ($enabled) = @_;
		1863	if ($enabled) {
		1864	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1865	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1866	text => "Build",
		1867	tooltip => "Opens the ingame builder",
		1868	on_activate => sub {
		1869	if ($CONN) {
		1870	$CONN->send_ext_req (builder_player_items => sub {
		1871	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1872	});
		1873	}
		1874	0
		1875	};
		1876	$BUTTONBAR->add ($BUILD_BUTTON);
		1877	} else {
		1878	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1879	}
		1880	}
		1881
		1882	sub open_ingame_editor {
		1883	my ($msg) = @_;
		1884
		1885	my $win = new CFPlus::UI::Toplevel
		1886	x => 0,
		1887	y => 'center',
		1888	z => 4,
		1889	name => 'builder_window',
		1890	force_w => int $WIDTH * 1/4,
		1891	force_h => int $HEIGHT * 3/4,
		1892	title => "In game builder",
		1893	has_close_button => 1;
		1894
		1895	my $r = new CFPlus::UI::ScrolledWindow (
		1896	expand => 1,
		1897	scroll_y => 1
		1898	);
		1899	$r->add (my $vb = new CFPlus::UI::VBox);
		1900	$win->add ($r);
		1901
		1902
		1903	$vb->add (
		1904	new CFPlus::UI::Button
		1905	text => "Disable build mode",
		1906	on_activate => sub { $::IN_BUILD_MODE = undef }
		1907	);
		1908	$vb->add (
		1909	new CFPlus::UI::Button
		1910	text => "ERASE",
		1911	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1912	);
		1913
		1914	for my $itemarchname (
		1915	sort {
		1916	$msg->{items}->{$a}->{build_arch_name}
		1917	cmp $msg->{items}->{$b}->{build_arch_name}
		1918	} keys %{$msg->{items}}
		1919	) {
		1920	my $info = $msg->{items}->{$itemarchname};
		1921	$vb->add (
		1922	new CFPlus::UI::Button text => $info->{build_arch_name},
		1923	on_activate => sub {
		1924	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1925
		1926	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1927	build_mode_query_arch_info ();
		1928	}
		1929	}
		1930	);
		1931	}
		1932
		1933	$win->show;
		1934	}
		1935
		1936	sub build_mode_query_arch_info {
		1937	my ($iteminfo) = $::IN_BUILD_MODE;
		1938	my $itemarchname = $iteminfo->{item};
		1939	my $info = $iteminfo->{info};
		1940
		1941	my $dialog = new CFPlus::UI::Toplevel
		1942	x => "center",
		1943	y => "center",
		1944	z => 50,
		1945	force_w => int $WIDTH * 1/2,
		1946	title => "Enter information for placement of '$itemarchname'",
		1947	has_close_button => 1;
		1948
		1949	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1950
		1951	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1952	my $row = 0;
		1953	if ($info->{has_name}) {
		1954	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
		1955	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1956	}
		1957	if ($info->{has_text}) {
		1958	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
		1959	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1960	}
		1961	if ($info->{has_connection}) {
		1962	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1963	$table->add (1, $row++,
		1964	new CFPlus::UI::Entry
		1965	expand => 1,
		1966	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1967	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1968	);
		1969	}
		1970
		1971	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1972	$hb->add (new CFPlus::UI::Button
		1973	text => "Close",
		1974	expand => 1,
		1975	on_activate => sub { $dialog->hide; 0 },
		1976	);
		1977	$dialog->show;
		1978	}
		1979
1805	sub video_shutdown {	1980	sub video_shutdown {
1806	CFClient::OpenGL::shutdown;	1981	CFPlus::OpenGL::shutdown;
1807		1982
1808	undef $SDL_ACTIVE;	1983	undef $SDL_ACTIVE;
1809	}	1984	}
1810		1985
1811	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1986	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1819		1994
1820	sub audio_music_finished {	1995	sub audio_music_finished {
1821	return unless $CFG->{bgm_enable};	1996	return unless $CFG->{bgm_enable};
1822		1997
1823	# TODO: hack, do play loop and mood music	1998	# TODO: hack, do play loop and mood music
1824	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1999	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1825	$bgmusic->play (0);	2000	$bgmusic->play (0);
1826		2001
1827	push @bgmusic, shift @bgmusic;	2002	push @bgmusic, shift @bgmusic;
1828	}	2003	}
1829		2004
1830	sub audio_init {	2005	sub audio_init {
1831	if ($CFG->{audio_enable}) {	2006	if ($CFG->{audio_enable}) {
1832	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2007	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1833	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2008	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1834		2009
1835	unless ($SDL_MIXER) {	2010	unless ($SDL_MIXER) {
1836	status "Unable to open sound device: there will be no sound";	2011	status "Unable to open sound device: there will be no sound";
1837	return;	2012	return;
1838	}	2013	}
1839		2014
1840	CFClient::Mix_AllocateChannels 8;	2015	CFPlus::Mix_AllocateChannels 8;
1841	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2016	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1842		2017
1843	audio_music_finished;	2018	audio_music_finished;
1844		2019
		2020	local $_;
1845	while (<$fh>) {	2021	while (<$fh>) {
1846	next if /^\s*#/;	2022	next if /^\s*#/;
1847	next if /^\s*$/;	2023	next if /^\s*$/;
1848		2024
1849	my ($file, $volume, $event) = split /\s+/, $_, 3;	2025	my ($file, $volume, $event) = split /\s+/, $_, 3;
1850		2026
1851	push @SOUNDS, "$volume,$file";	2027	push @SOUNDS, "$volume,$file";
1852		2028
1853	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2029	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2030	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1855	$chunk->volume ($volume * 128 / 100);	2031	$chunk->volume ($volume * 128 / 100);
1856	$chunk	2032	$chunk
1857	};	2033	};
1858	}	2034	}
1859	} else {	2035	} else {
…		…
1861	}	2037	}
1862	}	2038	}
1863	}	2039	}
1864		2040
1865	sub audio_shutdown {	2041	sub audio_shutdown {
1866	CFClient::Mix_CloseAudio if $SDL_MIXER;	2042	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1867	undef $SDL_MIXER;	2043	undef $SDL_MIXER;
1868	@SOUNDS = ();	2044	@SOUNDS = ();
1869	%AUDIO_CHUNKS = ();	2045	%AUDIO_CHUNKS = ();
1870	}	2046	}
1871		2047
…		…
1878		2054
1879	sub force_refresh {	2055	sub force_refresh {
1880	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2056	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1881	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2057	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1882		2058
1883	$CFClient::UI::ROOT->draw;	2059	$CFPlus::UI::ROOT->draw;
1884		2060
1885	$WANT_REFRESH = 0;	2061	$WANT_REFRESH = 0;
1886	$CAN_REFRESH = 0;	2062	$CAN_REFRESH = 0;
1887	$LAST_REFRESH = $NOW;	2063	$LAST_REFRESH = $NOW;
1888		2064
1889	CFClient::SDL_GL_SwapBuffers;	2065	CFPlus::SDL_GL_SwapBuffers;
1890	}	2066	}
1891		2067
1892	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2068	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893	$NOW = time;	2069	$NOW = time;
1894		2070
1895	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2071	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896	for CFClient::SDL_PollEvent;	2072	for CFPlus::SDL_PollEvent;
1897		2073
1898	if (%animate_object) {	2074	if (%animate_object) {
1899	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2075	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900	$WANT_REFRESH++;	2076	$WANT_REFRESH++;
1901	}	2077	}
…		…
1925	$CONN->face_prefetch	2101	$CONN->face_prefetch
1926	if $CONN;	2102	if $CONN;
1927	});	2103	});
1928		2104
1929	%SDL_CB = (	2105	%SDL_CB = (
1930	CFClient::SDL_QUIT => sub {	2106	CFPlus::SDL_QUIT => sub {
1931	Event::unloop -1;	2107	exit;
1932	},	2108	},
1933	CFClient::SDL_VIDEORESIZE => sub {	2109	CFPlus::SDL_VIDEORESIZE => sub {
1934	},	2110	},
1935	CFClient::SDL_VIDEOEXPOSE => sub {	2111	CFPlus::SDL_VIDEOEXPOSE => sub {
1936	CFClient::UI::full_refresh;	2112	CFPlus::UI::full_refresh;
1937	},	2113	},
1938	CFClient::SDL_ACTIVEEVENT => sub {	2114	CFPlus::SDL_ACTIVEEVENT => sub {
1939	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2115	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2116	# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
		2117	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2118	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2119	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1940	},	2120	},
1941	CFClient::SDL_KEYDOWN => sub {	2121	CFPlus::SDL_KEYDOWN => sub {
1942	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2122	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943	# alt-enter	2123	# alt-enter
1944	$FULLSCREEN_ENABLE->toggle;	2124	$FULLSCREEN_ENABLE->toggle;
1945	video_shutdown;	2125	video_shutdown;
1946	video_init;	2126	video_init;
1947	} else {	2127	} else {
1948	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2128	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949	}	2129	}
1950	},	2130	},
1951	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2131	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2132	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2133	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2134	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955	CFClient::SDL_USEREVENT => sub {	2135	CFPlus::SDL_USEREVENT => sub {
1956	if ($_[0]{code} == 1) {	2136	if ($_[0]{code} == 1) {
1957	audio_channel_finished $_[0]{data1};	2137	audio_channel_finished $_[0]{data1};
1958	} elsif ($_[0]{code} == 0) {	2138	} elsif ($_[0]{code} == 0) {
1959	audio_music_finished;	2139	audio_music_finished;
1960	}	2140	}
…		…
1964	#############################################################################	2144	#############################################################################
1965		2145
1966	$SIG{INT} = $SIG{TERM} = sub { exit };	2146	$SIG{INT} = $SIG{TERM} = sub { exit };
1967		2147
1968	{	2148	{
1969	local $SIG{__DIE__} = sub {
1970	return unless defined $^S && !$^S;
1971	Carp::confess $_[0];#d#TODO: remove when stable
1972	CFClient::fatal $_[0];
1973	};
1974
1975	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2149	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2150	CFPlus::DB::Server::run;
		2151
1976	CFClient::UI::set_layout ($::CFG->{layout});	2152	CFPlus::UI::set_layout ($::CFG->{layout});
1977		2153
1978	my %DEF_CFG = (	2154	my %DEF_CFG = (
1979	sdl_mode => 0,	2155	sdl_mode => 0,
1980	width => 640,	2156	width => 640,
1981	height => 480,	2157	height => 480,
1982	fullscreen => 0,	2158	fullscreen => 0,
1983	fast => 0,	2159	fast => 0,
1984	map_scale => 1,	2160	map_scale => 1,
1985	fow_enable => 1,	2161	fow_enable => 1,
1986	fow_intensity => 0.45,	2162	fow_intensity => 0.45,
1987	fow_smooth => 0,	2163	fow_smooth => 0,
		2164	map_smoothing => 1,
1988	gui_fontsize => 1,	2165	gui_fontsize => 1,
1989	log_fontsize => 0.7,	2166	log_fontsize => 0.7,
1990	gauge_fontsize => 1,	2167	gauge_fontsize => 1,
1991	gauge_size => 0.35,	2168	gauge_size => 0.35,
1992	stat_fontsize => 0.7,	2169	stat_fontsize => 0.7,
1993	mapsize => 100,	2170	mapsize => 100,
1994	say_command => 'say',	2171	say_command => 'chat',
1995	audio_enable => 1,	2172	audio_enable => 1,
1996	bgm_enable => 1,	2173	bgm_enable => 1,
1997	bgm_volume => 0.25,	2174	bgm_volume => 0.25,
1998	face_prefetch => 0,	2175	face_prefetch => 0,
1999	output_sync => 1,	2176	output_sync => 1,
2000	output_count => 1,	2177	output_count => 1,
		2178	output_rate => "",
2001	pickup => 0,	2179	pickup => 0,
2002	inv_sort => "mtime",	2180	inv_sort => "mtime",
2003	default => "profile", # default profile	2181	default => "profile", # default profile
		2182	show_tips => 1,
		2183	logview_max_par => 1000,
2004	);	2184	);
2005		2185
2006	while (my ($k, $v) = each %DEF_CFG) {	2186	while (my ($k, $v) = each %DEF_CFG) {
2007	$CFG->{$k} = $v unless exists $CFG->{$k};	2187	$CFG->{$k} = $v unless exists $CFG->{$k};
2008	}	2188	}
2009		2189
2010	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2190	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2191	$PROFILE = $CFG->{profile}{default};
		2192
		2193	# convert old bindings (only default profile matters)
		2194	if (my $bindings = delete $PROFILE->{bindings}) {
		2195	while (my ($mod, $syms) = each %$bindings) {
		2196	while (my ($sym, $cmds) = each %$syms) {
		2197	push @{ $PROFILE->{macro} }, {
		2198	accelkey => [$mod*1, $sym*1],
		2199	action => $cmds,
		2200	};
		2201	}
		2202	}
		2203	}
2011		2204
2012	sdl_init;	2205	sdl_init;
2013		2206
2014	@SDL_MODES = reverse	2207	@SDL_MODES = reverse
2015	grep $_->[0] >= 640 && $_->[1] >= 480,	2208	grep $_->[0] >= 640 && $_->[1] >= 480,
2016	CFClient::SDL_ListModes;	2209	CFPlus::SDL_ListModes;
2017		2210
2018	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2211	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2019		2212
2020	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2213	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021		2214
2022	{	2215	{
2023	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2216	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024	DejaVuSans.ttf	2217	DejaVuSans.ttf
2025	DejaVuSansMono.ttf	2218	DejaVuSansMono.ttf
2026	DejaVuSans-Bold.ttf	2219	DejaVuSans-Bold.ttf
2027	DejaVuSansMono-Bold.ttf	2220	DejaVuSansMono-Bold.ttf
2028	DejaVuSans-Oblique.ttf	2221	DejaVuSans-Oblique.ttf
2029	DejaVuSansMono-Oblique.ttf	2222	DejaVuSansMono-Oblique.ttf
2030	DejaVuSans-BoldOblique.ttf	2223	DejaVuSans-BoldOblique.ttf
2031	DejaVuSansMono-BoldOblique.ttf	2224	DejaVuSansMono-BoldOblique.ttf
2032	);	2225	);
2033		2226
2034	CFClient::add_font $_ for @fonts;	2227	CFPlus::add_font $_ for @fonts;
2035		2228
2036	CFClient::pango_init;	2229	CFPlus::pango_init;
2037		2230
2038	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2231	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2232	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040		2233
2041	$FONT_PROP->make_default;	2234	$FONT_PROP->make_default;
2042	}	2235	}
2043		2236
2044	# compare mono (ft) vs. rgba (cairo)	2237	# compare mono (ft) vs. rgba (cairo)
2045	# ft - 1.8s, cairo 3s, even in alpha-only mode	2238	# ft - 1.8s, cairo 3s, even in alpha-only mode
2046	# for my $rgba (0..1) {	2239	# for my $rgba (0..1) {
2047	# my $t1 = Time::HiRes::time;	2240	# my $t1 = Time::HiRes::time;
2048	# for (1..1000) {	2241	# for (1..1000) {
2049	# my $layout = CFClient::Layout->new ($rgba);	2242	# my $layout = CFPlus::Layout->new ($rgba);
2050	# $layout->set_text ("hallo" x 100);	2243	# $layout->set_text ("hallo" x 100);
2051	# $layout->render;	2244	# $layout->render;
2052	# }	2245	# }
2053	# my $t2 = Time::HiRes::time;	2246	# my $t2 = Time::HiRes::time;
2054	# warn $t2-$t1;	2247	# warn $t2-$t1;
2055	# }	2248	# }
2056		2249
		2250	$startup_done->();
		2251
2057	video_init;	2252	video_init;
2058	audio_init;	2253	audio_init;
2059	}	2254	}
2060		2255
		2256	show_tip_of_the_day if $CFG->{show_tips};
		2257
2061	Event::loop;	2258	Event::loop;
2062	#CFClient::SDL_Quit;	2259	#CFPlus::SDL_Quit;
2063	#CFClient::_exit 0;	2260	#CFPlus::_exit 0;
2064		2261
2065	END { CFClient::SDL_Quit }	2262	END {
		2263	CFPlus::SDL_Quit;
		2264	CFPlus::DB::Server::stop;
		2265	}
2066		2266
2067	=head1 NAME	2267	=head1 NAME
2068		2268
2069	cfplus - A Crossfire+ and Crossfire game client	2269	cfplus - A Crossfire+ and Crossfire game client
2070		2270

Diff Legend

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