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

Diff Legend

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