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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.148 by root, Mon Apr 9 04:39:11 2007 UTC

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

Diff Legend

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