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.67 by root, Sun Jun 11 18:36:15 2006 UTC vs.
Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC

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

Diff Legend

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