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.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.104 by root, Sun Jul 30 13:14:15 2006 UTC

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

Diff Legend

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