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.69 by root, Mon Jun 12 13:26:15 2006 UTC vs.
Revision 1.103 by root, Mon Jul 24 08:23:28 2006 UTC

…		…
36		36
37	use CFClient;	37	use CFClient;
38	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
39	use CFClient::Protocol;	39	use CFClient::Protocol;
40	use CFClient::UI;	40	use CFClient::UI;
		41	use CFClient::Pod;
		42	use CFClient::BindingEditor;
41	use CFClient::MapWidget;	43	use CFClient::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	CFClient::error $_[1];
49	};	53	};
50		54
51	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	55	$SIG{__DIE__} = sub {
		56	return if CFClient::in_destruct;
		57	Carp::cluck $_[0];
		58	CFClient::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 (CFClient::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	}
…		…
155	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFClient::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 CFClient::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} = "Press a key (click on the entry to make sure it has keyboard 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 CFClient::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 CFClient::UI::Table;
184		206
185	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFClient::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 CFClient::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 CFClient::UI::Label
201	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
202	ellipsise => 0,	226	ellipsise => 0,
203	markup =>	227	markup =>
204	"<big><b>Character Creation: Race</b></big>\n\n"	228	"<big><b>Character Creation: Race</b></big>\n\n"
205	. "Look at the <b>Messages</b> window to see a description of this race "	229	. "Look at the <b>Messages</b> window to see a description of this race "
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 "	230	. "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"	231	. "(<small>below this dialog window: you may need to move the dialog away and "
		232	. "click into the display area to make it visible</small>).\n\n"
209	. "You can look at another race, or accept this race (you will come back to this race eventually, "	233	. "You can look at another race, or accept this race (you will cycle back to "
210	. "so you can take your time making this important choice."	234	. "this race eventually, so you can take your time making this important choice."
211	;	235	;
212		236
213	} elsif ($prompt =~ /roll new stats/) {	237	} elsif ($prompt =~ /roll new stats/) {
214	if (my $stat = delete $conn->{stat_change_with}) {	238	if (my $stat = delete $conn->{stat_change_with}) {
215	$conn->send ("reply $stat");	239	$conn->send ("reply $stat");
216	destroy_query_dialog $conn;	240	destroy_query_dialog $conn;
217	return;	241	return;
218	}	242	}
219		243
220	$STATS_WINDOW->show;	244	$STATS_PAGE->show;
221	$MESSAGE_WINDOW->hide;	245	$MESSAGE_WINDOW->hide;
222		246
223	unshift @dialog, new CFClient::UI::Label	247	unshift @dialog, new CFClient::UI::Label
224	max_w => $::WIDTH * 0.4,	248	max_w => $::WIDTH * 0.4,
225	ellipsise => 0,	249	ellipsise => 0,
226	markup => "\nOr use your keyboard:\n";	250	markup => "\nOr use your keyboard and the text entry below:\n";
227		251
228	unshift @dialog, my $table = new CFClient::UI::Table;	252	unshift @dialog, my $table = new CFClient::UI::Table;
229		253
230	# left: re-roll	254	# left: re-roll
231	$table->add (0, 0, new CFClient::UI::Button	255	$table->add (0, 0, new CFClient::UI::Button
232	text => "Roll Again",	256	text => "Roll Again",
233	on_activate => sub {	257	on_activate => sub {
234	$conn->send ("reply y");	258	$conn->send ("reply y");
235	destroy_query_dialog $conn;	259	destroy_query_dialog $conn;
		260	0
236	},	261	},
237	);	262	);
238		263
239	# center: swap stats	264	# center: swap stats
240	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	265	my ($sw1, $sw2) = map +(new CFClient::UI::Selector
		266	expand => 1,
241	value => $_,	267	value => $_,
242	options => [	268	options => [
243	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],	271	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
…		…
254	text => "Swap Stats",	280	text => "Swap Stats",
255	on_activate => sub {	281	on_activate => sub {
256	$conn->{stat_change_with} = $sw2->{value};	282	$conn->{stat_change_with} = $sw2->{value};
257	$conn->send ("reply $sw1->{value}");	283	$conn->send ("reply $sw1->{value}");
258	destroy_query_dialog $conn;	284	destroy_query_dialog $conn;
		285	0
259	},	286	},
260	);	287	);
261	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	288	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262		289
263	# right: accept	290	# right: accept
264	$table->add (4, 0, new CFClient::UI::Button	291	$table->add (4, 0, new CFClient::UI::Button
265	text => "Accept",	292	text => "Accept",
266	on_activate => sub {	293	on_activate => sub {
267	$conn->send ("reply n");	294	$conn->send ("reply n");
268	$STATS_WINDOW->hide;	295	$STATS_PAGE->hide;
269	destroy_query_dialog $conn;	296	destroy_query_dialog $conn;
		297	0
270	},	298	},
271	);	299	);
		300
		301	unshift @dialog, my $hbox = new CFClient::UI::HBox;
		302	for (
		303	[Str => CS_STAT_STR],
		304	[Dex => CS_STAT_DEX],
		305	[Con => CS_STAT_CON],
		306	[Int => CS_STAT_INT],
		307	[Wis => CS_STAT_WIS],
		308	[Pow => CS_STAT_POW],
		309	[Cha => CS_STAT_CHA],
		310	) {
		311	my ($name, $id) = @$_;
		312	$hbox->add (new CFClient::UI::Label
		313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		314	align => 0,
		315	expand => 1,
		316	can_events => 1,
		317	can_hover => 1,
		318	tooltip => $CFClient::STAT_TOOLTIP{$name},
		319	);
		320	}
272		321
273	unshift @dialog, new CFClient::UI::Label	322	unshift @dialog, new CFClient::UI::Label
274	max_w => $::WIDTH * 0.4,	323	max_w => $::WIDTH * 0.4,
275	ellipsise => 0,	324	ellipsise => 0,
276	markup =>	325	markup =>
277	"<big><b>Character Creation: Stats</b></big>\n\n"	326	"<big><b>Character Creation: Stats</b></big>\n\n"
278	. "Look at the <b>Stats</b> window to see your basic stats "	327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
279	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"	328	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
		329	. "They will be modified later by both the race and the class you choose.\n\n"
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. "	330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
281	. "Race selection will influence those values later on."
282	;	331	;
283	}	332	}
284		333
285	push @dialog, my $entry = new CFClient::UI::Entry	334	push @dialog, my $entry = new CFClient::UI::Entry
286	on_changed => sub {	335	on_changed => sub {
287	$conn->send ("reply $_[1]");	336	$conn->send ("reply $_[1]");
288	destroy_query_dialog $conn;	337	destroy_query_dialog $conn;
		338	0
289	},	339	},
290	;	340	;
291		341
292	$entry->focus_in;	342	$entry->grab_focus;
293		343
294	} else {	344	} else {
295	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	345	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296		346
297	push @dialog, my $entry = new CFClient::UI::Entry	347	push @dialog, my $entry = new CFClient::UI::Entry
298	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299	on_activate => sub {	349	on_activate => sub {
300	$conn->send ("reply $_[1]");	350	$conn->send ("reply $_[1]");
301	destroy_query_dialog $conn;	351	destroy_query_dialog $conn;
		352	0
302	},	353	},
303	;	354	;
304		355
305	$entry->focus_in;	356	$entry->grab_focus;
306	}	357	}
307		358
308	$vbox->add (@dialog);	359	$vbox->add (@dialog);
309	$dialog->show;	360	$dialog->show;
310	}	361	}
…		…
315	$LOGIN_BUTTON->set_text ("Logout");	366	$LOGIN_BUTTON->set_text ("Logout");
316	$SETUP_DIALOG->hide;	367	$SETUP_DIALOG->hide;
317		368
318	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	369	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
319		370
320	my ($host, $port) = split /:/, $CFG->{host};	371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
321		372
322	$MAP = new CFClient::Map $mapsize, $mapsize;	373	$MAP = new CFClient::Map $mapsize, $mapsize;
323		374
324	$CONN = eval {	375	$CONN = eval {
325	new CFClient::Protocol	376	new CFClient::Protocol
326	host => $host,	377	host => $host,
327	port => $port || 13327,	378	port => $port || 13327,
328	user => $CFG->{user},	379	user => $CFG->{profile}{default}{user},
329	pass => $CFG->{password},	380	pass => $CFG->{profile}{default}{password},
330	mapw => $mapsize,	381	mapw => $mapsize,
331	maph => $mapsize,	382	maph => $mapsize,
332		383
333	map_widget => $MAPWIDGET,	384	map_widget => $MAPWIDGET,
334	logview => $LOGVIEW,	385	logview => $LOGVIEW,
…		…
362		413
363	sub stop_game {	414	sub stop_game {
364	$LOGIN_BUTTON->set_text ("Login");	415	$LOGIN_BUTTON->set_text ("Login");
365	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	416	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366	$SETUP_DIALOG->show;	417	$SETUP_DIALOG->show;
367	$INV_WINDOW->hide;	418	$PL_WINDOW->hide;
368	$SETUP_SPELLS->clear_spells;	419	$SPELL_PAGE->clear_spells;
369		420
370	return unless $CONN;	421	return unless $CONN;
371		422
372	status "connection closed";	423	status "connection closed";
373		424
374	destroy_query_dialog $CONN;	425	destroy_query_dialog $CONN;
375	$CONN->destroy;	426	$CONN->destroy;
376	$CONN = 0; # false, does not autovivify	427	$CONN = 0; # false, does not autovivify
		428
		429	undef $MAP;
377	}	430	}
378		431
379	sub graphics_setup {	432	sub graphics_setup {
380	my $vbox = new CFClient::UI::VBox;	433	my $vbox = new CFClient::UI::VBox;
381		434
…		…
396	$mode_slider->emit (changed => $mode_slider->{range}[0]);	449	$mode_slider->emit (changed => $mode_slider->{range}[0]);
397		450
398	my $row = 1;	451	my $row = 1;
399		452
400	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	453	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
401	$table->add (1, $row++, new CFClient::UI::CheckBox	454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
402	state => $CFG->{fullscreen},	455	state => $CFG->{fullscreen},
403	tooltip => "Bring the client into fullscreen mode.",	456	tooltip => "Bring the client into fullscreen mode.",
404	on_changed => sub {	457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
405	my ($self, $value) = @_;
406	$CFG->{fullscreen} = $value;
407	}
408	);	458	);
409		459
410	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	460	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
411	$table->add (1, $row++, new CFClient::UI::CheckBox	461	$table->add (1, $row++, new CFClient::UI::CheckBox
412	state => $CFG->{fast},	462	state => $CFG->{fast},
413	tooltip => "Lower the visual quality considerably to speed up rendering.",	463	tooltip => "Lower the visual quality considerably to speed up rendering.",
414	on_changed => sub {	464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
415	my ($self, $value) = @_;
416	$CFG->{fast} = $value;
417	}
418	);	465	);
419		466
420	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	467	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
421	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFClient::UI::Slider
422	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
423	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
424	on_changed => sub {	471	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
425	my ($self, $value) = @_;
426	$CFG->{map_scale} = 2 ** $value;
427	}
428	);	472	);
429		473
430	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	474	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
431	$table->add (1, $row++, new CFClient::UI::CheckBox	475	$table->add (1, $row++, new CFClient::UI::CheckBox
432	state => $CFG->{fow_enable},	476	state => $CFG->{fow_enable},
433	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	477	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
434	on_changed => sub {	478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
435	my ($self, $value) = @_;
436	$CFG->{fow_enable} = $value;
437	}
438	);	479	);
439		480
440	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	481	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
441	$table->add (1, $row++, new CFClient::UI::Slider	482	$table->add (1, $row++, new CFClient::UI::Slider
442	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
443	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	484	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
444	on_changed => sub {	485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
445	my ($self, $value) = @_;
446	$CFG->{fow_intensity} = $value;
447	}
448	);	486	);
449		487
450	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	488	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
451	$table->add (1, $row++, new CFClient::UI::CheckBox	489	$table->add (1, $row++, new CFClient::UI::CheckBox
452	state => $CFG->{fow_smooth},	490	state => $CFG->{fow_smooth},
453	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	491	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
454	on_changed => sub {	492	on_changed => sub {
455	my ($self, $value) = @_;	493	my ($self, $value) = @_;
456	$CFG->{fow_smooth} = $value;	494	$CFG->{fow_smooth} = $value;
457	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	495	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		496	0
458	}	497	}
459	);	498	);
460		499
461	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	500	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
462	$table->add (1, $row++, new CFClient::UI::Slider	501	$table->add (1, $row++, new CFClient::UI::Slider
463	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
464	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	503	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
465	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
466	);	505	);
467		506
468	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	507	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
469	$table->add (1, $row++, new CFClient::UI::Slider	508	$table->add (1, $row++, new CFClient::UI::Slider
470	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
471	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	510	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
472	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
473	);
474
475	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
476
477	$table->add (1, $row++, new CFClient::UI::Slider
478	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
479	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
480	on_changed => sub {
481	$CFG->{stat_fontsize} = $_[1];
482	&set_stats_window_fontsize;
483	}
484	);	512	);
485		513
486	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	514	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487	$table->add (1, $row++, new CFClient::UI::Slider	515	$table->add (1, $row++, new CFClient::UI::Slider
488	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	517	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490	on_changed => sub {	518	on_changed => sub {
491	$CFG->{gauge_fontsize} = $_[1];	519	$CFG->{gauge_fontsize} = $_[1];
492	&set_gauge_window_fontsize;	520	&set_gauge_window_fontsize;
		521	0
493	}	522	}
494	);	523	);
495		524
496	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	525	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
497	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFClient::UI::Slider
498	range => [$CFG->{gauge_size}, 0.2, 0.8],	527	range => [$CFG->{gauge_size}, 0.2, 0.8],
499	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	528	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
500	on_changed => sub {	529	on_changed => sub {
501	$CFG->{gauge_size} = $_[1];	530	$CFG->{gauge_size} = $_[1];
502	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		532	0
503	}	533	}
504	);	534	);
505		535
506	$table->add (1, $row++, new CFClient::UI::Button	536	$table->add (1, $row++, new CFClient::UI::Button
507	expand => 1, align => 0, text => "Apply",	537	expand => 1, align => 0, text => "Apply",
508	tooltip => "Apply the video settings",	538	tooltip => "Apply the video settings",
509	on_activate => sub {	539	on_activate => sub {
510	video_shutdown ();	540	video_shutdown ();
511	video_init ();	541	video_init ();
		542	0
512	}	543	}
513	);	544	);
514		545
515	$vbox	546	$vbox
516	}	547	}
…		…
524		555
525	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	556	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
526	$table->add (1, $row++, new CFClient::UI::CheckBox	557	$table->add (1, $row++, new CFClient::UI::CheckBox
527	state => $CFG->{audio_enable},	558	state => $CFG->{audio_enable},
528	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	559	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
529	on_changed => sub {	560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530	$CFG->{audio_enable} = $_[1];
531	}
532	);	561	);
533	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	562	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
534	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	563	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
535	# $CFG->{effects_volume} = $_[1];	564	# $CFG->{effects_volume} = $_[1];
536	# });	565	# });
537	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	566	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
538	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	567	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
539	$hbox->add (new CFClient::UI::CheckBox	568	$hbox->add (new CFClient::UI::CheckBox
540	expand => 1, state => $CFG->{bgm_enable},	569	expand => 1, state => $CFG->{bgm_enable},
541	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	570	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
542	on_changed => sub {	571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
543	$CFG->{bgm_enable} = $_[1];
544	}
545	);	572	);
546	$hbox->add (new CFClient::UI::Slider	573	$hbox->add (new CFClient::UI::Slider
547	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
548	tooltip => "The volume of the background music. Changes are instant.",	575	tooltip => "The volume of the background music. Changes are instant.",
549	on_changed => sub {	576	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
550	$CFG->{bgm_volume} = $_[1];
551	CFClient::MixMusic::volume $_[1] * 128;
552	}
553	);	577	);
554		578
555	$table->add (1, $row++, new CFClient::UI::Button	579	$table->add (1, $row++, new CFClient::UI::Button
556	expand => 1, align => 0, text => "Apply",	580	expand => 1, align => 0, text => "Apply",
557	tooltip => "Apply the audio settings",	581	tooltip => "Apply the audio settings",
558	on_activate => sub {	582	on_activate => sub {
559	audio_shutdown ();	583	audio_shutdown ();
560	audio_init ();	584	audio_init ();
		585	0
561	}	586	}
562	);	587	);
563		588
564	$vbox	589	$vbox
565	}
566
567	sub set_stats_window_fontsize {
568	for (values %{$STATWIDS}) {
569	$_->set_fontsize ($::CFG->{stat_fontsize});
570	}
571	}	590	}
572		591
573	sub set_gauge_window_fontsize {	592	sub set_gauge_window_fontsize {
574	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	593	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
575	$_->set_fontsize ($::CFG->{gauge_fontsize});	594	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
631		650
632	sub debug_setup {	651	sub debug_setup {
633	my $table = new CFClient::UI::Table;	652	my $table = new CFClient::UI::Table;
634		653
635	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	654	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });	655	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
637	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	656	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });	657	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
639	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	658	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });	659	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
641	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	660	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });	661	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
643		662
644	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	663	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645		664
646	for my $x (0..2) {	665	for my $x (0..2) {
647	for my $y (0 .. 2) {	666	for my $y (0 .. 2) {
…		…
656		675
657	$table	676	$table
658	}	677	}
659		678
660	sub stats_window {	679	sub stats_window {
661	my $tgw = new CFClient::UI::FancyFrame	680	my $r = new CFClient::UI::ScrolledWindow (
662	y => $HEIGHT * (2/8),	681	expand => 1,
663	x => "max",	682	scroll_y => 1
664	title => "Stats",	683	);
665	name => "stats_window";	684	$r->add (my $vb = new CFClient::UI::VBox);
666		685
667	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
668	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	686	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669	can_hover => 1, can_events => 1,	687	can_hover => 1, can_events => 1,
670	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	688	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	689	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672	can_hover => 1, can_events => 1,	690	can_hover => 1, can_events => 1,
…		…
678	tooltip => "The weight of the player including all inventory items.");	696	tooltip => "The weight of the player including all inventory items.");
679	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	697	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680	can_hover => 1, can_events => 1,	698	can_hover => 1, can_events => 1,
681	tooltip => "The weight limit: you cannot carry more than this.");	699	tooltip => "The weight limit: you cannot carry more than this.");
682		700
683
684	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	701	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
685	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	702	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
686		703
687	my $color2 = [1, 1, 0];	704	my $color2 = [1, 1, 0];
688		705
689	for (	706	for (
690	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	707	[0, 0, st_str => "Str", 30],
691	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	708	[0, 1, st_dex => "Dex", 30],
692	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	709	[0, 2, st_con => "Con", 30],
693	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	710	[0, 3, st_int => "Int", 30],
694	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	711	[0, 4, st_wis => "Wis", 30],
695	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	712	[0, 5, st_pow => "Pow", 30],
696	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	713	[0, 6, st_cha => "Cha", 30],
697		714
698	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	715	[2, 0, st_wc => "Wc", -120],
699	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	716	[2, 1, st_ac => "Ac", -120],
700	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	717	[2, 2, st_dam => "Dam", 120],
701	[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."],	718	[2, 3, st_arm => "Arm", 120],
702	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	719	[2, 4, st_spd => "Spd", 10.54],
703	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	720	[2, 5, st_wspd => "WSp", 10.54],
704	) {	721	) {
705	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	722	my ($col, $row, $id, $label, $template) = @$_;
706		723
707	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
708	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		726	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
709	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	727	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
710	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		729	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
711	}	730	}
712		731
713	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	732	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
714		733
715	my $row = 0;	734	my $row = 0;
716	my $col = 0;	735	my $col = 0;
717		736
718	my %resist_names = (	737	my %resist_names = (
		738	slow => ["Slow",
719	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.)",	739	"<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.)"],
		740	holyw => ["Holy Word",
720	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.)",	741	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		742	conf => ["Confusion",
721	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	743	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		744	fire => ["Fire",
722	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	745	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		746	depl => ["Depletion",
723	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	747	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		748	magic => ["Magic",
724	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	749	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		750	drain => ["Draining",
725	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	751	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		752	acid => ["Acid",
726	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	753	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		754	pois => ["Poison",
727	pois => "<b>Poison</b> (resistance to getting poisoned)",	755	"<b>Poison</b> (resistance to getting poisoned)"],
		756	para => ["Paralysation",
728	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	757	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		758	deat => ["Death",
729	deat => "<b>Death</b> (resistance against death spells)",	759	"<b>Death</b> (resistance against death spells)"],
730	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	760	phys => ["Physical",
		761	"<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.)"],
		762	blind => ["Blind",
731	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	763	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		764	fear => ["Fear",
732	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)",	765	"<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)"],
		766	tund => ["Turn undead",
733	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	767	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		768	elec => ["Electricity",
734	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	769	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		770	cold => ["Cold",
735	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	771	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		772	ghit => ["Ghost hit",
736	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	773	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737	);	774	);
738	for (qw/slow holyw conf fire depl magic	775	for (qw/slow holyw conf fire depl magic
739	drain acid pois para deat phys	776	drain acid pois para deat phys
740	blind fear tund elec cold ghit/)	777	blind fear tund elec cold ghit/)
741	{	778	{
…		…
746	template => "-100%",	783	template => "-100%",
747	align => +1,	784	align => +1,
748	valign => 0,	785	valign => 0,
749	can_events => 1,	786	can_events => 1,
750	can_hover => 1,	787	can_hover => 1,
751	tooltip => $resist_names{$_},	788	tooltip => $resist_names{$_}->[1],
752	);	789	);
753	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	790	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
754	font => $FONT_FIXED,	791	font => $FONT_FIXED,
755	can_hover => 1,	792	can_hover => 1,
756	can_events => 1,	793	can_events => 1,
757	image => "ui/resist/resist_$_.png",	794	path => "ui/resist/resist_$_.png",
758	tooltip => $resist_names{$_},	795	tooltip => $resist_names{$_}->[1],
		796	);
		797	$tbl2->add ($col + 2, $row, new CFClient::UI::Label
		798	text => $resist_names{$_}->[0],
		799	font => $FONT_FIXED,
		800	can_hover => 1,
		801	can_events => 1,
		802	tooltip => $resist_names{$_}->[1],
759	);	803	);
760		804
761	$row++;	805	$row++;
762	if ($row % 6 == 0) {	806	if ($row % 6 == 0) {
763	$col += 2;	807	$col += 3;
764	$row = 0;	808	$row = 0;
765	}	809	}
766	}	810	}
767		811
768	&set_stats_window_fontsize;
769	update_stats_window ({});	812	#update_stats_window ({});
770		813
		814	$r
		815	}
		816
		817	sub skill_window {
		818	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
		819	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771	$tgw	820	$sw
772	}	821	}
773		822
774	sub formsep($) {	823	sub formsep($) {
775	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776	}	825	}
777		826
778	sub update_stats_window {
779	my ($stats) = @_;
780
781	# I love text protocols...
782
783	my $hp = $stats->{+CS_STAT_HP} * 1;
784	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
785	my $sp = $stats->{+CS_STAT_SP} * 1;
786	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
787	my $fo = $stats->{+CS_STAT_FOOD} * 1;
788	my $fo_m = 999;
789	my $gr = $stats->{+CS_STAT_GRACE} * 1;
790	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
791
792	$GAUGES->{hp} ->set_value ($hp, $hp_m);
793	$GAUGES->{mana} ->set_value ($sp, $sp_m);
794	$GAUGES->{food} ->set_value ($fo, $fo_m);
795	$GAUGES->{grace} ->set_value ($gr, $gr_m);
796	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
797	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
798	my $rng = $stats->{+CS_STAT_RANGE};
799	$rng =~ s/^Range: //; # thank you so much dear server
800	$GAUGES->{range} ->set_text ("Rng: " . $rng);
801	my $title = $stats->{+CS_STAT_TITLE};
802	$title =~ s/^Player: //;
803	$STATWIDS->{title} ->set_text ("Title: " . $title);
804
805	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
806	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
807	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
808	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
809	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
810	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
811	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
812	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
813	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
814	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
815	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
816	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
817	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
818
819	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
820
821	# TODO: replace by CS_STAT_RES_xxx constants
822	my %tbl = (
823	phys => 100,
824	magic => 101,
825	fire => 102,
826	elec => 103,
827	cold => 104,
828	conf => 105,
829	acid => 106,
830	drain => 107,
831	ghit => 108,
832	pois => 109,
833	slow => 110,
834	para => 111,
835	tund => 112,
836	fear => 113,
837	depl => 113,
838	deat => 115,
839	holyw => 116,
840	blind => 117,
841	);
842
843	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
844	for keys %tbl;
845	}
846
847	my $METASERVER_ATIME;	827	my $METASERVER_ATIME;
848		828
849	sub update_metaserver {	829	sub update_metaserver {
		830	my ($metaserver_dialog) = @_;
		831
		832	$METASERVER = $metaserver_dialog
		833	if defined $metaserver_dialog;
		834
850	return if $METASERVER_ATIME > time;	835	return if $METASERVER_ATIME > time;
851	$METASERVER_ATIME = time + 60;	836	$METASERVER_ATIME = time + 60;
852		837
853	my $table = $METASERVER->{table};	838	my $table = $METASERVER->{table};
854	$table->clear;	839	$table->clear;
…		…
919	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	904	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
920	(new CFClient::UI::Button	905	(new CFClient::UI::Button
921	text => "Use",	906	text => "Use",
922	tooltip => "Put this server into the <b>Host:Port</b> field",	907	tooltip => "Put this server into the <b>Host:Port</b> field",
923	on_activate => sub {	908	on_activate => sub {
924	$HOST_ENTRY->set_text ($CFG->{host} = $host);	909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925	$METASERVER->hide;	910	$METASERVER->hide;
		911	0
926	},	912	},
927	),	913	),
928	(new CFClient::UI::Empty expand => 1),	914	(new CFClient::UI::Empty expand => 1),
929	]);	915	]);
930		916
…		…
941	}	927	}
942	});	928	});
943	}	929	}
944		930
945	sub metaserver_dialog {	931	sub metaserver_dialog {
		932	my $vbox = new CFClient::UI::VBox;
		933	my $table = new CFClient::UI::Table;
		934	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
		935
946	my $dialog = new CFClient::UI::FancyFrame	936	my $dialog = new CFClient::UI::FancyFrame
947	title => "Server List",	937	title => "Server List",
948	name => 'metaserver_dialog',	938	name => 'metaserver_dialog',
949	x => 'center',	939	x => 'center',
950	y => 'center',	940	y => 'center',
951	z => 3,	941	z => 3,
952	force_h => $::HEIGHT * 0.4,	942	force_h => $::HEIGHT * 0.4,
953	child => (my $vbox = new CFClient::UI::VBox),	943	child => $vbox,
		944	has_close_button => 1,
		945	table => $table,
954	on_visibility_change => sub {	946	on_visibility_change => sub {
955	update_metaserver if $_[1];	947	update_metaserver ($_[0]) if $_[1];
		948	0
956	},	949	},
957	;	950	;
958
959	$dialog->{table} = new CFClient::UI::Table;
960
961	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962		951
963	$dialog	952	$dialog
964	}	953	}
965		954
966	sub server_setup {	955	sub server_setup {
…		…
973	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	962	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
974		963
975	$vbox->add (	964	$vbox->add (
976	$HOST_ENTRY = new CFClient::UI::Entry	965	$HOST_ENTRY = new CFClient::UI::Entry
977	expand => 1,	966	expand => 1,
978	text => $CFG->{host},	967	text => $CFG->{profile}{default}{host},
979	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	968	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980	on_changed => sub {	969	on_changed => sub {
981	my ($self, $value) = @_;	970	my ($self, $value) = @_;
982	$CFG->{host} = $value;	971	$CFG->{profile}{default}{host} = $value;
		972	0
983	}	973	}
984	);	974	);
985
986	$METASERVER = metaserver_dialog;
987		975
988	$vbox->add (new CFClient::UI::Button	976	$vbox->add (new CFClient::UI::Button
989	expand => 1,	977	expand => 1,
990	text => "Server List",	978	text => "Server List",
991	other => $METASERVER,	979	other => $METASERVER,
992	tooltip => "Show a list of available crossfire servers",	980	tooltip => "Show a list of available crossfire servers",
993	on_activate => sub { $METASERVER->toggle_visibility },	981	on_activate => sub { $METASERVER->toggle_visibility; 0 },
994	on_visibility_change => sub { $METASERVER->hide unless $_[1] },	982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
995	);	983	);
996	}	984	}
997		985
998	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	986	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
999	$table->add (1, 4, new CFClient::UI::Entry	987	$table->add (1, 4, new CFClient::UI::Entry
1000	text => $CFG->{user},	988	text => $CFG->{profile}{default}{user},
1001	tooltip => "The name of your character on the server",	989	tooltip => "The name of your character on the server",
1002	on_changed => sub {	990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1003	my ($self, $value) = @_;
1004	$CFG->{user} = $value;
1005	}
1006	);	991	);
1007		992
1008	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	993	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
1009	$table->add (1, 5, new CFClient::UI::Entry	994	$table->add (1, 5, new CFClient::UI::Entry
1010	text => $CFG->{password},	995	text => $CFG->{profile}{default}{password},
1011	hidden => 1,	996	hidden => 1,
1012	tooltip => "The password for your character",	997	tooltip => "The password for your character",
1013	on_changed => sub {	998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1014	my ($self, $value) = @_;
1015	$CFG->{password} = $value;
1016	}
1017	);	999	);
1018		1000
1019	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1001	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
1020	$table->add (1, 7, new CFClient::UI::Slider	1002	$table->add (1, 7, new CFClient::UI::Slider
1021	force_w => 100,	1003	force_w => 100,
1022	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1023	tooltip => "This is the size of the portion of the map update the server sends you. "	1005	tooltip => "This is the size of the portion of the map update the server sends you. "
1024	. "If you set this to a high value you will be able to see further, "	1006	. "If you set this to a high value you will be able to see further, "
1025	. "but you also increase bandwidth requirements and latency. "	1007	. "but you also increase bandwidth requirements and latency. "
1026	. "This option is only used once at log-in.",	1008	. "This option is only used once at log-in.",
1027	on_changed => sub {	1009	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1028	my ($self, $value) = @_;
1029
1030	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
1031	},
1032	);	1010	);
1033		1011
1034	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1012	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1035	$table->add (1, 8, new CFClient::UI::CheckBox	1013	$table->add (1, 8, new CFClient::UI::CheckBox
1036	state => $CFG->{face_prefetch},	1014	state => $CFG->{face_prefetch},
…		…
1039	. "This might increase or create lag, but increases the chances "	1017	. "This might increase or create lag, but increases the chances "
1040	. "of faces being ready for display when you encounter them. "	1018	. "of faces being ready for display when you encounter them. "
1041	. "It also uses up server bandwidth on every connect, "	1019	. "It also uses up server bandwidth on every connect, "
1042	. "so only set it if you really need to prefetch images. "	1020	. "so only set it if you really need to prefetch images. "
1043	. "This option can be set and unset any time.",	1021	. "This option can be set and unset any time.",
1044	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1045	);	1023	);
1046		1024
1047	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1025	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
1048	$table->add (1, 9, new CFClient::UI::Entry	1026	$table->add (1, 9, new CFClient::UI::Entry
1049	text => $CFG->{output_count},	1027	text => $CFG->{output_count},
1050	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1051	on_changed => sub { $CFG->{output_count} = $_[1] },	1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1052	);	1030	);
1053		1031
1054	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1032	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1055	$table->add (1, 10, new CFClient::UI::Entry	1033	$table->add (1, 10, new CFClient::UI::Entry
1056	text => $CFG->{output_sync},	1034	text => $CFG->{output_sync},
1057	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1035	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1058	on_changed => sub { $CFG->{output_sync} = $_[1] },	1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1059	);	1037	);
1060		1038
1061	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1039	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1062	expand => 1,	1040	expand => 1,
1063	align => 0,	1041	align => 0,
1064	text => "Login",	1042	text => "Login",
1065	on_activate => sub {	1043	on_activate => sub {
1066	$CONN ? stop_game	1044	$CONN ? stop_game
1067	: start_game;	1045	: start_game;
		1046	0
1068	},	1047	},
1069	);	1048	);
1070		1049
1071	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1050	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1072	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1051	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
1075	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1054	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1076	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1055	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1077	on_changed => sub {	1056	on_changed => sub {
1078	my ($self, $value) = @_;	1057	my ($self, $value) = @_;
1079	$CFG->{say_command} = $value;	1058	$CFG->{say_command} = $value;
		1059	0
1080	}	1060	}
1081	);	1061	);
1082		1062
1083	$vbox->add (new CFClient::UI::Label	1063	$vbox->add (new CFClient::UI::Label
1084	text => "Server Info",	1064	text => "Server Info",
…		…
1095	sub message_window {	1075	sub message_window {
1096	my $window = new CFClient::UI::FancyFrame	1076	my $window = new CFClient::UI::FancyFrame
1097	name => "message_window",	1077	name => "message_window",
1098	title => "Messages",	1078	title => "Messages",
1099	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1100	bg => [0, 0, 0, 0.75],
1101	x => "max",	1080	x => "max",
1102	y => 0,	1081	y => 0,
1103	force_w => $::WIDTH * 0.4,	1082	force_w => $::WIDTH * 0.4,
1104	force_h => $::HEIGHT * 0.5,	1083	force_h => $::HEIGHT * 0.5,
1105	child => (my $vbox = new CFClient::UI::VBox);	1084	child => (my $vbox = new CFClient::UI::VBox),
		1085	has_close_button => 1;
1106		1086
1107	$vbox->add ($LOGVIEW);	1087	$vbox->add ($LOGVIEW);
1108		1088
1109	$vbox->add (my $input = new CFClient::UI::Entry	1089	$vbox->add (my $input = new CFClient::UI::Entry
1110	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1090	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
1118		1098
1119	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1099	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1120	$input->{refocus_map} = 1;	1100	$input->{refocus_map} = 1;
1121	}	1101	}
1122	delete $input->{auto_activated};	1102	delete $input->{auto_activated};
		1103
		1104	0
1123	},	1105	},
1124	on_activate => sub {	1106	on_activate => sub {
1125	my ($input, $text) = @_;	1107	my ($input, $text) = @_;
1126	$input->set_text ('');	1108	$input->set_text ('');
1127		1109
…		…
1133	}	1115	}
1134	if ($input->{refocus_map}) {	1116	if ($input->{refocus_map}) {
1135	delete $input->{refocus_map};	1117	delete $input->{refocus_map};
1136	$MAPWIDGET->focus_in	1118	$MAPWIDGET->focus_in
1137	}	1119	}
		1120
		1121	0
1138	},	1122	},
1139	on_escape => sub {	1123	on_escape => sub {
1140	$MAPWIDGET->focus_in	1124	$MAPWIDGET->grab_focus;
		1125
		1126	0
1141	},	1127	},
1142	);	1128	);
1143		1129
1144	$CONSOLE = {	1130	$CONSOLE = {
1145	window => $window,	1131	window => $window,
…		…
1154	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1140	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1155	x => "center",	1141	x => "center",
1156	y => "center",	1142	y => "center",
1157	z => 50,	1143	z => 50,
1158	title => "Really Quit?",	1144	title => "Really Quit?",
		1145	on_key_down => sub {
		1146	my ($dialog, $ev) = @_;
		1147	$ev->{sym} == 27 and $dialog->hide;
		1148	}
1159	;	1149	;
1160		1150
1161	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1151	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1162		1152
1163	$vb->add (new CFClient::UI::Label	1153	$vb->add (new CFClient::UI::Label
…		…
1167	);	1157	);
1168	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1158	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169	$hb->add (new CFClient::UI::Button	1159	$hb->add (new CFClient::UI::Button
1170	text => "Ok",	1160	text => "Ok",
1171	expand => 1,	1161	expand => 1,
1172	on_activate => sub { $QUIT_DIALOG->hide },	1162	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173	);	1163	);
1174	$hb->add (new CFClient::UI::Button	1164	$hb->add (new CFClient::UI::Button
1175	text => "Quit anyway",	1165	text => "Quit anyway",
1176	expand => 1,	1166	expand => 1,
1177	on_activate => sub { exit },	1167	on_activate => sub { exit },
1178	);	1168	);
1179	}	1169	}
1180		1170
1181	$QUIT_DIALOG->show;	1171	$QUIT_DIALOG->show;
		1172	$QUIT_DIALOG->grab_focus;
1182	}	1173	}
1183		1174
1184	sub autopickup_setup {	1175	sub autopickup_setup {
1185	my $table = new CFClient::UI::Table;	1176	my $table = new CFClient::UI::Table;
1186		1177
1187	for (	1178	for (
1188	["General", 0, 0,	1179	["General", 0, 0,
1189	["Enable autopickup" => PICKUP_NEWMODE],	1180	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190	["Inhibit autopickup" => PICKUP_INHIBIT],	1181	["Inhibit autopickup" => PICKUP_INHIBIT],
1191	["Stop before pickup" => PICKUP_STOP],	1182	["Stop before pickup" => PICKUP_STOP],
1192	["Debug autopickup" => PICKUP_DEBUG],	1183	["Debug autopickup" => PICKUP_DEBUG],
1193	],	1184	],
1194	["Weapons", 0, 6,	1185	["Weapons", 0, 6,
…		…
1231	for (@bits) {	1222	for (@bits) {
1232	++$y;	1223	++$y;
1233		1224
1234	my $mask = $_->[1];	1225	my $mask = $_->[1];
1235	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1226	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1236	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1227	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1237	state => $CFG->{pickup} & $mask,	1228	state => $::CFG->{pickup} & $mask,
1238	on_changed => sub {	1229	on_changed => sub {
1239	my ($box, $value) = @_;	1230	my ($box, $value) = @_;
1240		1231
1241	if ($value) {	1232	if ($value) {
1242	$::CFG->{pickup} |= $mask;	1233	$::CFG->{pickup} |= $mask;
…		…
1244	$::CFG->{pickup} &= ~$mask;	1235	$::CFG->{pickup} &= ~$mask;
1245	}	1236	}
1246		1237
1247	$::CONN->send_command ("pickup $::CFG->{pickup}")	1238	$::CONN->send_command ("pickup $::CFG->{pickup}")
1248	if defined $::CONN;	1239	if defined $::CONN;
		1240
		1241	0
1249	});	1242	});
		1243
		1244	${$_->[2]} = $checkbox if $_->[2];
1250	}	1245	}
1251	}	1246	}
1252		1247
1253	$table->add (2, 18, new CFClient::UI::ValSlider	1248	$table->add (2, 18, new CFClient::UI::ValSlider
1254	range => [0, 0, 16, 1, 1],	1249	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1250	template => ">= 99",
1255	to_value => sub { ">= " . 5 * $_[0] },	1251	to_value => sub { ">= " . 5 * $_[0] },
1256	on_changed => sub {	1252	on_changed => sub {
1257	my ($slider, $value) = @_;	1253	my ($slider, $value) = @_;
1258		1254
1259	$::CFG->{pickup} &= ~0x7;	1255	$::CFG->{pickup} &= ~0xF;
1260	$::CFG->{pickup} |= int $value	1256	$::CFG->{pickup} |= int $value
1261	if $value;	1257	if $value;
1262	1;	1258	1;
1263	});	1259	});
		1260
1264	$table->add (3, 18, new CFClient::UI::Button	1261	$table->add (3, 18, new CFClient::UI::Button
1265	text => "set",	1262	text => "set",
1266	on_activate => sub {	1263	on_activate => sub {
1267	$::CONN->send_command ("pickup $::CFG->{pickup}")	1264	$::CONN->send_command ("pickup $::CFG->{pickup}")
1268	if defined $::CONN;	1265	if defined $::CONN;
1269	1;	1266	0
1270	});	1267	});
1271		1268
1272	$table	1269	$table
1273	}	1270	}
1274		1271
		1272	my %SORT_ORDER = (
		1273	type => undef,
		1274	mtime => sub { sort {
		1275	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1276	or $b->{mtime} <=> $a->{mtime}
		1277	or $a->{type} <=> $b->{type}
		1278	} @_ },
		1279	weight => sub { sort {
		1280	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1281	or $a->{type} <=> $b->{type}
		1282	} @_ },
		1283	);
		1284
1275	sub inventory_window {	1285	sub inventory_widget {
		1286	my $hb = new CFClient::UI::HBox homogeneous => 1;
		1287
		1288	$hb->add (my $vb1 = new CFClient::UI::VBox);
		1289	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		1290
		1291	$vb1->add (my $hb1 = new CFClient::UI::HBox);
		1292
		1293	use sort 'stable';
		1294
		1295	$hb1->add (new CFClient::UI::Selector
		1296	value => $::CFG->{inv_sort},
		1297	options => [
		1298	[type => "Type/Name"],
		1299	[mtime => "Recent/Normal/Locked"],
		1300	[weight => "Weight/Type"],
		1301	],
		1302	on_changed => sub {
		1303	$::CFG->{inv_sort} = $_[1];
		1304	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1305	},
		1306	);
		1307	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
		1308	#TODO# update to weigh/maxweight
		1309	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
		1310
		1311	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1312	$sw1->add ($INV = new CFClient::UI::Inventory);
		1313
		1314	$hb->add (my $vb2 = new CFClient::UI::VBox);
		1315
		1316	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1317
		1318	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1319	$sw2->add ($INVR = new CFClient::UI::Inventory);
		1320
		1321	# XXX: Call after $INVR = ... because set_opencont sets the items
		1322	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1323
		1324	$hb
		1325	}
		1326
		1327	sub toggle_player_page {
		1328	my ($widget) = @_;
		1329
		1330	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1331	$PL_WINDOW->hide;
		1332	} else {
		1333	$PL_NOTEBOOK->set_current_page ($widget);
		1334	$PL_WINDOW->show;
		1335	}
		1336	}
		1337
		1338	sub player_window {
1276	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1339	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277	x => "center",	1340	x => "center",
1278	y => "center",	1341	y => "center",
1279	force_w => $WIDTH * 9/10,	1342	force_w => $WIDTH * 9/10,
1280	force_h => $HEIGHT * 9/10,	1343	force_h => $HEIGHT * 9/10,
1281	title => "Inventory",	1344	title => "Player",
		1345	name => "playerbook",
		1346	has_close_button => 1
1282	;	1347	;
1283		1348
1284	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1349	my $ntb =
		1350	$PL_NOTEBOOK =
		1351	new CFClient::UI::Notebook expand => 1, debug => 1;
1285		1352
1286	$hb->add (my $vb1 = new CFClient::UI::VBox);	1353	$ntb->add (
1287	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1354	"Statistics (F2)" => $STATS_PAGE = stats_window,
1288	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1355	"Shows statistics, where all your Stats and Resistances are shown."
		1356	);
		1357	$ntb->add (
		1358	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1359	"Shows all your Skills."
		1360	);
1289		1361
1290	$hb->add (my $vb2 = new CFClient::UI::VBox);	1362	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1363	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
		1364	$ntb->add (
		1365	"Spellbook (F4)" => $spellsw,
		1366	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1367	);
		1368	$ntb->add (
		1369	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1370	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1371	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1372	);
1291		1373
1292	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1374	$ntb->set_current_page ($INVENTORY_PAGE);
1293		1375
1294	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1376	$plwin->add ($ntb);
1295		1377	$plwin
1296	# XXX: Call after $INVR = ... because set_opencont sets the items
1297	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1298
1299	$invwin
1300	}	1378	}
1301		1379
1302	sub spell_setup {	1380	sub update_bindings {
1303	new CFClient::UI::SpellList	1381	$BIND_UPD_CB->() if $BIND_UPD_CB;
1304	}	1382	}
1305		1383
1306	sub keyboard_setup {	1384	sub keyboard_setup {
1307	my $binding_list = new CFClient::UI::VBox;	1385	my $binding_list = new CFClient::UI::VBox;
1308		1386
1309	my $refresh;	1387	my $refresh;
1310	$refresh = sub {	1388	$refresh = $BIND_UPD_CB = sub {
1311	$binding_list->clear ();	1389	$binding_list->clear ();
1312		1390
1313	for my $mod (keys %{$::CFG->{bindings}}) {	1391	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1392	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1393	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1394	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317		1395
1318	my $lbl = join "; ", @$cmds;	1396	my $lbl = join "; ", @$cmds;
1319	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1397	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1320	$binding_list->add (my $hb = new CFClient::UI::HBox);	1398	$binding_list->add (my $hb = new CFClient::UI::HBox);
1321	$hb->add (new CFClient::UI::Button	1399	$hb->add (new CFClient::UI::Button
1322	text => "delete",	1400	text => "delete",
1323	tooltip => "Deletes the binding",	1401	tooltip => "Deletes the binding",
1324	on_activate => sub {	1402	on_activate => sub {
1325	$binding_list->remove ($hb);	1403	$binding_list->remove ($hb);
1326	delete $::CFG->{bindings}->{$mod}->{$sym};	1404	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1405	0
1327	});	1406	});
1328		1407
1329	$hb->add (new CFClient::UI::Button	1408	$hb->add (new CFClient::UI::Button
1330	text => "edit",	1409	text => "edit",
1331	tooltip => "Edits the binding",	1410	tooltip => "Edits the binding",
1332	on_activate => sub {	1411	on_activate => sub {
1333	$::BIND_EDITOR->set_binding (	1412	$::BIND_EDITOR->set_binding (
1334	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1413	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1335	sub {	1414	sub {
1336	my ($nmod, $nsym, $ncmds) = @_;	1415	my ($nmod, $nsym, $ncmds) = @_;
1337	delete $::CFG->{bindings}->{$mod}->{$sym};	1416	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1338	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1417	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1339	$refresh->();	1418	$refresh->();
1340	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1419	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1341	$SETUP_DIALOG->show;	1420	$SETUP_DIALOG->show;
1342	},	1421	},
1343	sub {	1422	sub {
1344	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1423	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1345	$SETUP_DIALOG->show;	1424	$SETUP_DIALOG->show;
1346	});	1425	});
1347	$::BIND_EDITOR->show;	1426	$::BIND_EDITOR->show;
1348	$SETUP_DIALOG->hide;	1427	$SETUP_DIALOG->hide;
		1428	0
1349	});	1429	});
1350		1430
1351	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1431	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1352	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1432	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1353	}	1433	}
1354	}	1434	}
1355	};	1435	};
1356		1436
1357	my $vb = new CFClient::UI::VBox;	1437	my $vb = new CFClient::UI::VBox;
		1438	$vb->add (my $hb = new CFClient::UI::HBox);
		1439	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1440	$hb->add (new CFClient::UI::CheckBox
		1441	expand => 1,
		1442	state => $CFG->{shift_fire_stop},
		1443	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1444	on_changed => sub {
		1445	my ($cbox, $value) = @_;
		1446	$CFG->{shift_fire_stop} = $value;
		1447	0
		1448	});
		1449
1358	$vb->add ($binding_list);	1450	$vb->add ($binding_list);
1359	$vb->add (my $hb = new CFClient::UI::HBox);	1451	$vb->add (my $hb = new CFClient::UI::HBox);
1360		1452
1361	$hb->add (new CFClient::UI::Button	1453	$hb->add (new CFClient::UI::Button
1362	text => "record new",	1454	text => "record new",
…		…
1364	tooltip => "This button opens the binding editor with an empty binding.",	1456	tooltip => "This button opens the binding editor with an empty binding.",
1365	on_activate => sub {	1457	on_activate => sub {
1366	$::BIND_EDITOR->set_binding (undef, undef, [],	1458	$::BIND_EDITOR->set_binding (undef, undef, [],
1367	sub {	1459	sub {
1368	my ($mod, $sym, $cmds) = @_;	1460	my ($mod, $sym, $cmds) = @_;
1369	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1461	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1370	$refresh->();	1462	$refresh->();
1371	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1463	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1372	$SETUP_DIALOG->show;	1464	$SETUP_DIALOG->show;
1373	},	1465	},
1374	sub {	1466	sub {
…		…
1376	$SETUP_DIALOG->show;	1468	$SETUP_DIALOG->show;
1377	},	1469	},
1378	);	1470	);
1379	$SETUP_DIALOG->hide;	1471	$SETUP_DIALOG->hide;
1380	$::BIND_EDITOR->show;	1472	$::BIND_EDITOR->show;
		1473	0
1381	},	1474	},
1382	);	1475	);
1383		1476
1384	$hb->add (new CFClient::UI::Button	1477	$hb->add (new CFClient::UI::Button
1385	text => "close",	1478	text => "close",
1386	tooltip => "Closes the binding window",	1479	tooltip => "Closes the binding window",
1387	expand => 1,	1480	expand => 1,
1388	on_activate => sub {	1481	on_activate => sub {
1389	$SETUP_DIALOG->hide;	1482	$SETUP_DIALOG->hide;
		1483	0
1390	}	1484	}
1391	);	1485	);
1392		1486
1393	$refresh->();	1487	$refresh->();
1394		1488
…		…
1401	y => 'center',	1495	y => 'center',
1402	z => 2,	1496	z => 2,
1403	name => 'doc_browser',	1497	name => 'doc_browser',
1404	force_w => int $WIDTH * 7/8,	1498	force_w => int $WIDTH * 7/8,
1405	force_h => int $HEIGHT * 7/8,	1499	force_h => int $HEIGHT * 7/8,
1406	title => "Documentation";	1500	title => "Help Browser",
		1501	has_close_button => 1;
1407		1502
1408	$win->add (my $vbox = new CFClient::UI::VBox);	1503	$win->add (my $vbox = new CFClient::UI::VBox);
1409		1504
1410	$vbox->add (my $buttons = new CFClient::UI::HBox);	1505	$vbox->add (my $buttons = new CFClient::UI::HBox);
1411	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1506	$vbox->add (my $viewer = new CFClient::UI::TextScroller
1412	expand => 1, fontsize => 0.8, padding_x => 4);	1507	expand => 1, fontsize => 0.8, padding_x => 4);
1413		1508
1414	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1509	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1415	$buttons->add (my $combo = new CFClient::UI::Combobox	1510	$buttons->add (my $combo = new CFClient::UI::Selector
1416	value => undef,	1511	value => undef,
1417	options => [	1512	options => [
1418	[intro => "Introduction"],	1513	[intro => "Introduction"],
1419	[manual => "Manual"],	1514	[manual => "Main Manual"],
1420	[skill_help => "Skills"],	1515	[skill_help => "Skill Reference"],
1421	[command_help => "Commands"],	1516	[command_help => "Command Reference"],
1422	[dmcommand_help => "DM Commands"],	1517	[dmcommand_help => "DM Commands"],
1423	[COPYING => "License Terms"],	1518	[COPYING => "License Terms"],
1424	],	1519	],
1425	on_changed => sub {	1520	on_changed => sub {
1426	my ($self, $pod) = @_;	1521	my ($self, $pod) = @_;
1427		1522
1428	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1429	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1430
1431	$viewer->clear;	1523	$viewer->clear;
1432		1524	$viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod });
1433	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1434	for @$pom;
1435
1436	$viewer->set_offset (0);	1525	$viewer->set_offset (0);
		1526
		1527	0
1437	},	1528	},
1438	on_visibility_change => sub {	1529	on_visibility_change => sub {
1439	my ($self, $visible) = @_;	1530	my ($self, $visible) = @_;
1440	return unless $visible;	1531	return unless $visible;
1441	return if $self->{value};	1532	return if $self->{value};
1442	$self->set_value ("intro");	1533	$self->set_value ("intro");
		1534	0
1443	},	1535	},
1444	);	1536	);
1445		1537
1446	$win	1538	$win
1447	}	1539	}
…		…
1486	z => 100,	1578	z => 100,
1487	force_x => "max",	1579	force_x => "max",
1488	force_y => 0;	1580	force_y => 0;
1489	$DEBUG_STATUS->show;	1581	$DEBUG_STATUS->show;
1490		1582
1491	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1583	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1492		1584
1493	$STATUSBOX = new CFClient::UI::Statusbox;	1585	$STATUSBOX = new CFClient::UI::Statusbox;
1494	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1586	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1495		1587
1496	(new CFClient::UI::Frame	1588	(new CFClient::UI::Frame
…		…
1516	$MAPWIDGET->connect (activate_console => sub {	1608	$MAPWIDGET->connect (activate_console => sub {
1517	my ($mapwidget, $preset) = @_;	1609	my ($mapwidget, $preset) = @_;
1518		1610
1519	if ($CONSOLE) {	1611	if ($CONSOLE) {
1520	$CONSOLE->{input}->{auto_activated} = 1;	1612	$CONSOLE->{input}->{auto_activated} = 1;
1521	$CONSOLE->{input}->focus_in;	1613	$CONSOLE->{input}->grab_focus;
1522		1614
1523	if ($preset && $CONSOLE->{input}->get_text eq '') {	1615	if ($preset && $CONSOLE->{input}->get_text eq '') {
1524	$CONSOLE->{input}->set_text ($preset);	1616	$CONSOLE->{input}->set_text ($preset);
1525	}	1617	}
1526	}	1618	}
1527	});	1619	});
1528	$MAPWIDGET->show;	1620	$MAPWIDGET->show;
1529	$MAPWIDGET->focus_in;	1621	$MAPWIDGET->grab_focus;
1530		1622
1531	$LOGVIEW = new CFClient::UI::TextScroller	1623	$LOGVIEW = new CFClient::UI::TextScroller
1532	expand => 1,	1624	expand => 1,
1533	font => $FONT_FIXED,	1625	font => $FONT_FIXED,
1534	fontsize => $::CFG->{log_fontsize},	1626	fontsize => $::CFG->{log_fontsize},
…		…
1544	x => 'center',	1636	x => 'center',
1545	y => 'center',	1637	y => 'center',
1546	z => 2,	1638	z => 2,
1547	force_w => $::WIDTH * 0.6,	1639	force_w => $::WIDTH * 0.6,
1548	force_h => $::HEIGHT * 0.6,	1640	force_h => $::HEIGHT * 0.6,
		1641	has_close_button => 1,
1549	;	1642	;
		1643
		1644	$METASERVER = metaserver_dialog;
1550		1645
1551	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1646	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1552	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1647	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1553		1648
1554	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1649	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
…		…
1558	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1653	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1559	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1654	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1560	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1655	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1561	"Configure the use of audio, sound effects and background music.");	1656	"Configure the use of audio, sound effects and background music.");
1562	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1657	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1563	"Lets you define, edit and delete bindings."	1658	"Lets you define, edit and delete key bindings."
1564	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1659	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1565	. "with nothing set and the recording started. After doing the actions you "	1660	. "with nothing set and the recording started. After doing the actions you "
1566	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1661	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1567	. "After pressing the combo the binding will be saved automatically and the "	1662	. "After pressing the combo the binding will be saved automatically and the "
1568	. "binding editor closes");	1663	. "binding editor closes");
1569	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1570	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
1571	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1664	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1572	"Some debuggign options. Do not ask.");	1665	"Some debuggin' options. Do not ask.");
1573		1666
1574	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1667	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1575		1668
1576	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1669	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1577	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1670	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
…		…
1579	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1672	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1580	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1673	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1581		1674
1582	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1675	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1583		1676
1584	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1585	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1586	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,	1677	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1587	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1678	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1588	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1589		1679
1590	$BUTTONBAR->add (new CFClient::UI::Button	1680	$BUTTONBAR->add (new CFClient::UI::Button
1591	text => "Save Config",	1681	text => "Save Config",
1592	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1682	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1593	on_activate => sub {	1683	on_activate => sub {
1594	$::CFG->{layout} = CFClient::UI::get_layout;	1684	$::CFG->{layout} = CFClient::UI::get_layout;
1595	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1685	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1596	status "Configuration Saved";	1686	status "Configuration Saved";
		1687	0
1597	},	1688	},
1598	);	1689	);
1599		1690
1600	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,	1691	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1601	tooltip => "View Documentation");	1692	tooltip => "View Documentation");
1602		1693
1603	$BUTTONBAR->add (new CFClient::UI::Button	1694	$BUTTONBAR->add (new CFClient::UI::Button
1604	text => "Quit",	1695	text => "Quit",
1605	tooltip => "Terminates the program",	1696	tooltip => "Terminates the program",
…		…
1607	if ($CONN) {	1698	if ($CONN) {
1608	open_quit_dialog;	1699	open_quit_dialog;
1609	} else {	1700	} else {
1610	exit;	1701	exit;
1611	}	1702	}
		1703	0
1612	},	1704	},
1613	);	1705	);
1614		1706
1615	$BUTTONBAR->show;	1707	$BUTTONBAR->show;
1616	$SETUP_DIALOG->show;	1708	$SETUP_DIALOG->show;
…		…
1618		1710
1619	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1711	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1620	}	1712	}
1621		1713
1622	sub video_shutdown {	1714	sub video_shutdown {
		1715	CFClient::OpenGL::shutdown;
		1716
1623	undef $SDL_ACTIVE;	1717	undef $SDL_ACTIVE;
1624	}	1718	}
1625		1719
1626	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1720	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1627	my $bgmusic;#TODO#hack#d#	1721	my $bgmusic;#TODO#hack#d#
…		…
1699		1793
1700	$WANT_REFRESH = 0;	1794	$WANT_REFRESH = 0;
1701	$CAN_REFRESH = 0;	1795	$CAN_REFRESH = 0;
1702	$LAST_REFRESH = $NOW;	1796	$LAST_REFRESH = $NOW;
1703		1797
1704	0 && do {
1705	# some weird model-drawing code, just a joke right now
1706	use CFClient::OpenGL;
1707
1708	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1709	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1710	$demo{r} ||= do {
1711	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1712	$mod->{v} = pack "f*", @{$mod->{v}};
1713	$_ = [scalar @$_, pack "S!*", @$_]
1714	for values %{$mod->{g}};
1715	$mod
1716	};
1717
1718	my $r = $demo{r} or die;
1719
1720	glDepthMask 1;
1721	glClear GL_DEPTH_BUFFER_BIT;
1722	glEnable GL_TEXTURE_2D;
1723	glEnable GL_DEPTH_TEST;
1724	glEnable GL_CULL_FACE;
1725	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1726
1727	glMatrixMode GL_PROJECTION;
1728	glLoadIdentity;
1729	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1730	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1731	glMatrixMode GL_MODELVIEW;
1732	glLoadIdentity;
1733
1734	glPushMatrix;
1735	glTranslate 0, 0, -800;
1736	glScale 1, -1, 1;
1737	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1738	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1739	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1740	glScale 50, 50, 50;
1741
1742	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1743	while (my ($k, $v) = each %{$r->{g}}) {
1744	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1745	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1746	}
1747
1748	glPopMatrix;
1749
1750	glShadeModel GL_FLAT;
1751	glDisable GL_DEPTH_TEST;
1752	glDisable GL_TEXTURE_2D;
1753	glDepthMask 0;
1754
1755	$WANT_REFRESH++;
1756	};
1757
1758	CFClient::SDL_GL_SwapBuffers;	1798	CFClient::SDL_GL_SwapBuffers;
1759	}	1799	}
1760		1800
1761	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1801	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1762	$NOW = time;	1802	$NOW = time;
…		…
1808	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1848	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1809	},	1849	},
1810	CFClient::SDL_KEYDOWN => sub {	1850	CFClient::SDL_KEYDOWN => sub {
1811	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1851	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1812	# alt-enter	1852	# alt-enter
		1853	$FULLSCREEN_ENABLE->toggle;
1813	video_shutdown;	1854	video_shutdown;
1814	$CFG->{fullscreen} = !$CFG->{fullscreen};
1815	video_init;	1855	video_init;
1816	} else {	1856	} else {
1817	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1857	CFClient::UI::feed_sdl_key_down_event ($_[0]);
1818	}	1858	}
1819	},	1859	},
…		…
1833	#############################################################################	1873	#############################################################################
1834		1874
1835	$SIG{INT} = $SIG{TERM} = sub { exit };	1875	$SIG{INT} = $SIG{TERM} = sub { exit };
1836		1876
1837	{	1877	{
1838	local $SIG{__DIE__} = sub {
1839	return unless defined $^S && !$^S;
1840	Carp::confess $_[1];#d#TODO: remove when stable
1841	CFClient::fatal $_[0];
1842	};
1843
1844	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1878	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1845	CFClient::UI::set_layout ($::CFG->{layout});	1879	CFClient::UI::set_layout ($::CFG->{layout});
1846		1880
1847	my %DEF_CFG = (	1881	my %DEF_CFG = (
1848	sdl_mode => 0,	1882	sdl_mode => 0,
1849	width => 640,	1883	width => 640,
1850	height => 480,	1884	height => 480,
1851	fullscreen => 0,	1885	fullscreen => 0,
1852	fast => 0,	1886	fast => 0,
1853	map_scale => 1,	1887	map_scale => 1,
1854	fow_enable => 1,	1888	fow_enable => 1,
1855	fow_intensity => 0.45,	1889	fow_intensity => 0.45,
1856	fow_smooth => 0,	1890	fow_smooth => 0,
1857	gui_fontsize => 1,	1891	gui_fontsize => 1,
1858	log_fontsize => 0.7,	1892	log_fontsize => 0.7,
1859	gauge_fontsize=> 1,	1893	gauge_fontsize => 1,
1860	gauge_size => 0.35,	1894	gauge_size => 0.35,
1861	stat_fontsize => 0.7,	1895	stat_fontsize => 0.7,
1862	mapsize => 100,	1896	mapsize => 100,
1863	host => "crossfire.schmorp.de",
1864	say_command => 'say',	1897	say_command => 'say',
1865	audio_enable => 1,	1898	audio_enable => 1,
1866	bgm_enable => 1,	1899	bgm_enable => 1,
1867	bgm_volume => 0.25,	1900	bgm_volume => 0.25,
1868	face_prefetch => 0,	1901	face_prefetch => 0,
1869	output_sync => 1,	1902	output_sync => 1,
1870	output_count => 1,	1903	output_count => 1,
1871	pickup => 0,	1904	pickup => 0,
		1905	inv_sort => "mtime",
		1906	default => "profile", # default profile
		1907	);
1872	);	1908
1873
1874	while (my ($k, $v) = each %DEF_CFG) {	1909	while (my ($k, $v) = each %DEF_CFG) {
1875	$CFG->{$k} = $v unless exists $CFG->{$k};	1910	$CFG->{$k} = $v unless exists $CFG->{$k};
1876	}	1911	}
		1912
		1913	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1877		1914
1878	sdl_init;	1915	sdl_init;
1879		1916
1880	@SDL_MODES = reverse	1917	@SDL_MODES = reverse
1881	grep $_->[0] >= 640 && $_->[1] >= 480,	1918	grep $_->[0] >= 640 && $_->[1] >= 480,

Diff Legend

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