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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.104 by root, Sun Jul 30 13:14:15 2006 UTC

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

Diff Legend

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