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.103 by root, Mon Jul 24 08:23:28 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 CFClient::Pod;	41	use CFPlus::Pod;
42	use CFClient::BindingEditor;	42	use CFPlus::BindingEditor;
43	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
44		44
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	46	$SIG{PIPE} = 'IGNORE';
47		47
48	$Event::Eval = 0;	48	$Event::Eval = 0;
49	$Event::DIED = sub {	49	$Event::DIED = sub {
50	# TODO: display dialog box or so	50	# TODO: display dialog box or so
51	Carp::cluck $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
52	CFClient::error $_[1];	52	CFPlus::error $_[1];
53	};	53	};
54		54
55	$SIG{__DIE__} = sub {	55	$SIG{__DIE__} = sub {
56	return if CFClient::in_destruct;	56	return if CFPlus::in_destruct;
57	Carp::cluck $_[0];	57	Carp::cluck $_[0];
58	CFClient::error $_[0];	58	CFPlus::error $_[0];
59	return;#d#	59	return;#d#
60	#return unless defined $^S && !$^S;	60	#return unless defined $^S && !$^S;
61	$Event::DIED->(undef, $_[0]);	61	$Event::DIED->(undef, $_[0]);
62	};	62	};
63		63
…		…
139	our $BIND_UPD_CB;	139	our $BIND_UPD_CB;
140		140
141	our $PICKUP_CFG;	141	our $PICKUP_CFG;
142		142
143	sub status {	143	sub status {
144	$STATUSBOX->add (CFClient::asxml $_[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]);
145	}	145	}
146		146
147	sub debug {	147	sub debug {
148	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
149	}	149	}
…		…
155		155
156	# server query dialog	156	# server query dialog
157	sub server_query {	157	sub server_query {
158	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
159		159
160	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161	x => "center",	161	x => "center",
162	y => "center",	162	y => "center",
163	title => "Server Query",	163	title => "Server Query",
164	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
165	;	165	;
166		166
167	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
168	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
169	ellipsise => 0,	169	ellipsise => 0,
170	text => $prompt;	170	text => $prompt;
171		171
172	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
173	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
174		174
175	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
176	text => "No",	176	text => "No",
177	on_activate => sub {	177	on_activate => sub {
178	$conn->send ("reply n");	178	$conn->send ("reply n");
179	$dialog->destroy;	179	$dialog->destroy;
180	0	180	0
181	}	181	}
182	);	182	);
183	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
184	text => "Yes",	184	text => "Yes",
185	on_activate => sub {	185	on_activate => sub {
186	$conn->send ("reply y");	186	$conn->send ("reply y");
187	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
188	0	188	0
…		…
190	);	190	);
191		191
192	$dialog->grab_focus;	192	$dialog->grab_focus;
193		193
194	} elsif ($flags & CS_QUERY_SINGLECHAR) {	194	} elsif ($flags & CS_QUERY_SINGLECHAR) {
195	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "#charcreation_focus";
196		196
197	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) {
198	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
199		199
200	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
201	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
202	ellipsise => 0,	202	ellipsise => 0,
203	markup => "\nOr use your keyboard and the text entry below:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
204		204
205	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
206		206
207	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
208	text => "Next Race",	208	text => "Next Race",
209	on_activate => sub {	209	on_activate => sub {
210	$conn->send ("reply n");	210	$conn->send ("reply n");
211	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
212	0	212	0
213	},	213	},
214	);	214	);
215	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
216	text => "Accept",	216	text => "Accept",
217	on_activate => sub {	217	on_activate => sub {
218	$conn->send ("reply d");	218	$conn->send ("reply d");
219	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
220	0	220	0
221	},	221	},
222	);	222	);
223		223
224	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
225	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
226	ellipsise => 0,	226	ellipsise => 0,
227	markup =>	227	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228	"<big><b>Character Creation: Race</b></big>\n\n"
229	. "Look at the <b>Messages</b> window to see a description of this race "
230	. "and the center of the screen to see how this race looks like "
231	. "(<small>below this dialog window: you may need to move the dialog away and "
232	. "click into the display area to make it visible</small>).\n\n"
233	. "You can look at another race, or accept this race (you will cycle back to "
234	. "this race eventually, so you can take your time making this important choice."
235	;	228	;
236		229
237	} elsif ($prompt =~ /roll new stats/) {	230	} elsif ($prompt =~ /roll new stats/) {
238	if (my $stat = delete $conn->{stat_change_with}) {	231	if (my $stat = delete $conn->{stat_change_with}) {
239	$conn->send ("reply $stat");	232	$conn->send ("reply $stat");
…		…
242	}	235	}
243		236
244	$STATS_PAGE->show;	237	$STATS_PAGE->show;
245	$MESSAGE_WINDOW->hide;	238	$MESSAGE_WINDOW->hide;
246		239
247	unshift @dialog, new CFClient::UI::Label	240	unshift @dialog, new CFPlus::UI::Label
248	max_w => $::WIDTH * 0.4,	241	max_w => $::WIDTH * 0.4,
249	ellipsise => 0,	242	ellipsise => 0,
250	markup => "\nOr use your keyboard and the text entry below:\n";	243	markup => "\nOr use your keyboard and the text entry below:\n";
251		244
252	unshift @dialog, my $table = new CFClient::UI::Table;	245	unshift @dialog, my $table = new CFPlus::UI::Table;
253		246
254	# left: re-roll	247	# left: re-roll
255	$table->add (0, 0, new CFClient::UI::Button	248	$table->add (0, 0, new CFPlus::UI::Button
256	text => "Roll Again",	249	text => "Roll Again",
257	on_activate => sub {	250	on_activate => sub {
258	$conn->send ("reply y");	251	$conn->send ("reply y");
259	destroy_query_dialog $conn;	252	destroy_query_dialog $conn;
260	0	253	0
261	},	254	},
262	);	255	);
263		256
264	# center: swap stats	257	# center: swap stats
265	my ($sw1, $sw2) = map +(new CFClient::UI::Selector	258	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266	expand => 1,	259	expand => 1,
267	value => $_,	260	value => $_,
268	options => [	261	options => [
269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	262	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	263	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
274	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	267	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	268	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276	],	269	],
277	), 1 .. 2;	270	), 1 .. 2;
278		271
279	$table->add (2, 0, new CFClient::UI::Button	272	$table->add (2, 0, new CFPlus::UI::Button
280	text => "Swap Stats",	273	text => "Swap Stats",
281	on_activate => sub {	274	on_activate => sub {
282	$conn->{stat_change_with} = $sw2->{value};	275	$conn->{stat_change_with} = $sw2->{value};
283	$conn->send ("reply $sw1->{value}");	276	$conn->send ("reply $sw1->{value}");
284	destroy_query_dialog $conn;	277	destroy_query_dialog $conn;
285	0	278	0
286	},	279	},
287	);	280	);
288	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	281	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289		282
290	# right: accept	283	# right: accept
291	$table->add (4, 0, new CFClient::UI::Button	284	$table->add (4, 0, new CFPlus::UI::Button
292	text => "Accept",	285	text => "Accept",
293	on_activate => sub {	286	on_activate => sub {
294	$conn->send ("reply n");	287	$conn->send ("reply n");
295	$STATS_PAGE->hide;	288	$STATS_PAGE->hide;
296	destroy_query_dialog $conn;	289	destroy_query_dialog $conn;
297	0	290	0
298	},	291	},
299	);	292	);
300		293
301	unshift @dialog, my $hbox = new CFClient::UI::HBox;	294	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302	for (	295	for (
303	[Str => CS_STAT_STR],	296	[Str => CS_STAT_STR],
304	[Dex => CS_STAT_DEX],	297	[Dex => CS_STAT_DEX],
305	[Con => CS_STAT_CON],	298	[Con => CS_STAT_CON],
306	[Int => CS_STAT_INT],	299	[Int => CS_STAT_INT],
307	[Wis => CS_STAT_WIS],	300	[Wis => CS_STAT_WIS],
308	[Pow => CS_STAT_POW],	301	[Pow => CS_STAT_POW],
309	[Cha => CS_STAT_CHA],	302	[Cha => CS_STAT_CHA],
310	) {	303	) {
311	my ($name, $id) = @$_;	304	my ($name, $id) = @$_;
312	$hbox->add (new CFClient::UI::Label	305	$hbox->add (new CFPlus::UI::Label
313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	306	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314	align => 0,	307	align => 0,
315	expand => 1,	308	expand => 1,
316	can_events => 1,	309	can_events => 1,
317	can_hover => 1,	310	can_hover => 1,
318	tooltip => $CFClient::STAT_TOOLTIP{$name},	311	tooltip => "#stat_$name",
319	);	312	);
320	}	313	}
321		314
322	unshift @dialog, new CFClient::UI::Label	315	unshift @dialog, new CFPlus::UI::Label
323	max_w => $::WIDTH * 0.4,	316	max_w => $::WIDTH * 0.4,
324	ellipsise => 0,	317	ellipsise => 0,
325	markup =>	318	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326	"<big><b>Character Creation: Stats</b></big>\n\n"
327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329	. "They will be modified later by both the race and the class you choose.\n\n"
330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331	;	319	;
332	}	320	}
333		321
334	push @dialog, my $entry = new CFClient::UI::Entry	322	push @dialog, my $entry = new CFPlus::UI::Entry
335	on_changed => sub {	323	on_changed => sub {
336	$conn->send ("reply $_[1]");	324	$conn->send ("reply $_[1]");
337	destroy_query_dialog $conn;	325	destroy_query_dialog $conn;
338	0	326	0
339	},	327	},
…		…
342	$entry->grab_focus;	330	$entry->grab_focus;
343		331
344	} else {	332	} else {
345	$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)";
346		334
347	push @dialog, my $entry = new CFClient::UI::Entry	335	push @dialog, my $entry = new CFPlus::UI::Entry
348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	336	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
349	on_activate => sub {	337	on_activate => sub {
350	$conn->send ("reply $_[1]");	338	$conn->send ("reply $_[1]");
351	destroy_query_dialog $conn;	339	destroy_query_dialog $conn;
352	0	340	0
…		…
368		356
369	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;
370		358
371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	359	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
372		360
373	$MAP = new CFClient::Map $mapsize, $mapsize;	361	$MAP = new CFPlus::Map $mapsize, $mapsize;
374		362
375	$CONN = eval {	363	$CONN = eval {
376	new CFClient::Protocol	364	new CFPlus::Protocol
377	host => $host,	365	host => $host,
378	port => $port || 13327,	366	port => $port || 13327,
379	user => $CFG->{profile}{default}{user},	367	user => $CFG->{profile}{default}{user},
380	pass => $CFG->{profile}{default}{password},	368	pass => $CFG->{profile}{default}{password},
381	mapw => $mapsize,	369	mapw => $mapsize,
…		…
400	$chunk->play;	388	$chunk->play;
401	},	389	},
402	};	390	};
403		391
404	if ($CONN) {	392	if ($CONN) {
405	CFClient::lowdelay fileno $CONN->{fh};	393	CFPlus::lowdelay fileno $CONN->{fh};
406		394
407	status "login successful";	395	status "login successful";
408	} else {	396	} else {
409	status "unable to connect";	397	status "unable to connect";
410	stop_game();	398	stop_game();
…		…
428		416
429	undef $MAP;	417	undef $MAP;
430	}	418	}
431		419
432	sub graphics_setup {	420	sub graphics_setup {
433	my $vbox = new CFClient::UI::VBox;	421	my $vbox = new CFPlus::UI::VBox;
434		422
435	$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]);
436		424
437	$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");
438	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	426	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
439		427
440	$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]);
441	$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");
442		430
443	$mode_slider->connect (changed => sub {	431	$mode_slider->connect (changed => sub {
444	my ($self, $value) = @_;	432	my ($self, $value) = @_;
445		433
446	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	434	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
448	});	436	});
449	$mode_slider->emit (changed => $mode_slider->{range}[0]);	437	$mode_slider->emit (changed => $mode_slider->{range}[0]);
450		438
451	my $row = 1;	439	my $row = 1;
452		440
453	$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");
454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	442	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455	state => $CFG->{fullscreen},	443	state => $CFG->{fullscreen},
456	tooltip => "Bring the client into fullscreen mode.",	444	tooltip => "Bring the client into fullscreen mode.",
457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	445	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
458	);	446	);
459		447
460	$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");
461	$table->add (1, $row++, new CFClient::UI::CheckBox	449	$table->add (1, $row++, new CFPlus::UI::CheckBox
462	state => $CFG->{fast},	450	state => $CFG->{fast},
463	tooltip => "Lower the visual quality considerably to speed up rendering.",	451	tooltip => "Lower the visual quality considerably to speed up rendering.",
464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	452	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465	);	453	);
466		454
467	$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");
468	$table->add (1, $row++, new CFClient::UI::Slider	456	$table->add (1, $row++, new CFPlus::UI::Slider
469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	457	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	458	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471	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 }
472	);	460	);
473		461
474	$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");
475	$table->add (1, $row++, new CFClient::UI::CheckBox	463	$table->add (1, $row++, new CFPlus::UI::CheckBox
476	state => $CFG->{fow_enable},	464	state => $CFG->{fow_enable},
477	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.",
478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	466	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
479	);	467	);
480		468
481	$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");
482	$table->add (1, $row++, new CFClient::UI::Slider	470	$table->add (1, $row++, new CFPlus::UI::Slider
483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	471	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
484	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.",
485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	473	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
486	);	474	);
487		475
488	$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");
489	$table->add (1, $row++, new CFClient::UI::CheckBox	477	$table->add (1, $row++, new CFPlus::UI::CheckBox
490	state => $CFG->{fow_smooth},	478	state => $CFG->{fow_smooth},
491	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.",
492	on_changed => sub {	480	on_changed => sub {
493	my ($self, $value) = @_;	481	my ($self, $value) = @_;
494	$CFG->{fow_smooth} = $value;	482	$CFG->{fow_smooth} = $value;
495	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;
496	0	484	0
497	}	485	}
498	);	486	);
499		487
500	$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");
501	$table->add (1, $row++, new CFClient::UI::Slider	489	$table->add (1, $row++, new CFPlus::UI::Slider
502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	490	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
503	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.",
504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	492	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505	);	493	);
506		494
507	$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");
508	$table->add (1, $row++, new CFClient::UI::Slider	496	$table->add (1, $row++, new CFPlus::UI::Slider
509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	497	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
510	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.",
511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	499	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
512	);	500	);
513		501
514	$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");
515	$table->add (1, $row++, new CFClient::UI::Slider	503	$table->add (1, $row++, new CFPlus::UI::Slider
516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	504	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
517	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.",
518	on_changed => sub {	506	on_changed => sub {
519	$CFG->{gauge_fontsize} = $_[1];	507	$CFG->{gauge_fontsize} = $_[1];
520	&set_gauge_window_fontsize;	508	&set_gauge_window_fontsize;
521	0	509	0
522	}	510	}
523	);	511	);
524		512
525	$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");
526	$table->add (1, $row++, new CFClient::UI::Slider	514	$table->add (1, $row++, new CFPlus::UI::Slider
527	range => [$CFG->{gauge_size}, 0.2, 0.8],	515	range => [$CFG->{gauge_size}, 0.2, 0.8],
528	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.",
529	on_changed => sub {	517	on_changed => sub {
530	$CFG->{gauge_size} = $_[1];	518	$CFG->{gauge_size} = $_[1];
531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	519	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532	0	520	0
533	}	521	}
534	);	522	);
535		523
536	$table->add (1, $row++, new CFClient::UI::Button	524	$table->add (1, $row++, new CFPlus::UI::Button
537	expand => 1, align => 0, text => "Apply",	525	expand => 1, align => 0, text => "Apply",
538	tooltip => "Apply the video settings",	526	tooltip => "Apply the video settings",
539	on_activate => sub {	527	on_activate => sub {
540	video_shutdown ();	528	video_shutdown ();
541	video_init ();	529	video_init ();
…		…
545		533
546	$vbox	534	$vbox
547	}	535	}
548		536
549	sub audio_setup {	537	sub audio_setup {
550	my $vbox = new CFClient::UI::VBox;	538	my $vbox = new CFPlus::UI::VBox;
551		539
552	$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]);
553		541
554	my $row = 0;	542	my $row = 0;
555		543
556	$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");
557	$table->add (1, $row++, new CFClient::UI::CheckBox	545	$table->add (1, $row++, new CFPlus::UI::CheckBox
558	state => $CFG->{audio_enable},	546	state => $CFG->{audio_enable},
559	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	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.",
560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	548	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
561	);	549	);
562	# $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");
563	# $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 {
564	# $CFG->{effects_volume} = $_[1];	552	# $CFG->{effects_volume} = $_[1];
565	# });	553	# });
566	$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");
567	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	555	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
568	$hbox->add (new CFClient::UI::CheckBox	556	$hbox->add (new CFPlus::UI::CheckBox
569	expand => 1, state => $CFG->{bgm_enable},	557	expand => 1, state => $CFG->{bgm_enable},
570	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.",
571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	559	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
572	);	560	);
573	$hbox->add (new CFClient::UI::Slider	561	$hbox->add (new CFPlus::UI::Slider
574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	562	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
575	tooltip => "The volume of the background music. Changes are instant.",	563	tooltip => "The volume of the background music. Changes are instant.",
576	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 }
577	);	565	);
578		566
579	$table->add (1, $row++, new CFClient::UI::Button	567	$table->add (1, $row++, new CFPlus::UI::Button
580	expand => 1, align => 0, text => "Apply",	568	expand => 1, align => 0, text => "Apply",
581	tooltip => "Apply the audio settings",	569	tooltip => "Apply the audio settings",
582	on_activate => sub {	570	on_activate => sub {
583	audio_shutdown ();	571	audio_shutdown ();
584	audio_init ();	572	audio_init ();
…		…
596	}	584	}
597		585
598	sub make_gauge_window {	586	sub make_gauge_window {
599	my $gh = int $HEIGHT * $CFG->{gauge_size};	587	my $gh = int $HEIGHT * $CFG->{gauge_size};
600		588
601	my $win = new CFClient::UI::Frame (	589	my $win = new CFPlus::UI::Frame (
602	force_x => 0,	590	force_x => 0,
603	force_y => "max",	591	force_y => "max",
604	force_w => $WIDTH,	592	force_w => $WIDTH,
605	force_h => $gh,	593	force_h => $gh,
606	);	594	);
607		595
608	$win->add (my $hbox = new CFClient::UI::HBox	596	$win->add (my $hbox = new CFPlus::UI::HBox
609	children => [	597	children => [
610	(new CFClient::UI::HBox expand => 1),	598	(new CFPlus::UI::HBox expand => 1),
611	(new CFClient::UI::VBox children => [	599	(new CFPlus::UI::VBox children => [
612	(new CFClient::UI::Empty expand => 1),	600	(new CFPlus::UI::Empty expand => 1),
613	(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)),
614	]),	602	]),
615	(my $vbox = new CFClient::UI::VBox),	603	(my $vbox = new CFPlus::UI::VBox),
616	],	604	],
617	);	605	);
618		606
619	$vbox->add (new CFClient::UI::HBox	607	$vbox->add (new CFPlus::UI::HBox
620	expand => 1,	608	expand => 1,
621	children => [	609	children => [
622	(new CFClient::UI::Empty expand => 1),	610	(new CFPlus::UI::Empty expand => 1),
623	(my $hb = new CFClient::UI::HBox),	611	(my $hb = new CFPlus::UI::HBox),
624	],	612	],
625	);	613	);
626		614
627	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	615	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	616	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	617	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	618	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635		619
636	$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");
637	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638	$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");
639	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640		622
641	$GAUGES = {	623	$GAUGES = {
642	exp => $exp, win => $win, range => $rng,	624	exp => $exp, win => $win, range => $rng,
643	food => $fg, mana => $mg, hp => $hg, grace => $gg	625	food => $fg, mana => $mg, hp => $hg, grace => $gg
644	};	626	};
…		…
647		629
648	$win	630	$win
649	}	631	}
650		632
651	sub debug_setup {	633	sub debug_setup {
652	my $table = new CFClient::UI::Table;	634	my $table = new CFPlus::UI::Table;
653		635
654	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	636	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
655	$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 });
656	$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");
657	$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 });
658	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	640	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
659	$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 });
660	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	642	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
661	$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 });
662		644
663	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);
664		646
665	for my $x (0..2) {	647	for my $x (0..2) {
666	for my $y (0 .. 2) {	648	for my $y (0 .. 2) {
667	$table->add ($x + 3, $y,	649	$table->add ($x + 3, $y,
668	new CFClient::UI::Entry	650	new CFPlus::UI::Entry
669	text => $default_smooth[$x * 3 + $y],	651	text => $default_smooth[$x * 3 + $y],
670	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 },
671	);	653	);
672	}	654	}
673	}	655	}
…		…
675		657
676	$table	658	$table
677	}	659	}
678		660
679	sub stats_window {	661	sub stats_window {
680	my $r = new CFClient::UI::ScrolledWindow (	662	my $r = new CFPlus::UI::ScrolledWindow (
681	expand => 1,	663	expand => 1,
682	scroll_y => 1	664	scroll_y => 1
683	);	665	);
684	$r->add (my $vb = new CFClient::UI::VBox);	666	$r->add (my $vb = new CFPlus::UI::VBox);
685		667
		668	$vb->add (new CFPlus::UI::FancyFrame
		669	label => "Player",
		670	child => (my $pi = new CFPlus::UI::VBox),
		671	);
		672
686	$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,
687	can_hover => 1, can_events => 1,	674	can_hover => 1, can_events => 1,
688	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.");
689	$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,
690	can_hover => 1, can_events => 1,	677	can_hover => 1, can_events => 1,
691	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).");
692		679
693	$vb->add (my $hb0 = new CFClient::UI::HBox);	680	$pi->add (my $hb0 = new CFPlus::UI::HBox);
694	$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,
695	can_hover => 1, can_events => 1,	682	can_hover => 1, can_events => 1,
696	tooltip => "The weight of the player including all inventory items.");	683	tooltip => "The weight of the player including all inventory items.");
697	$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,
698	can_hover => 1, can_events => 1,	685	can_hover => 1, can_events => 1,
699	tooltip => "The weight limit: you cannot carry more than this.");	686	tooltip => "The weight limit: you cannot carry more than this.");
700		687
		688	$vb->add (new CFPlus::UI::FancyFrame
		689	label => "Primary/Secondary Statistics",
701	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	690	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		691	);
702	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	692	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703		693
704	my $color2 = [1, 1, 0];	694	my $color2 = [1, 1, 0];
705		695
706	for (	696	for (
707	[0, 0, st_str => "Str", 30],	697	[0, 0, st_str => "Str", 30],
…		…
719	[2, 4, st_spd => "Spd", 10.54],	709	[2, 4, st_spd => "Spd", 10.54],
720	[2, 5, st_wspd => "WSp", 10.54],	710	[2, 5, st_wspd => "WSp", 10.54],
721	) {	711	) {
722	my ($col, $row, $id, $label, $template) = @$_;	712	my ($col, $row, $id, $label, $template) = @$_;
723		713
724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	714	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	715	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	716	align => +1, template => $template, tooltip => "#stat_$label");
727	$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
728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	718	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	719	align => -1, text => $label, tooltip => "#stat_$label");
730	}	720	}
731		721
		722	$vb->add (new CFPlus::UI::FancyFrame
		723	label => "Resistancies",
732	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	724	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		725	);
733		726
734	my $row = 0;	727	my $row = 0;
735	my $col = 0;	728	my $col = 0;
736		729
737	my %resist_names = (	730	my %resist_names = (
…		…
776	drain acid pois para deat phys	769	drain acid pois para deat phys
777	blind fear tund elec cold ghit/)	770	blind fear tund elec cold ghit/)
778	{	771	{
779	$tbl2->add ($col, $row,	772	$tbl2->add ($col, $row,
780	$STATWIDS->{"res_$_"} =	773	$STATWIDS->{"res_$_"} =
781	new CFClient::UI::Label	774	new CFPlus::UI::Label
782	font => $FONT_FIXED,	775	font => $FONT_FIXED,
783	template => "-100%",	776	template => "-100%",
784	align => +1,	777	align => +1,
785	valign => 0,	778	valign => 0,
786	can_events => 1,	779	can_events => 1,
787	can_hover => 1,	780	can_hover => 1,
788	tooltip => $resist_names{$_}->[1],	781	tooltip => $resist_names{$_}->[1],
789	);	782	);
790	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	783	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
791	font => $FONT_FIXED,	784	font => $FONT_FIXED,
792	can_hover => 1,	785	can_hover => 1,
793	can_events => 1,	786	can_events => 1,
794	path => "ui/resist/resist_$_.png",	787	path => "ui/resist/resist_$_.png",
795	tooltip => $resist_names{$_}->[1],	788	tooltip => $resist_names{$_}->[1],
796	);	789	);
797	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	790	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
798	text => $resist_names{$_}->[0],	791	text => $resist_names{$_}->[0],
799	font => $FONT_FIXED,	792	font => $FONT_FIXED,
800	can_hover => 1,	793	can_hover => 1,
801	can_events => 1,	794	can_events => 1,
802	tooltip => $resist_names{$_}->[1],	795	tooltip => $resist_names{$_}->[1],
…		…
813		806
814	$r	807	$r
815	}	808	}
816		809
817	sub skill_window {	810	sub skill_window {
818	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	811	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
819	$sw->add ($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]);
820	$sw	813	$sw
821	}	814	}
822		815
823	sub formsep($) {	816	sub formsep($) {
824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	817	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
835	return if $METASERVER_ATIME > time;	828	return if $METASERVER_ATIME > time;
836	$METASERVER_ATIME = time + 60;	829	$METASERVER_ATIME = time + 60;
837		830
838	my $table = $METASERVER->{table};	831	my $table = $METASERVER->{table};
839	$table->clear;	832	$table->clear;
840	$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...");
841		834
842	my $buf;	835	my $buf;
843		836
844	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
845		838
…		…
868	"The time this server has been running without being restarted.",	861	"The time this server has been running without being restarted.",
869	"The server software version - a '+' indicates a Crossfire+ server.",	862	"The server software version - a '+' indicates a Crossfire+ server.",
870	"Short information about this server provided by its admins.",	863	"Short information about this server provided by its admins.",
871	);	864	);
872	my @col = qw(#Users Host Uptime Version Description);	865	my @col = qw(#Users Host Uptime Version Description);
873	$table->add ($_, 0, new CFClient::UI::Label	866	$table->add ($_, 0, new CFPlus::UI::Label
874	can_hover => 1, can_events => 1,	867	can_hover => 1, can_events => 1,
875	align => 0, fg => [1, 1, 0],	868	align => 0, fg => [1, 1, 0],
876	text => $col[$_], tooltip => $tip[$_])	869	text => $col[$_], tooltip => $tip[$_])
877	for 0 .. $#col;	870	for 0 .. $#col;
878		871
…		…
899		892
900	$m = [$users, $host, $uptime, $version, $desc];	893	$m = [$users, $host, $uptime, $version, $desc];
901		894
902	$y++;	895	$y++;
903		896
904	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	897	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
905	(new CFClient::UI::Button	898	(new CFPlus::UI::Button
906	text => "Use",	899	text => "Use",
907	tooltip => "Put this server into the <b>Host:Port</b> field",	900	tooltip => "Put this server into the <b>Host:Port</b> field",
908	on_activate => sub {	901	on_activate => sub {
909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910	$METASERVER->hide;	903	$METASERVER->hide;
911	0	904	0
912	},	905	},
913	),	906	),
914	(new CFClient::UI::Empty expand => 1),	907	(new CFPlus::UI::Empty expand => 1),
915	]);	908	]);
916		909
917	$table->add ($_, $y, new CFClient::UI::Label	910	$table->add ($_, $y, new CFPlus::UI::Label
918	ellipsise => 0,	911	ellipsise => 0,
919	align => $align[$_],	912	align => $align[$_],
920	text => $m->[$_],	913	text => $m->[$_],
921	tooltip => $tip[$_],	914	tooltip => $tip[$_],
922	can_hover => 1,	915	can_hover => 1,
…		…
927	}	920	}
928	});	921	});
929	}	922	}
930		923
931	sub metaserver_dialog {	924	sub metaserver_dialog {
932	my $vbox = new CFClient::UI::VBox;	925	my $vbox = new CFPlus::UI::VBox;
933	my $table = new CFClient::UI::Table;	926	my $table = new CFPlus::UI::Table;
934	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	927	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935		928
936	my $dialog = new CFClient::UI::FancyFrame	929	my $dialog = new CFPlus::UI::Toplevel
937	title => "Server List",	930	title => "Server List",
938	name => 'metaserver_dialog',	931	name => 'metaserver_dialog',
939	x => 'center',	932	x => 'center',
940	y => 'center',	933	y => 'center',
941	z => 3,	934	z => 3,
…		…
951		944
952	$dialog	945	$dialog
953	}	946	}
954		947
955	sub server_setup {	948	sub server_setup {
956	my $vbox = new CFClient::UI::VBox;	949	my $vbox = new CFPlus::UI::VBox;
957		950
		951	$vbox->add (new CFPlus::UI::FancyFrame
		952	label => "Connection Settings",
958	$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	);
959	$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");
960		956
961	{	957	{
962	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	958	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963		959
964	$vbox->add (	960	$vbox->add (
965	$HOST_ENTRY = new CFClient::UI::Entry	961	$HOST_ENTRY = new CFPlus::UI::Entry
966	expand => 1,	962	expand => 1,
967	text => $CFG->{profile}{default}{host},	963	text => $CFG->{profile}{default}{host},
968	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",
969	on_changed => sub {	965	on_changed => sub {
970	my ($self, $value) = @_;	966	my ($self, $value) = @_;
971	$CFG->{profile}{default}{host} = $value;	967	$CFG->{profile}{default}{host} = $value;
972	0	968	0
973	}	969	}
974	);	970	);
975		971
976	$vbox->add (new CFClient::UI::Button	972	$vbox->add (new CFPlus::UI::Button
977	expand => 1,	973	expand => 1,
978	text => "Server List",	974	text => "Server List",
979	other => $METASERVER,	975	other => $METASERVER,
980	tooltip => "Show a list of available crossfire servers",	976	tooltip => "Show a list of available crossfire servers",
981	on_activate => sub { $METASERVER->toggle_visibility; 0 },	977	on_activate => sub { $METASERVER->toggle_visibility; 0 },
982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	978	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
983	);	979	);
984	}	980	}
985		981
986	$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");
987	$table->add (1, 4, new CFClient::UI::Entry	983	$table->add (1, 4, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{user},	984	text => $CFG->{profile}{default}{user},
989	tooltip => "The name of your character on the server",	985	tooltip => "The name of your character on the server",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	986	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
991	);	987	);
992		988
993	$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");
994	$table->add (1, 5, new CFClient::UI::Entry	990	$table->add (1, 5, new CFPlus::UI::Entry
995	text => $CFG->{profile}{default}{password},	991	text => $CFG->{profile}{default}{password},
996	hidden => 1,	992	hidden => 1,
997	tooltip => "The password for your character",	993	tooltip => "The password for your character",
998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	994	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
999	);	995	);
1000		996
1001	$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");
1002	$table->add (1, 7, new CFClient::UI::Slider	998	$table->add (1, 7, new CFPlus::UI::Slider
1003	force_w => 100,	999	force_w => 100,
1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1000	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005	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. "
1006	. "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, "
1007	. "but you also increase bandwidth requirements and latency. "	1003	. "but you also increase bandwidth requirements and latency. "
1008	. "This option is only used once at log-in.",	1004	. "This option is only used once at log-in.",
1009	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 },
1010	);	1006	);
1011		1007
1012	$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");
1013	$table->add (1, 8, new CFClient::UI::CheckBox	1009	$table->add (1, 8, new CFPlus::UI::CheckBox
1014	state => $CFG->{face_prefetch},	1010	state => $CFG->{face_prefetch},
1015	tooltip => "<b>Background Image Prefetch</b>\n\n"	1011	tooltip => "<b>Background Image Prefetch</b>\n\n"
1016	. "If enabled, the client automatically pre-fetches images from the server. "	1012	. "If enabled, the client automatically pre-fetches images from the server. "
1017	. "This might increase or create lag, but increases the chances "	1013	. "This might increase or create lag, but increases the chances "
1018	. "of faces being ready for display when you encounter them. "	1014	. "of faces being ready for display when you encounter them. "
…		…
1020	. "so only set it if you really need to prefetch images. "	1016	. "so only set it if you really need to prefetch images. "
1021	. "This option can be set and unset any time.",	1017	. "This option can be set and unset any time.",
1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1018	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1023	);	1019	);
1024		1020
1025	$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");
1026	$table->add (1, 9, new CFClient::UI::Entry	1022	$table->add (1, 9, new CFPlus::UI::Entry
1027	text => $CFG->{output_count},	1023	text => $CFG->{output_count},
1028	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.",
1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1025	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1030	);	1026	);
1031		1027
1032	$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");
1033	$table->add (1, 10, new CFClient::UI::Entry	1029	$table->add (1, 10, new CFPlus::UI::Entry
1034	text => $CFG->{output_sync},	1030	text => $CFG->{output_sync},
1035	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.",
1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1032	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1037	);	1033	);
1038		1034
1039	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1035	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1040	expand => 1,	1036	expand => 1,
1041	align => 0,	1037	align => 0,
1042	text => "Login",	1038	text => "Login",
1043	on_activate => sub {	1039	on_activate => sub {
1044	$CONN ? stop_game	1040	$CONN ? stop_game
1045	: start_game;	1041	: start_game;
1046	0	1042	0
1047	},	1043	},
1048	);	1044	);
1049		1045
1050	$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");
1051	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1047	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052	text => $CFG->{say_command},	1048	text => $CFG->{say_command},
1053	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "	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. "
1054	. "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. "
1055	. "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.",
1056	on_changed => sub {	1052	on_changed => sub {
…		…
1058	$CFG->{say_command} = $value;	1054	$CFG->{say_command} = $value;
1059	0	1055	0
1060	}	1056	}
1061	);	1057	);
1062		1058
1063	$vbox->add (new CFClient::UI::Label	1059	$vbox->add (new CFPlus::UI::FancyFrame
1064	text => "Server Info",	1060	label => "Server Info",
1065	fontsize => 1.2,
1066	padding_y => 8,
1067	fg => [1, 1, 0, 1],
1068	);
1069
1070	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1061	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1062	);
1071		1063
1072	$vbox	1064	$vbox
1073	}	1065	}
1074		1066
1075	sub message_window {	1067	sub message_window {
1076	my $window = new CFClient::UI::FancyFrame	1068	my $window = new CFPlus::UI::Toplevel
1077	name => "message_window",	1069	name => "message_window",
1078	title => "Messages",	1070	title => "Messages",
1079	border_bg => [1, 1, 1, 1],	1071	border_bg => [1, 1, 1, 1],
1080	x => "max",	1072	x => "max",
1081	y => 0,	1073	y => 0,
1082	force_w => $::WIDTH * 0.4,	1074	force_w => $::WIDTH * 0.4,
1083	force_h => $::HEIGHT * 0.5,	1075	force_h => $::HEIGHT * 0.5,
1084	child => (my $vbox = new CFClient::UI::VBox),	1076	child => (my $vbox = new CFPlus::UI::VBox),
1085	has_close_button => 1;	1077	has_close_button => 1;
1086		1078
1087	$vbox->add ($LOGVIEW);	1079	$vbox->add ($LOGVIEW);
1088		1080
1089	$vbox->add (my $input = new CFClient::UI::Entry	1081	$vbox->add (my $input = new CFPlus::UI::Entry
1090	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> "
1091	. "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>...). "
1092	. "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). "
1093	. "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.",
1094	on_focus_in => sub {	1086	on_focus_in => sub {
…		…
1133	};	1125	};
1134		1126
1135	$window	1127	$window
1136	}	1128	}
1137		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
1138	sub open_quit_dialog {	1149	sub open_quit_dialog {
1139	unless ($QUIT_DIALOG) {	1150	unless ($QUIT_DIALOG) {
1140	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1151	$QUIT_DIALOG = new CFPlus::UI::Toplevel
1141	x => "center",	1152	x => "center",
1142	y => "center",	1153	y => "center",
1143	z => 50,	1154	z => 50,
1144	title => "Really Quit?",	1155	title => "Really Quit?",
1145	on_key_down => sub {	1156	on_key_down => sub {
1146	my ($dialog, $ev) = @_;	1157	my ($dialog, $ev) = @_;
1147	$ev->{sym} == 27 and $dialog->hide;	1158	$ev->{sym} == 27 and $dialog->hide;
1148	}	1159	}
1149	;	1160	;
1150		1161
1151	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1162	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1152		1163
1153	$vb->add (new CFClient::UI::Label	1164	$vb->add (new CFPlus::UI::Label
1154	text => "You should find a savebed and apply it first!",	1165	text => "You should find a savebed and apply it first!",
1155	max_w => $WIDTH * 0.25,	1166	max_w => $WIDTH * 0.25,
1156	ellipsize => 0,	1167	ellipsize => 0,
1157	);	1168	);
1158	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1169	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1159	$hb->add (new CFClient::UI::Button	1170	$hb->add (new CFPlus::UI::Button
1160	text => "Ok",	1171	text => "Ok",
1161	expand => 1,	1172	expand => 1,
1162	on_activate => sub { $QUIT_DIALOG->hide; 0 },	1173	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163	);	1174	);
1164	$hb->add (new CFClient::UI::Button	1175	$hb->add (new CFPlus::UI::Button
1165	text => "Quit anyway",	1176	text => "Quit anyway",
1166	expand => 1,	1177	expand => 1,
1167	on_activate => sub { exit },	1178	on_activate => sub { exit },
1168	);	1179	);
1169	}	1180	}
…		…
1171	$QUIT_DIALOG->show;	1182	$QUIT_DIALOG->show;
1172	$QUIT_DIALOG->grab_focus;	1183	$QUIT_DIALOG->grab_focus;
1173	}	1184	}
1174		1185
1175	sub autopickup_setup {	1186	sub autopickup_setup {
1176	my $table = new CFClient::UI::Table;	1187	my $table = new CFPlus::UI::Table;
1177		1188
1178	for (	1189	for (
1179	["General", 0, 0,	1190	["General", 0, 0,
1180	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1191	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1181	["Inhibit autopickup" => PICKUP_INHIBIT],	1192	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1215	],	1226	],
1216	["Weight/Value ratio", 2, 17]	1227	["Weight/Value ratio", 2, 17]
1217	)	1228	)
1218	{	1229	{
1219	my ($title, $x, $y, @bits) = @$_;	1230	my ($title, $x, $y, @bits) = @$_;
1220	$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]);
1221		1232
1222	for (@bits) {	1233	for (@bits) {
1223	++$y;	1234	++$y;
1224		1235
1225	my $mask = $_->[1];	1236	my $mask = $_->[1];
1226	$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);
1227	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1238	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228	state => $::CFG->{pickup} & $mask,	1239	state => $::CFG->{pickup} & $mask,
1229	on_changed => sub {	1240	on_changed => sub {
1230	my ($box, $value) = @_;	1241	my ($box, $value) = @_;
1231		1242
1232	if ($value) {	1243	if ($value) {
…		…
1243		1254
1244	${$_->[2]} = $checkbox if $_->[2];	1255	${$_->[2]} = $checkbox if $_->[2];
1245	}	1256	}
1246	}	1257	}
1247		1258
1248	$table->add (2, 18, new CFClient::UI::ValSlider	1259	$table->add (2, 18, new CFPlus::UI::ValSlider
1249	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1260	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250	template => ">= 99",	1261	template => ">= 99",
1251	to_value => sub { ">= " . 5 * $_[0] },	1262	to_value => sub { ">= " . 5 * $_[0] },
1252	on_changed => sub {	1263	on_changed => sub {
1253	my ($slider, $value) = @_;	1264	my ($slider, $value) = @_;
…		…
1256	$::CFG->{pickup} |= int $value	1267	$::CFG->{pickup} |= int $value
1257	if $value;	1268	if $value;
1258	1;	1269	1;
1259	});	1270	});
1260		1271
1261	$table->add (3, 18, new CFClient::UI::Button	1272	$table->add (3, 18, new CFPlus::UI::Button
1262	text => "set",	1273	text => "set",
1263	on_activate => sub {	1274	on_activate => sub {
1264	$::CONN->send_command ("pickup $::CFG->{pickup}")	1275	$::CONN->send_command ("pickup $::CFG->{pickup}")
1265	if defined $::CONN;	1276	if defined $::CONN;
1266	0	1277	0
…		…
1281	or $a->{type} <=> $b->{type}	1292	or $a->{type} <=> $b->{type}
1282	} @_ },	1293	} @_ },
1283	);	1294	);
1284		1295
1285	sub inventory_widget {	1296	sub inventory_widget {
1286	my $hb = new CFClient::UI::HBox homogeneous => 1;	1297	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1287		1298
1288	$hb->add (my $vb1 = new CFClient::UI::VBox);	1299	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1289	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1300	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1290		1301
1291	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1302	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1292		1303
1293	use sort 'stable';	1304	use sort 'stable';
1294		1305
1295	$hb1->add (new CFClient::UI::Selector	1306	$hb1->add (new CFPlus::UI::Selector
1296	value => $::CFG->{inv_sort},	1307	value => $::CFG->{inv_sort},
1297	options => [	1308	options => [
1298	[type => "Type/Name"],	1309	[type => "Type/Name"],
1299	[mtime => "Recent/Normal/Locked"],	1310	[mtime => "Recent/Normal/Locked"],
1300	[weight => "Weight/Type"],	1311	[weight => "Weight/Type"],
…		…
1302	on_changed => sub {	1313	on_changed => sub {
1303	$::CFG->{inv_sort} = $_[1];	1314	$::CFG->{inv_sort} = $_[1];
1304	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1315	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1305	},	1316	},
1306	);	1317	);
1307	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1318	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1308	#TODO# update to weigh/maxweight	1319	#TODO# update to weigh/maxweight
1309	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1320	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1310		1321
1311	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1322	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312	$sw1->add ($INV = new CFClient::UI::Inventory);	1323	$sw1->add ($INV = new CFPlus::UI::Inventory);
1313		1324
1314	$hb->add (my $vb2 = new CFClient::UI::VBox);	1325	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1315		1326
1316	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1327	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317		1328
1318	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1329	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319	$sw2->add ($INVR = new CFClient::UI::Inventory);	1330	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1320		1331
1321	# XXX: Call after $INVR = ... because set_opencont sets the items	1332	# XXX: Call after $INVR = ... because set_opencont sets the items
1322	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1333	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1323		1334
1324	$hb	1335	$hb
1325	}	1336	}
1326		1337
1327	sub toggle_player_page {	1338	sub toggle_player_page {
…		…
1334	$PL_WINDOW->show;	1345	$PL_WINDOW->show;
1335	}	1346	}
1336	}	1347	}
1337		1348
1338	sub player_window {	1349	sub player_window {
1339	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1350	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340	x => "center",	1351	x => "center",
1341	y => "center",	1352	y => "center",
1342	force_w => $WIDTH * 9/10,	1353	force_w => $WIDTH * 9/10,
1343	force_h => $HEIGHT * 9/10,	1354	force_h => $HEIGHT * 9/10,
1344	title => "Player",	1355	title => "Player",
…		…
1346	has_close_button => 1	1357	has_close_button => 1
1347	;	1358	;
1348		1359
1349	my $ntb =	1360	my $ntb =
1350	$PL_NOTEBOOK =	1361	$PL_NOTEBOOK =
1351	new CFClient::UI::Notebook expand => 1, debug => 1;	1362	new CFPlus::UI::Notebook expand => 1, debug => 1;
1352		1363
1353	$ntb->add (	1364	$ntb->add (
1354	"Statistics (F2)" => $STATS_PAGE = stats_window,	1365	"Statistics (F2)" => $STATS_PAGE = stats_window,
1355	"Shows statistics, where all your Stats and Resistances are shown."	1366	"Shows statistics, where all your Stats and Resistances are shown."
1356	);	1367	);
1357	$ntb->add (	1368	$ntb->add (
1358	"Skills (F3)" => $SKILL_PAGE = skill_window,	1369	"Skills (F3)" => $SKILL_PAGE = skill_window,
1359	"Shows all your Skills."	1370	"Shows all your Skills."
1360	);	1371	);
1361		1372
1362	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1373	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1374	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1364	$ntb->add (	1375	$ntb->add (
1365	"Spellbook (F4)" => $spellsw,	1376	"Spellbook (F4)" => $spellsw,
1366	"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."
1367	);	1378	);
1368	$ntb->add (	1379	$ntb->add (
…		…
1380	sub update_bindings {	1391	sub update_bindings {
1381	$BIND_UPD_CB->() if $BIND_UPD_CB;	1392	$BIND_UPD_CB->() if $BIND_UPD_CB;
1382	}	1393	}
1383		1394
1384	sub keyboard_setup {	1395	sub keyboard_setup {
1385	my $binding_list = new CFClient::UI::VBox;	1396	my $binding_list = new CFPlus::UI::VBox;
1386		1397
1387	my $refresh;	1398	my $refresh;
1388	$refresh = $BIND_UPD_CB = sub {	1399	$refresh = $BIND_UPD_CB = sub {
1389	$binding_list->clear ();	1400	$binding_list->clear ();
1390		1401
…		…
1392	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1403	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1393	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1404	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1394	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1405	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395		1406
1396	my $lbl = join "; ", @$cmds;	1407	my $lbl = join "; ", @$cmds;
1397	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1408	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1398	$binding_list->add (my $hb = new CFClient::UI::HBox);	1409	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1399	$hb->add (new CFClient::UI::Button	1410	$hb->add (new CFPlus::UI::Button
1400	text => "delete",	1411	text => "delete",
1401	tooltip => "Deletes the binding",	1412	tooltip => "Deletes the binding",
1402	on_activate => sub {	1413	on_activate => sub {
1403	$binding_list->remove ($hb);	1414	$binding_list->remove ($hb);
1404	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1415	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405	0	1416	0
1406	});	1417	});
1407		1418
1408	$hb->add (new CFClient::UI::Button	1419	$hb->add (new CFPlus::UI::Button
1409	text => "edit",	1420	text => "edit",
1410	tooltip => "Edits the binding",	1421	tooltip => "Edits the binding",
1411	on_activate => sub {	1422	on_activate => sub {
1412	$::BIND_EDITOR->set_binding (	1423	$::BIND_EDITOR->set_binding (
1413	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1424	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
…		…
1426	$::BIND_EDITOR->show;	1437	$::BIND_EDITOR->show;
1427	$SETUP_DIALOG->hide;	1438	$SETUP_DIALOG->hide;
1428	0	1439	0
1429	});	1440	});
1430		1441
1431	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1442	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1432	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1443	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1433	}	1444	}
1434	}	1445	}
1435	};	1446	};
1436		1447
1437	my $vb = new CFClient::UI::VBox;	1448	my $vb = new CFPlus::UI::VBox;
1438	$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	);
1439	$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");
1440	$hb->add (new CFClient::UI::CheckBox	1454	$hb->add (new CFPlus::UI::CheckBox
1441	expand => 1,	1455	expand => 1,
1442	state => $CFG->{shift_fire_stop},	1456	state => $CFG->{shift_fire_stop},
1443	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",
1444	on_changed => sub {	1458	on_changed => sub {
1445	my ($cbox, $value) = @_;	1459	my ($cbox, $value) = @_;
1446	$CFG->{shift_fire_stop} = $value;	1460	$CFG->{shift_fire_stop} = $value;
1447	0	1461	0
1448	});	1462	});
1449		1463
1450	$vb->add ($binding_list);	1464	$vb->add (new CFPlus::UI::FancyFrame
		1465	label => "Bindings",
		1466	child => $binding_list);
1451	$vb->add (my $hb = new CFClient::UI::HBox);	1467	$vb->add (my $hb = new CFPlus::UI::HBox);
1452		1468
1453	$hb->add (new CFClient::UI::Button	1469	$hb->add (new CFPlus::UI::Button
1454	text => "record new",	1470	text => "record new",
1455	expand => 1,	1471	expand => 1,
1456	tooltip => "This button opens the binding editor with an empty binding.",	1472	tooltip => "This button opens the binding editor with an empty binding.",
1457	on_activate => sub {	1473	on_activate => sub {
1458	$::BIND_EDITOR->set_binding (undef, undef, [],	1474	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1472	$::BIND_EDITOR->show;	1488	$::BIND_EDITOR->show;
1473	0	1489	0
1474	},	1490	},
1475	);	1491	);
1476		1492
1477	$hb->add (new CFClient::UI::Button	1493	$hb->add (new CFPlus::UI::Button
1478	text => "close",	1494	text => "close",
1479	tooltip => "Closes the binding window",	1495	tooltip => "Closes the binding window",
1480	expand => 1,	1496	expand => 1,
1481	on_activate => sub {	1497	on_activate => sub {
1482	$SETUP_DIALOG->hide;	1498	$SETUP_DIALOG->hide;
…		…
1488		1504
1489	$vb	1505	$vb
1490	}	1506	}
1491		1507
1492	sub help_window {	1508	sub help_window {
1493	my $win = new CFClient::UI::FancyFrame	1509	my $win = new CFPlus::UI::Toplevel
1494	x => 'center',	1510	x => 'center',
1495	y => 'center',	1511	y => 'center',
1496	z => 2,	1512	z => 2,
1497	name => 'doc_browser',	1513	name => 'doc_browser',
1498	force_w => int $WIDTH * 7/8,	1514	force_w => int $WIDTH * 7/8,
1499	force_h => int $HEIGHT * 7/8,	1515	force_h => int $HEIGHT * 7/8,
1500	title => "Help Browser",	1516	title => "Help Browser",
1501	has_close_button => 1;	1517	has_close_button => 1;
1502		1518
1503	$win->add (my $vbox = new CFClient::UI::VBox);	1519	$win->add (my $vbox = new CFPlus::UI::VBox);
1504		1520
1505	$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	);
1506	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1525	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507	expand => 1, fontsize => 0.8, padding_x => 4);	1526	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508		1527
1509	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1528	my @history;
1510	$buttons->add (my $combo = new CFClient::UI::Selector	1529	my @future;
1511	value => undef,	1530	my $curnode;
1512	options => [	1531
1513	[intro => "Introduction"],	1532	my $load_node; $load_node = sub {
1514	[manual => "Main Manual"],	1533	my ($node, $para) = @_;
1515	[skill_help => "Skill Reference"],	1534
1516	[command_help => "Command Reference"],	1535	$buttons->clear;
1517	[dmcommand_help => "DM Commands"],	1536
1518	[COPYING => "License Terms"],	1537	$buttons->add (new CFPlus::UI::Button
1519	],	1538	text => "⇤",
		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	$viewer->clear;	1543	@history = ();
1524	$viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod });	1544	$load_node->(@{shift @future});
1525	$viewer->set_offset (0);
1526
1527	0	1545	},
		1546	);
		1547
		1548	if (@history) {
		1549	$buttons->add (new CFPlus::UI::Button
		1550	text => "⋘",
		1551	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1552	on_activate => sub {
		1553	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1554	$load_node->(@{pop @history});
		1555	},
		1556	);
1528	},	1557	}
1529	on_visibility_change => sub {	1558
1530	my ($self, $visible) = @_;	1559	if (@future) {
1531	return unless $visible;	1560	$buttons->add (new CFPlus::UI::Button
1532	return if $self->{value};	1561	text => "⋙",
1533	$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	},
1534	0	1567	);
1535	},	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);
1536	);	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	};
1537		1606
1538	$win	1607	$win
1539	}	1608	}
1540		1609
1541	sub sdl_init {	1610	sub sdl_init {
1542	CFClient::SDL_Init	1611	CFPlus::SDL_Init
1543	and die "SDL::Init failed!\n";	1612	and die "SDL::Init failed!\n";
1544	}	1613	}
1545		1614
1546	sub video_init {	1615	sub video_init {
1547	sdl_init;	1616	sdl_init;
…		…
1552		1621
1553	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1622	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1554	$FULLSCREEN = $CFG->{fullscreen};	1623	$FULLSCREEN = $CFG->{fullscreen};
1555	$FAST = $CFG->{fast};	1624	$FAST = $CFG->{fast};
1556		1625
1557	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1626	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1558	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1627	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1559		1628
1560	$SDL_ACTIVE = 1;	1629	$SDL_ACTIVE = 1;
1561	$LAST_REFRESH = time - 0.01;	1630	$LAST_REFRESH = time - 0.01;
1562		1631
1563	CFClient::OpenGL::init;	1632	CFPlus::OpenGL::init;
1564		1633
1565	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1634	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1566		1635
1567	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1636	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1568		1637
1569	#############################################################################	1638	#############################################################################
1570		1639
1571	if ($DEBUG_STATUS) {	1640	if ($DEBUG_STATUS) {
1572	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1641	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1573	} else {	1642	} else {
1574	# create the widgets	1643	# create the widgets
1575		1644
1576	$DEBUG_STATUS = new CFClient::UI::Label	1645	$DEBUG_STATUS = new CFPlus::UI::Label
1577	padding => 0,	1646	padding => 0,
1578	z => 100,	1647	z => 100,
1579	force_x => "max",	1648	force_x => "max",
1580	force_y => 0;	1649	force_y => 0;
1581	$DEBUG_STATUS->show;	1650	$DEBUG_STATUS->show;
1582		1651
1583	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1652	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1584		1653
1585	$STATUSBOX = new CFClient::UI::Statusbox;	1654	$STATUSBOX = new CFPlus::UI::Statusbox;
1586	$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]);
1587		1656
1588	(new CFClient::UI::Frame	1657	(new CFPlus::UI::Frame
1589	bg => [0, 0, 0, 0.4],	1658	bg => [0, 0, 0, 0.4],
1590	force_x => 0,	1659	force_x => 0,
1591	force_y => "max",	1660	force_y => "max",
1592	child => $STATUSBOX,	1661	child => $STATUSBOX,
1593	)->show;	1662	)->show;
1594		1663
1595	CFClient::UI::FancyFrame->new (	1664	CFPlus::UI::Toplevel->new (
1596	title => "Map",	1665	title => "Map",
1597	name => "mapmap",	1666	name => "mapmap",
1598	x => 0,	1667	x => 0,
1599	y => $FONTSIZE + 8,	1668	y => $FONTSIZE + 8,
1600	border_bg => [1, 1, 1, 192/255],	1669	border_bg => [1, 1, 1, 192/255],
1601	bg => [1, 1, 1, 0],	1670	bg => [1, 1, 1, 0],
1602	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1671	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1603	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.",
1604	),	1673	),
1605	)->show;	1674	)->show;
1606		1675
1607	$MAPWIDGET = new CFClient::MapWidget;	1676	$MAPWIDGET = new CFPlus::MapWidget;
1608	$MAPWIDGET->connect (activate_console => sub {	1677	$MAPWIDGET->connect (activate_console => sub {
1609	my ($mapwidget, $preset) = @_;	1678	my ($mapwidget, $preset) = @_;
1610		1679
1611	if ($CONSOLE) {	1680	if ($CONSOLE) {
1612	$CONSOLE->{input}->{auto_activated} = 1;	1681	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1618	}	1687	}
1619	});	1688	});
1620	$MAPWIDGET->show;	1689	$MAPWIDGET->show;
1621	$MAPWIDGET->grab_focus;	1690	$MAPWIDGET->grab_focus;
1622		1691
1623	$LOGVIEW = new CFClient::UI::TextScroller	1692	$LOGVIEW = new CFPlus::UI::TextScroller
1624	expand => 1,	1693	expand => 1,
1625	font => $FONT_FIXED,	1694	font => $FONT_FIXED,
1626	fontsize => $::CFG->{log_fontsize},	1695	fontsize => $::CFG->{log_fontsize},
1627	indent => -4,	1696	indent => -4,
1628	can_hover => 1,	1697	can_hover => 1,
1629	can_events => 1,	1698	can_events => 1,
1630	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.",
1631	;	1700	;
1632		1701
1633	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1702	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1634	title => "Setup",	1703	title => "Setup",
1635	name => "setup_dialog",	1704	name => "setup_dialog",
1636	x => 'center',	1705	x => 'center',
1637	y => 'center',	1706	y => 'center',
1638	z => 2,	1707	z => 2,
…		…
1641	has_close_button => 1,	1710	has_close_button => 1,
1642	;	1711	;
1643		1712
1644	$METASERVER = metaserver_dialog;	1713	$METASERVER = metaserver_dialog;
1645		1714
1646	$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,
1647	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1716	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1648		1717
1649	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1718	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1650	"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.");
1651	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1720	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1652	"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.");
…		…
1662	. "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 "
1663	. "binding editor closes");	1732	. "binding editor closes");
1664	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1733	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1665	"Some debuggin' options. Do not ask.");	1734	"Some debuggin' options. Do not ask.");
1666		1735
1667	$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
1668		1737
1669	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1738	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1670	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.");
1671		1740
1672	$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,
1673	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.");
1674		1743
1675	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	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
1676		1745
1677	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1746	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1678	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.");
1679		1748
1680	$BUTTONBAR->add (new CFClient::UI::Button	1749	$BUTTONBAR->add (new CFPlus::UI::Button
1681	text => "Save Config",	1750	text => "Save Config",
1682	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.",
1683	on_activate => sub {	1752	on_activate => sub {
1684	$::CFG->{layout} = CFClient::UI::get_layout;	1753	$::CFG->{layout} = CFPlus::UI::get_layout;
1685	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1754	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1686	status "Configuration Saved";	1755	status "Configuration Saved";
1687	0	1756	0
1688	},	1757	},
1689	);	1758	);
1690		1759
1691	$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,
1692	tooltip => "View Documentation");	1761	tooltip => "View Documentation");
1693		1762
1694	$BUTTONBAR->add (new CFClient::UI::Button	1763	$BUTTONBAR->add (new CFPlus::UI::Button
1695	text => "Quit",	1764	text => "Quit",
1696	tooltip => "Terminates the program",	1765	tooltip => "Terminates the program",
1697	on_activate => sub {	1766	on_activate => sub {
1698	if ($CONN) {	1767	if ($CONN) {
1699	open_quit_dialog;	1768	open_quit_dialog;
…		…
1710		1779
1711	$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]);
1712	}	1781	}
1713		1782
1714	sub video_shutdown {	1783	sub video_shutdown {
1715	CFClient::OpenGL::shutdown;	1784	CFPlus::OpenGL::shutdown;
1716		1785
1717	undef $SDL_ACTIVE;	1786	undef $SDL_ACTIVE;
1718	}	1787	}
1719		1788
1720	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	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#
…		…
1728		1797
1729	sub audio_music_finished {	1798	sub audio_music_finished {
1730	return unless $CFG->{bgm_enable};	1799	return unless $CFG->{bgm_enable};
1731		1800
1732	# TODO: hack, do play loop and mood music	1801	# TODO: hack, do play loop and mood music
1733	$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]";
1734	$bgmusic->play (0);	1803	$bgmusic->play (0);
1735		1804
1736	push @bgmusic, shift @bgmusic;	1805	push @bgmusic, shift @bgmusic;
1737	}	1806	}
1738		1807
1739	sub audio_init {	1808	sub audio_init {
1740	if ($CFG->{audio_enable}) {	1809	if ($CFG->{audio_enable}) {
1741	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1810	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1742	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1811	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1743		1812
1744	unless ($SDL_MIXER) {	1813	unless ($SDL_MIXER) {
1745	status "Unable to open sound device: there will be no sound";	1814	status "Unable to open sound device: there will be no sound";
1746	return;	1815	return;
1747	}	1816	}
1748		1817
1749	CFClient::Mix_AllocateChannels 8;	1818	CFPlus::Mix_AllocateChannels 8;
1750	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1819	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1751		1820
1752	audio_music_finished;	1821	audio_music_finished;
1753		1822
1754	while (<$fh>) {	1823	while (<$fh>) {
1755	next if /^\s*#/;	1824	next if /^\s*#/;
…		…
1758	my ($file, $volume, $event) = split /\s+/, $_, 3;	1827	my ($file, $volume, $event) = split /\s+/, $_, 3;
1759		1828
1760	push @SOUNDS, "$volume,$file";	1829	push @SOUNDS, "$volume,$file";
1761		1830
1762	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1831	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1763	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";
1764	$chunk->volume ($volume * 128 / 100);	1833	$chunk->volume ($volume * 128 / 100);
1765	$chunk	1834	$chunk
1766	};	1835	};
1767	}	1836	}
1768	} else {	1837	} else {
…		…
1770	}	1839	}
1771	}	1840	}
1772	}	1841	}
1773		1842
1774	sub audio_shutdown {	1843	sub audio_shutdown {
1775	CFClient::Mix_CloseAudio if $SDL_MIXER;	1844	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1776	undef $SDL_MIXER;	1845	undef $SDL_MIXER;
1777	@SOUNDS = ();	1846	@SOUNDS = ();
1778	%AUDIO_CHUNKS = ();	1847	%AUDIO_CHUNKS = ();
1779	}	1848	}
1780		1849
…		…
1787		1856
1788	sub force_refresh {	1857	sub force_refresh {
1789	$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;
1790	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1859	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1791		1860
1792	$CFClient::UI::ROOT->draw;	1861	$CFPlus::UI::ROOT->draw;
1793		1862
1794	$WANT_REFRESH = 0;	1863	$WANT_REFRESH = 0;
1795	$CAN_REFRESH = 0;	1864	$CAN_REFRESH = 0;
1796	$LAST_REFRESH = $NOW;	1865	$LAST_REFRESH = $NOW;
1797		1866
1798	CFClient::SDL_GL_SwapBuffers;	1867	CFPlus::SDL_GL_SwapBuffers;
1799	}	1868	}
1800		1869
1801	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 {
1802	$NOW = time;	1871	$NOW = time;
1803		1872
1804	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1873	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1805	for CFClient::SDL_PollEvent;	1874	for CFPlus::SDL_PollEvent;
1806		1875
1807	if (%animate_object) {	1876	if (%animate_object) {
1808	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1877	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1809	$WANT_REFRESH++;	1878	$WANT_REFRESH++;
1810	}	1879	}
…		…
1834	$CONN->face_prefetch	1903	$CONN->face_prefetch
1835	if $CONN;	1904	if $CONN;
1836	});	1905	});
1837		1906
1838	%SDL_CB = (	1907	%SDL_CB = (
1839	CFClient::SDL_QUIT => sub {	1908	CFPlus::SDL_QUIT => sub {
1840	Event::unloop -1;	1909	Event::unloop -1;
1841	},	1910	},
1842	CFClient::SDL_VIDEORESIZE => sub {	1911	CFPlus::SDL_VIDEORESIZE => sub {
1843	},	1912	},
1844	CFClient::SDL_VIDEOEXPOSE => sub {	1913	CFPlus::SDL_VIDEOEXPOSE => sub {
1845	CFClient::UI::full_refresh;	1914	CFPlus::UI::full_refresh;
1846	},	1915	},
1847	CFClient::SDL_ACTIVEEVENT => sub {	1916	CFPlus::SDL_ACTIVEEVENT => sub {
1848	# 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#
1849	},	1918	},
1850	CFClient::SDL_KEYDOWN => sub {	1919	CFPlus::SDL_KEYDOWN => sub {
1851	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1920	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1852	# alt-enter	1921	# alt-enter
1853	$FULLSCREEN_ENABLE->toggle;	1922	$FULLSCREEN_ENABLE->toggle;
1854	video_shutdown;	1923	video_shutdown;
1855	video_init;	1924	video_init;
1856	} else {	1925	} else {
1857	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1926	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1858	}	1927	}
1859	},	1928	},
1860	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1929	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1861	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1930	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1862	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1931	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1863	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1932	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1864	CFClient::SDL_USEREVENT => sub {	1933	CFPlus::SDL_USEREVENT => sub {
1865	if ($_[0]{code} == 1) {	1934	if ($_[0]{code} == 1) {
1866	audio_channel_finished $_[0]{data1};	1935	audio_channel_finished $_[0]{data1};
1867	} elsif ($_[0]{code} == 0) {	1936	} elsif ($_[0]{code} == 0) {
1868	audio_music_finished;	1937	audio_music_finished;
1869	}	1938	}
…		…
1873	#############################################################################	1942	#############################################################################
1874		1943
1875	$SIG{INT} = $SIG{TERM} = sub { exit };	1944	$SIG{INT} = $SIG{TERM} = sub { exit };
1876		1945
1877	{	1946	{
1878	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1947	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1879	CFClient::UI::set_layout ($::CFG->{layout});	1948	CFPlus::UI::set_layout ($::CFG->{layout});
1880		1949
1881	my %DEF_CFG = (	1950	my %DEF_CFG = (
1882	sdl_mode => 0,	1951	sdl_mode => 0,
1883	width => 640,	1952	width => 640,
1884	height => 480,	1953	height => 480,
…		…
1914		1983
1915	sdl_init;	1984	sdl_init;
1916		1985
1917	@SDL_MODES = reverse	1986	@SDL_MODES = reverse
1918	grep $_->[0] >= 640 && $_->[1] >= 480,	1987	grep $_->[0] >= 640 && $_->[1] >= 480,
1919	CFClient::SDL_ListModes;	1988	CFPlus::SDL_ListModes;
1920		1989
1921	@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)";
1922		1991
1923	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1992	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1924		1993
1925	{	1994	{
1926	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1995	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1927	DejaVuSans.ttf	1996	DejaVuSans.ttf
1928	DejaVuSansMono.ttf	1997	DejaVuSansMono.ttf
1929	DejaVuSans-Bold.ttf	1998	DejaVuSans-Bold.ttf
1930	DejaVuSansMono-Bold.ttf	1999	DejaVuSansMono-Bold.ttf
1931	DejaVuSans-Oblique.ttf	2000	DejaVuSans-Oblique.ttf
1932	DejaVuSansMono-Oblique.ttf	2001	DejaVuSansMono-Oblique.ttf
1933	DejaVuSans-BoldOblique.ttf	2002	DejaVuSans-BoldOblique.ttf
1934	DejaVuSansMono-BoldOblique.ttf	2003	DejaVuSansMono-BoldOblique.ttf
1935	);	2004	);
1936		2005
1937	CFClient::add_font $_ for @fonts;	2006	CFPlus::add_font $_ for @fonts;
1938		2007
1939	CFClient::pango_init;	2008	CFPlus::pango_init;
1940		2009
1941	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2010	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1942	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2011	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1943		2012
1944	$FONT_PROP->make_default;	2013	$FONT_PROP->make_default;
1945	}	2014	}
1946		2015
1947	# compare mono (ft) vs. rgba (cairo)	2016	# compare mono (ft) vs. rgba (cairo)
1948	# ft - 1.8s, cairo 3s, even in alpha-only mode	2017	# ft - 1.8s, cairo 3s, even in alpha-only mode
1949	# for my $rgba (0..1) {	2018	# for my $rgba (0..1) {
1950	# my $t1 = Time::HiRes::time;	2019	# my $t1 = Time::HiRes::time;
1951	# for (1..1000) {	2020	# for (1..1000) {
1952	# my $layout = CFClient::Layout->new ($rgba);	2021	# my $layout = CFPlus::Layout->new ($rgba);
1953	# $layout->set_text ("hallo" x 100);	2022	# $layout->set_text ("hallo" x 100);
1954	# $layout->render;	2023	# $layout->render;
1955	# }	2024	# }
1956	# my $t2 = Time::HiRes::time;	2025	# my $t2 = Time::HiRes::time;
1957	# warn $t2-$t1;	2026	# warn $t2-$t1;
…		…
1960	video_init;	2029	video_init;
1961	audio_init;	2030	audio_init;
1962	}	2031	}
1963		2032
1964	Event::loop;	2033	Event::loop;
1965	#CFClient::SDL_Quit;	2034	#CFPlus::SDL_Quit;
1966	#CFClient::_exit 0;	2035	#CFPlus::_exit 0;
1967		2036
1968	END { CFClient::SDL_Quit }	2037	END { CFPlus::SDL_Quit }
1969		2038
1970	=head1 NAME	2039	=head1 NAME
1971		2040
1972	cfplus - A Crossfire+ and Crossfire game client	2041	cfplus - A Crossfire+ and Crossfire game client
1973		2042

Diff Legend

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