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

Diff Legend

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