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

Diff Legend

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