ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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