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

Diff Legend

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