[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.80 by root, Mon Jun 26 21:59:04 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::BindingEditor;
41	use CFClient::MapWidget;	42	use CFClient::MapWidget;
42		43
43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	44	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44		45
45	$Event::DIED = sub {	46	$Event::DIED = sub {
…		…
84	our $CONSOLE;	85	our $CONSOLE;
85	our $METASERVER;	86	our $METASERVER;
86	our $LOGIN_BUTTON;	87	our $LOGIN_BUTTON;
87	our $QUIT_DIALOG;	88	our $QUIT_DIALOG;
88	our $HOST_ENTRY;	89	our $HOST_ENTRY;
		90	our $SERVER_INFO;
89		91
90	our $SETUP_DIALOG;	92	our $SETUP_DIALOG;
91	our $SETUP_NOTEBOOK;	93	our $SETUP_NOTEBOOK;
92	our $SETUP_SERVER;	94	our $SETUP_SERVER;
93	our $SETUP_KEYBOARD;	95	our $SETUP_KEYBOARD;
…		…
114	our $INV;	116	our $INV;
115	our $INVR;	117	our $INVR;
116	our $INV_RIGHT_HB;	118	our $INV_RIGHT_HB;
117		119
118	our $BIND_EDITOR;	120	our $BIND_EDITOR;
		121	our $BIND_UPD_CB;
119		122
120	our $PICKUP_CFG;	123	our $PICKUP_CFG;
121		124
122	sub status {	125	sub status {
123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	126	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
…		…
154	$hbox->add (new CFClient::UI::Button	157	$hbox->add (new CFClient::UI::Button
155	text => "No",	158	text => "No",
156	on_activate => sub {	159	on_activate => sub {
157	$conn->send ("reply n");	160	$conn->send ("reply n");
158	$dialog->destroy;	161	$dialog->destroy;
		162	0
159	}	163	}
160	);	164	);
161	$hbox->add (new CFClient::UI::Button	165	$hbox->add (new CFClient::UI::Button
162	text => "Yes",	166	text => "Yes",
163	on_activate => sub {	167	on_activate => sub {
164	$conn->send ("reply y");	168	$conn->send ("reply y");
165	destroy_query_dialog $conn;	169	destroy_query_dialog $conn;
		170	0
166	},	171	},
167	);	172	);
168		173
169	$dialog->focus_in;	174	$dialog->grab_focus;
170		175
171	} elsif ($flags & CS_QUERY_SINGLECHAR) {	176	} elsif ($flags & CS_QUERY_SINGLECHAR) {
172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	177	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
173		178
174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {	179	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
…		…
184	$table->add (0, 0, new CFClient::UI::Button	189	$table->add (0, 0, new CFClient::UI::Button
185	text => "Next Race",	190	text => "Next Race",
186	on_activate => sub {	191	on_activate => sub {
187	$conn->send ("reply n");	192	$conn->send ("reply n");
188	destroy_query_dialog $conn;	193	destroy_query_dialog $conn;
		194	0
189	},	195	},
190	);	196	);
191	$table->add (2, 0, new CFClient::UI::Button	197	$table->add (2, 0, new CFClient::UI::Button
192	text => "Accept",	198	text => "Accept",
193	on_activate => sub {	199	on_activate => sub {
194	$conn->send ("reply d");	200	$conn->send ("reply d");
195	destroy_query_dialog $conn;	201	destroy_query_dialog $conn;
		202	0
196	},	203	},
197	);	204	);
198		205
199	unshift @dialog, new CFClient::UI::Label	206	unshift @dialog, new CFClient::UI::Label
200	max_w => $::WIDTH * 0.4,	207	max_w => $::WIDTH * 0.4,
…		…
230	$table->add (0, 0, new CFClient::UI::Button	237	$table->add (0, 0, new CFClient::UI::Button
231	text => "Roll Again",	238	text => "Roll Again",
232	on_activate => sub {	239	on_activate => sub {
233	$conn->send ("reply y");	240	$conn->send ("reply y");
234	destroy_query_dialog $conn;	241	destroy_query_dialog $conn;
		242	0
235	},	243	},
236	);	244	);
237		245
238	# center: swap stats	246	# center: swap stats
239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	247	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
240	value => $_,	248	value => $_,
241	options => [	249	options => [
242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],	250	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	251	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],	252	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],	253	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],	254	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],	255	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	256	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
249	],	257	],
250	), 1 .. 2;	258	), 1 .. 2;
251		259
252	$table->add (2, 0, new CFClient::UI::Button	260	$table->add (2, 0, new CFClient::UI::Button
253	text => "Swap Stats",	261	text => "Swap Stats",
254	on_activate => sub {	262	on_activate => sub {
255	$conn->{stat_change_with} = $sw2->{value};	263	$conn->{stat_change_with} = $sw2->{value};
256	$conn->send ("reply $sw1->{value}");	264	$conn->send ("reply $sw1->{value}");
257	destroy_query_dialog $conn;	265	destroy_query_dialog $conn;
		266	0
258	},	267	},
259	);	268	);
260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	269	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
261		270
262	# right: accept	271	# right: accept
…		…
264	text => "Accept",	273	text => "Accept",
265	on_activate => sub {	274	on_activate => sub {
266	$conn->send ("reply n");	275	$conn->send ("reply n");
267	$STATS_WINDOW->hide;	276	$STATS_WINDOW->hide;
268	destroy_query_dialog $conn;	277	destroy_query_dialog $conn;
		278	0
269	},	279	},
270	);	280	);
271		281
272	unshift @dialog, new CFClient::UI::Label	282	unshift @dialog, new CFClient::UI::Label
273	max_w => $::WIDTH * 0.4,	283	max_w => $::WIDTH * 0.4,
…		…
283		293
284	push @dialog, my $entry = new CFClient::UI::Entry	294	push @dialog, my $entry = new CFClient::UI::Entry
285	on_changed => sub {	295	on_changed => sub {
286	$conn->send ("reply $_[1]");	296	$conn->send ("reply $_[1]");
287	destroy_query_dialog $conn;	297	destroy_query_dialog $conn;
		298	0
288	},	299	},
289	;	300	;
290		301
291	$entry->focus_in;	302	$entry->grab_focus;
292		303
293	} else {	304	} else {
294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	305	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
295		306
296	push @dialog, my $entry = new CFClient::UI::Entry	307	push @dialog, my $entry = new CFClient::UI::Entry
297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	308	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
298	on_activate => sub {	309	on_activate => sub {
299	$conn->send ("reply $_[1]");	310	$conn->send ("reply $_[1]");
300	destroy_query_dialog $conn;	311	destroy_query_dialog $conn;
		312	0
301	},	313	},
302	;	314	;
303		315
304	$entry->focus_in;	316	$entry->grab_focus;
305	}	317	}
306		318
307	$vbox->add (@dialog);	319	$vbox->add (@dialog);
308	$dialog->show;	320	$dialog->show;
309	}	321	}
…		…
314	$LOGIN_BUTTON->set_text ("Logout");	326	$LOGIN_BUTTON->set_text ("Logout");
315	$SETUP_DIALOG->hide;	327	$SETUP_DIALOG->hide;
316		328
317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	329	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
318		330
319	my ($host, $port) = split /:/, $CFG->{host};	331	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
320		332
321	$MAP = new CFClient::Map $mapsize, $mapsize;	333	$MAP = new CFClient::Map $mapsize, $mapsize;
322		334
323	$CONN = eval {	335	$CONN = eval {
324	new CFClient::Protocol	336	new CFClient::Protocol
325	host => $host,	337	host => $host,
326	port => $port \|\| 13327,	338	port => $port \|\| 13327,
327	user => $CFG->{user},	339	user => $CFG->{profile}{default}{user},
328	pass => $CFG->{password},	340	pass => $CFG->{profile}{default}{password},
329	mapw => $mapsize,	341	mapw => $mapsize,
330	maph => $mapsize,	342	maph => $mapsize,
331		343
332	map_widget => $MAPWIDGET,	344	map_widget => $MAPWIDGET,
333	logview => $LOGVIEW,	345	logview => $LOGVIEW,
…		…
362	sub stop_game {	374	sub stop_game {
363	$LOGIN_BUTTON->set_text ("Login");	375	$LOGIN_BUTTON->set_text ("Login");
364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	376	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365	$SETUP_DIALOG->show;	377	$SETUP_DIALOG->show;
366	$INV_WINDOW->hide;	378	$INV_WINDOW->hide;
		379	$SETUP_SPELLS->clear_spells;
367		380
368	return unless $CONN;	381	return unless $CONN;
369		382
370	status "connection closed";	383	status "connection closed";
371		384
372	destroy_query_dialog $CONN;	385	destroy_query_dialog $CONN;
373	$CONN->destroy;	386	$CONN->destroy;
374	$CONN = 0; # false, does not autovivify	387	$CONN = 0; # false, does not autovivify
		388
		389	undef $MAP;
375	}	390	}
376		391
377	sub graphics_setup {	392	sub graphics_setup {
378	my $vbox = new CFClient::UI::VBox;	393	my $vbox = new CFClient::UI::VBox;
379		394
…		…
397		412
398	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	413	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
399	$table->add (1, $row++, new CFClient::UI::CheckBox	414	$table->add (1, $row++, new CFClient::UI::CheckBox
400	state => $CFG->{fullscreen},	415	state => $CFG->{fullscreen},
401	tooltip => "Bring the client into fullscreen mode.",	416	tooltip => "Bring the client into fullscreen mode.",
402	on_changed => sub {	417	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
403	my ($self, $value) = @_;
404	$CFG->{fullscreen} = $value;
405	}
406	);	418	);
407		419
408	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	420	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
409	$table->add (1, $row++, new CFClient::UI::CheckBox	421	$table->add (1, $row++, new CFClient::UI::CheckBox
410	state => $CFG->{fast},	422	state => $CFG->{fast},
411	tooltip => "Lower the visual quality considerably to speed up rendering.",	423	tooltip => "Lower the visual quality considerably to speed up rendering.",
412	on_changed => sub {	424	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
413	my ($self, $value) = @_;
414	$CFG->{fast} = $value;
415	}
416	);	425	);
417		426
418	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	427	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
419	$table->add (1, $row++, new CFClient::UI::Slider	428	$table->add (1, $row++, new CFClient::UI::Slider
420	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	429	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
421	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	430	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
422	on_changed => sub {	431	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
423	my ($self, $value) = @_;
424	$CFG->{map_scale} = 2 ** $value;
425	}
426	);	432	);
427		433
428	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	434	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
429	$table->add (1, $row++, new CFClient::UI::CheckBox	435	$table->add (1, $row++, new CFClient::UI::CheckBox
430	state => $CFG->{fow_enable},	436	state => $CFG->{fow_enable},
431	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	437	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
432	on_changed => sub {	438	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
433	my ($self, $value) = @_;
434	$CFG->{fow_enable} = $value;
435	}
436	);	439	);
437		440
438	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	441	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
439	$table->add (1, $row++, new CFClient::UI::Slider	442	$table->add (1, $row++, new CFClient::UI::Slider
440	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	443	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
441	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	444	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
442	on_changed => sub {	445	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
443	my ($self, $value) = @_;
444	$CFG->{fow_intensity} = $value;
445	}
446	);	446	);
447		447
448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	448	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449	$table->add (1, $row++, new CFClient::UI::CheckBox	449	$table->add (1, $row++, new CFClient::UI::CheckBox
450	state => $CFG->{fow_smooth},	450	state => $CFG->{fow_smooth},
451	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	451	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452	on_changed => sub {	452	on_changed => sub {
453	my ($self, $value) = @_;	453	my ($self, $value) = @_;
454	$CFG->{fow_smooth} = $value;	454	$CFG->{fow_smooth} = $value;
455	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	455	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
		456	0
456	}	457	}
457	);	458	);
458		459
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	460	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
460	$table->add (1, $row++, new CFClient::UI::Slider	461	$table->add (1, $row++, new CFClient::UI::Slider
461	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	462	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
462	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	463	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
463	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	464	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
464	);	465	);
465		466
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	467	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
467	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFClient::UI::Slider
468	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	469	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	470	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	471	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471	);	472	);
472		473
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	474	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474		475
475	$table->add (1, $row++, new CFClient::UI::Slider	476	$table->add (1, $row++, new CFClient::UI::Slider
476	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],	477	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",	478	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478	on_changed => sub {	479	on_changed => sub {
479	$CFG->{stat_fontsize} = $_[1];	480	$CFG->{stat_fontsize} = $_[1];
480	&set_stats_window_fontsize;	481	&set_stats_window_fontsize;
		482	0
481	}	483	}
482	);	484	);
483		485
484	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	486	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
485	$table->add (1, $row++, new CFClient::UI::Slider	487	$table->add (1, $row++, new CFClient::UI::Slider
486	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	488	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
487	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	489	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
488	on_changed => sub {	490	on_changed => sub {
489	$CFG->{gauge_fontsize} = $_[1];	491	$CFG->{gauge_fontsize} = $_[1];
490	&set_gauge_window_fontsize;	492	&set_gauge_window_fontsize;
		493	0
491	}	494	}
492	);	495	);
493		496
494	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	497	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
495	$table->add (1, $row++, new CFClient::UI::Slider	498	$table->add (1, $row++, new CFClient::UI::Slider
496	range => [$CFG->{gauge_size}, 0.2, 0.8],	499	range => [$CFG->{gauge_size}, 0.2, 0.8],
497	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	500	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498	on_changed => sub {	501	on_changed => sub {
499	$CFG->{gauge_size} = $_[1];	502	$CFG->{gauge_size} = $_[1];
500	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	503	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		504	0
501	}	505	}
502	);	506	);
503		507
504	$table->add (1, $row++, new CFClient::UI::Button	508	$table->add (1, $row++, new CFClient::UI::Button
505	expand => 1, align => 0, text => "Apply",	509	expand => 1, align => 0, text => "Apply",
506	tooltip => "Apply the video settings",	510	tooltip => "Apply the video settings",
507	on_activate => sub {	511	on_activate => sub {
508	video_shutdown ();	512	video_shutdown ();
509	video_init ();	513	video_init ();
		514	0
510	}	515	}
511	);	516	);
512		517
513	$vbox	518	$vbox
514	}	519	}
…		…
522		527
523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	528	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
524	$table->add (1, $row++, new CFClient::UI::CheckBox	529	$table->add (1, $row++, new CFClient::UI::CheckBox
525	state => $CFG->{audio_enable},	530	state => $CFG->{audio_enable},
526	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.",	531	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.",
527	on_changed => sub {	532	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
528	$CFG->{audio_enable} = $_[1];
529	}
530	);	533	);
531	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	534	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
532	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	535	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533	# $CFG->{effects_volume} = $_[1];	536	# $CFG->{effects_volume} = $_[1];
534	# });	537	# });
535	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	538	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
536	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	539	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
537	$hbox->add (new CFClient::UI::CheckBox	540	$hbox->add (new CFClient::UI::CheckBox
538	expand => 1, state => $CFG->{bgm_enable},	541	expand => 1, state => $CFG->{bgm_enable},
539	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	542	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
540	on_changed => sub {	543	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541	$CFG->{bgm_enable} = $_[1];
542	}
543	);	544	);
544	$hbox->add (new CFClient::UI::Slider	545	$hbox->add (new CFClient::UI::Slider
545	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	546	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
546	tooltip => "The volume of the background music. Changes are instant.",	547	tooltip => "The volume of the background music. Changes are instant.",
547	on_changed => sub {	548	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
548	$CFG->{bgm_volume} = $_[1];
549	CFClient::MixMusic::volume $_[1] * 128;
550	}
551	);	549	);
552		550
553	$table->add (1, $row++, new CFClient::UI::Button	551	$table->add (1, $row++, new CFClient::UI::Button
554	expand => 1, align => 0, text => "Apply",	552	expand => 1, align => 0, text => "Apply",
555	tooltip => "Apply the audio settings",	553	tooltip => "Apply the audio settings",
556	on_activate => sub {	554	on_activate => sub {
557	audio_shutdown ();	555	audio_shutdown ();
558	audio_init ();	556	audio_init ();
		557	0
559	}	558	}
560	);	559	);
561		560
562	$vbox	561	$vbox
563	}	562	}
…		…
625	&set_gauge_window_fontsize;	624	&set_gauge_window_fontsize;
626		625
627	$win	626	$win
628	}	627	}
629		628
		629	sub debug_setup {
		630	my $table = new CFClient::UI::Table;
		631
		632	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
		633	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		634	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
		635	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		636	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
		637	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		638	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
		639	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		640
		641	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		642
		643	for my $x (0..2) {
		644	for my $y (0 .. 2) {
		645	$table->add ($x + 3, $y,
		646	new CFClient::UI::Entry
		647	text => $default_smooth[$x * 3 + $y],
		648	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		649	);
		650	}
		651	}
		652
		653
		654	$table
		655	}
630		656
631	sub stats_window {	657	sub stats_window {
632	my $tgw = new CFClient::UI::FancyFrame	658	my $tgw = new CFClient::UI::FancyFrame
633	y => $HEIGHT * (2/8),	659	y => $HEIGHT * (2/8),
634	x => "max",	660	x => "max",
635	title => "Stats",	661	title => "Stats",
636	name => "stats_window";	662	name => "stats_window",
		663	has_close_button => 1;
637		664
638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	665	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	666	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
640	can_hover => 1, can_events => 1,	667	can_hover => 1, can_events => 1,
641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	668	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
723	);	750	);
724	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	751	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
725	font => $FONT_FIXED,	752	font => $FONT_FIXED,
726	can_hover => 1,	753	can_hover => 1,
727	can_events => 1,	754	can_events => 1,
728	image => "ui/resist/resist_$_.png",	755	path => "ui/resist/resist_$_.png",
729	tooltip => $resist_names{$_},	756	tooltip => $resist_names{$_},
730	);	757	);
731		758
732	$row++;	759	$row++;
733	if ($row % 6 == 0) {	760	if ($row % 6 == 0) {
…		…
787	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	814	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
788	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	815	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
789		816
790	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);	817	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
791		818
792	# TODO: replace by CS_STAT_RES_xxx constants
793	my %tbl = (	819	my %tbl = (
794	phys => 100,	820	phys => CS_STAT_RES_PHYS,
795	magic => 101,	821	magic => CS_STAT_RES_MAG,
796	fire => 102,	822	fire => CS_STAT_RES_FIRE,
797	elec => 103,	823	elec => CS_STAT_RES_ELEC,
798	cold => 104,	824	cold => CS_STAT_RES_COLD,
799	conf => 105,	825	conf => CS_STAT_RES_CONF,
800	acid => 106,	826	acid => CS_STAT_RES_ACID,
801	drain => 107,	827	drain => CS_STAT_RES_DRAIN,
802	ghit => 108,	828	ghit => CS_STAT_RES_GHOSTHIT,
803	pois => 109,	829	pois => CS_STAT_RES_POISON,
804	slow => 110,	830	slow => CS_STAT_RES_SLOW,
805	para => 111,	831	para => CS_STAT_RES_PARA,
806	tund => 112,	832	tund => CS_STAT_TURN_UNDEAD,
807	fear => 113,	833	fear => CS_STAT_RES_FEAR,
808	depl => 113,	834	depl => CS_STAT_RES_DEPLETE,
809	deat => 115,	835	deat => CS_STAT_RES_DEATH,
810	holyw => 116,	836	holyw => CS_STAT_RES_HOLYWORD,
811	blind => 117,	837	blind => CS_STAT_RES_BLIND,
812	);	838	);
813		839
814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	840	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
815	for keys %tbl;	841	for keys %tbl;
816	}	842	}
…		…
846		872
847	utf8::decode $buf if utf8::valid $buf;	873	utf8::decode $buf if utf8::valid $buf;
848		874
849	$table->clear;	875	$table->clear;
850		876
		877	my @tip = (
		878	"The current number of users logged in on the server.",
		879	"The hostname of the server.",
		880	"The time this server has been running without being restarted.",
		881	"The server software version - a '+' indicates a Crossfire+ server.",
		882	"Short information about this server provided by its admins.",
		883	);
851	my @col = qw(Use #Users Host Uptime Version Description);	884	my @col = qw(#Users Host Uptime Version Description);
852	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	885	$table->add ($_, 0, new CFClient::UI::Label
		886	can_hover => 1, can_events => 1,
		887	align => 0, fg => [1, 1, 0],
		888	text => $col[$_], tooltip => $tip[$_])
853	for 0 .. $#col;	889	for 0 .. $#col;
854		890
855	my @align = qw(1 0 1 1 -1);	891	my @align = qw(1 0 1 1 -1);
856		892
857	my $y = 0;	893	my $y = 0;
858	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	894	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
875		911
876	$m = [$users, $host, $uptime, $version, $desc];	912	$m = [$users, $host, $uptime, $version, $desc];
877		913
878	$y++;	914	$y++;
879		915
880	$table->add (0, $y, new CFClient::UI::VBox children => [	916	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
881	(new CFClient::UI::Button text => "Use", on_activate => sub {	917	(new CFClient::UI::Button
		918	text => "Use",
		919	tooltip => "Put this server into the <b>Host:Port</b> field",
		920	on_activate => sub {
882	$HOST_ENTRY->set_text ($CFG->{host} = $host);	921	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
883	$METASERVER->toggle_visibility;	922	$METASERVER->hide;
		923	0
		924	},
884	}),	925	),
885	(new CFClient::UI::Empty expand => 1),	926	(new CFClient::UI::Empty expand => 1),
886	]);	927	]);
887		928
888	$table->add ($_ + 1, $y, new CFClient::UI::Label	929	$table->add ($_, $y, new CFClient::UI::Label
889	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	930	ellipsise => 0,
		931	align => $align[$_],
		932	text => $m->[$_],
		933	tooltip => $tip[$_],
		934	can_hover => 1,
		935	can_events => 1,
		936	fontsize => 0.8)
890	for 0 .. $#$m;	937	for 0 .. $#$m;
891	}	938	}
892	}	939	}
893	});	940	});
894	}	941	}
895		942
896	sub metaserver_dialog {	943	sub metaserver_dialog {
897	my $dialog = new CFClient::UI::FancyFrame	944	my $dialog = new CFClient::UI::FancyFrame
898	title => "Server List",	945	title => "Server List",
899	name => 'metaserver_dialog',	946	name => 'metaserver_dialog',
900	x => 'center',	947	x => 'center',
901	y => 'center',	948	y => 'center',
902	z => 3,	949	z => 3,
		950	force_h => $::HEIGHT * 0.4,
903	child => (my $vbox = new CFClient::UI::VBox),	951	child => (my $vbox = new CFClient::UI::VBox),
		952	has_close_button => 1,
904	on_visibility_change => sub {	953	on_visibility_change => sub {
905	update_metaserver if $_[1];	954	update_metaserver if $_[1];
		955	0
906	},	956	},
907	;	957	;
908		958
909	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	959	$dialog->{table} = new CFClient::UI::Table;
		960
		961	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
910		962
911	$dialog	963	$dialog
912	}	964	}
913		965
914	sub server_setup {	966	sub server_setup {
…		…
921	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	973	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
922		974
923	$vbox->add (	975	$vbox->add (
924	$HOST_ENTRY = new CFClient::UI::Entry	976	$HOST_ENTRY = new CFClient::UI::Entry
925	expand => 1,	977	expand => 1,
926	text => $CFG->{host},	978	text => $CFG->{profile}{default}{host},
927	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	979	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
928	on_changed => sub {	980	on_changed => sub {
929	my ($self, $value) = @_;	981	my ($self, $value) = @_;
930	$CFG->{host} = $value;	982	$CFG->{profile}{default}{host} = $value;
		983	0
931	}	984	}
932	);	985	);
933		986
934	$METASERVER = metaserver_dialog;	987	$METASERVER = metaserver_dialog;
935		988
936	$vbox->add (new CFClient::UI::Button	989	$vbox->add (new CFClient::UI::Button
937	expand => 1,	990	expand => 1,
938	text => "Server List",	991	text => "Server List",
939	other => $METASERVER,	992	other => $METASERVER,
940	tooltip => "Show a list of available crossfire servers",	993	tooltip => "Show a list of available crossfire servers",
941	on_activate => sub { $METASERVER->toggle_visibility },	994	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		995	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
942	);	996	);
943	}	997	}
944		998
945	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	999	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
946	$table->add (1, 4, new CFClient::UI::Entry	1000	$table->add (1, 4, new CFClient::UI::Entry
947	text => $CFG->{user},	1001	text => $CFG->{profile}{default}{user},
948	tooltip => "The name of your character on the server",	1002	tooltip => "The name of your character on the server",
949	on_changed => sub {	1003	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
950	my ($self, $value) = @_;
951	$CFG->{user} = $value;
952	}
953	);	1004	);
954		1005
955	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1006	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
956	$table->add (1, 5, new CFClient::UI::Entry	1007	$table->add (1, 5, new CFClient::UI::Entry
957	text => $CFG->{password},	1008	text => $CFG->{profile}{default}{password},
958	hidden => 1,	1009	hidden => 1,
959	tooltip => "The password for your character",	1010	tooltip => "The password for your character",
960	on_changed => sub {	1011	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961	my ($self, $value) = @_;
962	$CFG->{password} = $value;
963	}
964	);	1012	);
965		1013
966	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1014	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
967	$table->add (1, 7, new CFClient::UI::Slider	1015	$table->add (1, 7, new CFClient::UI::Slider
968	force_w => 100,	1016	force_w => 100,
969	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1017	range => [$CFG->{mapsize}, 10, 100, 0, 1],
970	tooltip => "This is the size of the portion of the map update the server sends you. "	1018	tooltip => "This is the size of the portion of the map update the server sends you. "
971	. "If you set this to a high value you will be able to see further, "	1019	. "If you set this to a high value you will be able to see further, "
972	. "but you also increase bandwidth requirements and latency. "	1020	. "but you also increase bandwidth requirements and latency. "
973	. "This option is only used once at log-in.",	1021	. "This option is only used once at log-in.",
974	on_changed => sub {	1022	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
975	my ($self, $value) = @_;
976
977	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
978	},
979	);	1023	);
980		1024
981	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1025	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
982	$table->add (1, 8, new CFClient::UI::CheckBox	1026	$table->add (1, 8, new CFClient::UI::CheckBox
983	state => $CFG->{face_prefetch},	1027	state => $CFG->{face_prefetch},
…		…
986	. "This might increase or create lag, but increases the chances "	1030	. "This might increase or create lag, but increases the chances "
987	. "of faces being ready for display when you encounter them. "	1031	. "of faces being ready for display when you encounter them. "
988	. "It also uses up server bandwidth on every connect, "	1032	. "It also uses up server bandwidth on every connect, "
989	. "so only set it if you really need to prefetch images. "	1033	. "so only set it if you really need to prefetch images. "
990	. "This option can be set and unset any time.",	1034	. "This option can be set and unset any time.",
991	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1035	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
992	);	1036	);
993		1037
994	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1038	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
995	$table->add (1, 9, new CFClient::UI::Entry	1039	$table->add (1, 9, new CFClient::UI::Entry
996	text => $CFG->{output_count},	1040	text => $CFG->{output_count},
997	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1041	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
998	on_changed => sub { $CFG->{output_count} = $_[1] },	1042	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
999	);	1043	);
1000		1044
1001	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1045	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
1002	$table->add (1, 10, new CFClient::UI::Entry	1046	$table->add (1, 10, new CFClient::UI::Entry
1003	text => $CFG->{output_sync},	1047	text => $CFG->{output_sync},
1004	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1048	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1005	on_changed => sub { $CFG->{output_sync} = $_[1] },	1049	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1006	);	1050	);
1007		1051
1008	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1052	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
1009	expand => 1,	1053	expand => 1,
1010	align => 0,	1054	align => 0,
1011	text => "Login",	1055	text => "Login",
1012	on_activate => sub {	1056	on_activate => sub {
1013	$CONN ? stop_game	1057	$CONN ? stop_game
1014	: start_game;	1058	: start_game;
		1059	0
1015	},	1060	},
1016	);	1061	);
1017		1062
1018	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1063	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1019	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1064	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
…		…
1022	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1067	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1023	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1068	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1024	on_changed => sub {	1069	on_changed => sub {
1025	my ($self, $value) = @_;	1070	my ($self, $value) = @_;
1026	$CFG->{say_command} = $value;	1071	$CFG->{say_command} = $value;
		1072	0
1027	}	1073	}
1028	);	1074	);
		1075
		1076	$vbox->add (new CFClient::UI::Label
		1077	text => "Server Info",
		1078	fontsize => 1.2,
		1079	padding_y => 8,
		1080	fg => [1, 1, 0, 1],
		1081	);
		1082
		1083	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1029		1084
1030	$vbox	1085	$vbox
1031	}	1086	}
1032		1087
1033	sub message_window {	1088	sub message_window {
…		…
1038	bg => [0, 0, 0, 0.75],	1093	bg => [0, 0, 0, 0.75],
1039	x => "max",	1094	x => "max",
1040	y => 0,	1095	y => 0,
1041	force_w => $::WIDTH * 0.4,	1096	force_w => $::WIDTH * 0.4,
1042	force_h => $::HEIGHT * 0.5,	1097	force_h => $::HEIGHT * 0.5,
1043	child => (my $vbox = new CFClient::UI::VBox);	1098	child => (my $vbox = new CFClient::UI::VBox),
		1099	has_close_button => 1;
1044		1100
1045	$vbox->add ($LOGVIEW);	1101	$vbox->add ($LOGVIEW);
1046		1102
1047	$vbox->add (my $input = new CFClient::UI::Entry	1103	$vbox->add (my $input = new CFClient::UI::Entry
1048	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1104	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
…		…
1056		1112
1057	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1113	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1058	$input->{refocus_map} = 1;	1114	$input->{refocus_map} = 1;
1059	}	1115	}
1060	delete $input->{auto_activated};	1116	delete $input->{auto_activated};
		1117
		1118	0
1061	},	1119	},
1062	on_activate => sub {	1120	on_activate => sub {
1063	my ($input, $text) = @_;	1121	my ($input, $text) = @_;
1064	$input->set_text ('');	1122	$input->set_text ('');
1065		1123
…		…
1071	}	1129	}
1072	if ($input->{refocus_map}) {	1130	if ($input->{refocus_map}) {
1073	delete $input->{refocus_map};	1131	delete $input->{refocus_map};
1074	$MAPWIDGET->focus_in	1132	$MAPWIDGET->focus_in
1075	}	1133	}
		1134
		1135	0
1076	},	1136	},
1077	on_escape => sub {	1137	on_escape => sub {
1078	$MAPWIDGET->focus_in	1138	$MAPWIDGET->grab_focus;
		1139
		1140	0
1079	},	1141	},
1080	);	1142	);
1081		1143
1082	$CONSOLE = {	1144	$CONSOLE = {
1083	window => $window,	1145	window => $window,
…		…
1105	);	1167	);
1106	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1168	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1107	$hb->add (new CFClient::UI::Button	1169	$hb->add (new CFClient::UI::Button
1108	text => "Ok",	1170	text => "Ok",
1109	expand => 1,	1171	expand => 1,
1110	on_activate => sub { $QUIT_DIALOG->hide },	1172	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1111	);	1173	);
1112	$hb->add (new CFClient::UI::Button	1174	$hb->add (new CFClient::UI::Button
1113	text => "Quit anyway",	1175	text => "Quit anyway",
1114	expand => 1,	1176	expand => 1,
1115	on_activate => sub { exit },	1177	on_activate => sub { exit },
…		…
1158	["Potions" => PICKUP_POTION],	1220	["Potions" => PICKUP_POTION],
1159	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1221	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1160	["Ignore cursed" => PICKUP_NOT_CURSED],	1222	["Ignore cursed" => PICKUP_NOT_CURSED],
1161	["Jewelery" => PICKUP_JEWELS],	1223	["Jewelery" => PICKUP_JEWELS],
1162	],	1224	],
		1225	["Weight/Value ratio", 2, 17]
1163	)	1226	)
1164	{	1227	{
1165	my ($title, $x, $y, @bits) = @$_;	1228	my ($title, $x, $y, @bits) = @$_;
1166	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1229	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1167		1230
…		…
1172	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1235	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1173	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1236	$table->add ($x+1, $y, new CFClient::UI::CheckBox
1174	state => $CFG->{pickup} & $mask,	1237	state => $CFG->{pickup} & $mask,
1175	on_changed => sub {	1238	on_changed => sub {
1176	my ($box, $value) = @_;	1239	my ($box, $value) = @_;
		1240
1177	if ($value) {	1241	if ($value) {
1178	$::CFG->{pickup} \|= $mask;	1242	$::CFG->{pickup} \|= $mask;
1179	} else {	1243	} else {
1180	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1244	$::CFG->{pickup} &= ~$mask;
1181	}	1245	}
		1246
1182	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1247	$::CONN->send_command ("pickup $::CFG->{pickup}")
1183	if defined $::CONN;	1248	if defined $::CONN;
		1249
		1250	0
1184	});	1251	});
1185	}	1252	}
1186	}	1253	}
		1254
		1255	$table->add (2, 18, new CFClient::UI::ValSlider
		1256	range => [0, 0, 16, 1, 1],
		1257	to_value => sub { ">= " . 5 * $_[0] },
		1258	on_changed => sub {
		1259	my ($slider, $value) = @_;
		1260
		1261	$::CFG->{pickup} &= ~0x7;
		1262	$::CFG->{pickup} \|= int $value
		1263	if $value;
		1264	1;
		1265	});
		1266	$table->add (3, 18, new CFClient::UI::Button
		1267	text => "set",
		1268	on_activate => sub {
		1269	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1270	if defined $::CONN;
		1271	0
		1272	});
1187		1273
1188	$table	1274	$table
1189	}	1275	}
1190		1276
1191	sub inventory_window {	1277	sub inventory_window {
…		…
1193	x => "center",	1279	x => "center",
1194	y => "center",	1280	y => "center",
1195	force_w => $WIDTH * 9/10,	1281	force_w => $WIDTH * 9/10,
1196	force_h => $HEIGHT * 9/10,	1282	force_h => $HEIGHT * 9/10,
1197	title => "Inventory",	1283	title => "Inventory",
		1284	has_close_button => 1,
1198	;	1285	;
1199		1286
1200	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1287	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1201		1288
1202	$hb->add (my $vb1 = new CFClient::UI::VBox);	1289	$hb->add (my $vb1 = new CFClient::UI::VBox);
…		…
1217		1304
1218	sub spell_setup {	1305	sub spell_setup {
1219	new CFClient::UI::SpellList	1306	new CFClient::UI::SpellList
1220	}	1307	}
1221		1308
		1309	sub update_bindings {
		1310	$BIND_UPD_CB->() if $BIND_UPD_CB;
		1311	}
		1312
1222	sub keyboard_setup {	1313	sub keyboard_setup {
1223	my $binding_list = new CFClient::UI::VBox;	1314	my $binding_list = new CFClient::UI::VBox;
1224		1315
1225	my $refresh;	1316	my $refresh;
1226	$refresh = sub {	1317	$refresh = $BIND_UPD_CB = sub {
1227	$binding_list->clear ();	1318	$binding_list->clear ();
1228		1319
1229	for my $mod (keys %{$::CFG->{bindings}}) {	1320	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1230	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1321	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1231	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1322	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1232	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1323	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1233		1324
1234	my $lbl = join "; ", @$cmds;	1325	my $lbl = join "; ", @$cmds;
1235	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1326	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1236	$binding_list->add (my $hb = new CFClient::UI::HBox);	1327	$binding_list->add (my $hb = new CFClient::UI::HBox);
1237	$hb->add (new CFClient::UI::Button	1328	$hb->add (new CFClient::UI::Button
1238	text => "delete",	1329	text => "delete",
1239	tooltip => "Deletes the binding",	1330	tooltip => "Deletes the binding",
1240	on_activate => sub {	1331	on_activate => sub {
1241	$binding_list->remove ($hb);	1332	$binding_list->remove ($hb);
1242	delete $::CFG->{bindings}->{$mod}->{$sym};	1333	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		1334	0
1243	});	1335	});
1244		1336
1245	$hb->add (new CFClient::UI::Button	1337	$hb->add (new CFClient::UI::Button
1246	text => "edit",	1338	text => "edit",
1247	tooltip => "Edits the binding",	1339	tooltip => "Edits the binding",
1248	on_activate => sub {	1340	on_activate => sub {
1249	$::BIND_EDITOR->set_binding (	1341	$::BIND_EDITOR->set_binding (
1250	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1342	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1251	sub {	1343	sub {
1252	my ($nmod, $nsym, $ncmds) = @_;	1344	my ($nmod, $nsym, $ncmds) = @_;
1253	delete $::CFG->{bindings}->{$mod}->{$sym};	1345	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1254	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1346	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1255	$refresh->();	1347	$refresh->();
1256	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1348	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1257	$SETUP_DIALOG->show;	1349	$SETUP_DIALOG->show;
1258	},	1350	},
1259	sub {	1351	sub {
1260	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1352	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1261	$SETUP_DIALOG->show;	1353	$SETUP_DIALOG->show;
1262	});	1354	});
1263	$::BIND_EDITOR->show;	1355	$::BIND_EDITOR->show;
1264	$SETUP_DIALOG->hide;	1356	$SETUP_DIALOG->hide;
		1357	0
1265	});	1358	});
1266		1359
1267	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1360	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1268	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1361	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1269	}	1362	}
1270	}	1363	}
1271	};	1364	};
1272		1365
1273	my $vb = new CFClient::UI::VBox;	1366	my $vb = new CFClient::UI::VBox;
		1367	$vb->add (my $hb = new CFClient::UI::HBox);
		1368	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
		1369	$hb->add (new CFClient::UI::CheckBox
		1370	expand => 1,
		1371	state => $CFG->{shift_fire_stop},
		1372	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1373	on_changed => sub {
		1374	my ($cbox, $value) = @_;
		1375	$CFG->{shift_fire_stop} = $value;
		1376	0
		1377	});
		1378
1274	$vb->add ($binding_list);	1379	$vb->add ($binding_list);
1275	$vb->add (my $hb = new CFClient::UI::HBox);	1380	$vb->add (my $hb = new CFClient::UI::HBox);
1276		1381
1277	$hb->add (new CFClient::UI::Button	1382	$hb->add (new CFClient::UI::Button
1278	text => "record new",	1383	text => "record new",
…		…
1280	tooltip => "This button opens the binding editor with an empty binding.",	1385	tooltip => "This button opens the binding editor with an empty binding.",
1281	on_activate => sub {	1386	on_activate => sub {
1282	$::BIND_EDITOR->set_binding (undef, undef, [],	1387	$::BIND_EDITOR->set_binding (undef, undef, [],
1283	sub {	1388	sub {
1284	my ($mod, $sym, $cmds) = @_;	1389	my ($mod, $sym, $cmds) = @_;
1285	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1390	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1286	$refresh->();	1391	$refresh->();
1287	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1392	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1288	$SETUP_DIALOG->show;	1393	$SETUP_DIALOG->show;
1289	},	1394	},
1290	sub {	1395	sub {
…		…
1292	$SETUP_DIALOG->show;	1397	$SETUP_DIALOG->show;
1293	},	1398	},
1294	);	1399	);
1295	$SETUP_DIALOG->hide;	1400	$SETUP_DIALOG->hide;
1296	$::BIND_EDITOR->show;	1401	$::BIND_EDITOR->show;
		1402	0
1297	},	1403	},
1298	);	1404	);
1299		1405
1300	$hb->add (new CFClient::UI::Button	1406	$hb->add (new CFClient::UI::Button
1301	text => "close",	1407	text => "close",
1302	tooltip => "Closes the binding window",	1408	tooltip => "Closes the binding window",
1303	expand => 1,	1409	expand => 1,
1304	on_activate => sub {	1410	on_activate => sub {
1305	$SETUP_DIALOG->hide;	1411	$SETUP_DIALOG->hide;
		1412	0
1306	}	1413	}
1307	);	1414	);
1308		1415
1309	$refresh->();	1416	$refresh->();
1310		1417
1311	$vb	1418	$vb
1312	}	1419	}
1313		1420
1314	sub make_help_window {	1421	sub help_window {
1315	my $win = new CFClient::UI::FancyFrame	1422	my $win = new CFClient::UI::FancyFrame
1316	x => 'center',	1423	x => 'center',
1317	y => 'center',	1424	y => 'center',
1318	z => 2,	1425	z => 2,
1319	name => 'doc_browser',	1426	name => 'doc_browser',
…		…
1322	title => "Documentation";	1429	title => "Documentation";
1323		1430
1324	$win->add (my $vbox = new CFClient::UI::VBox);	1431	$win->add (my $vbox = new CFClient::UI::VBox);
1325		1432
1326	$vbox->add (my $buttons = new CFClient::UI::HBox);	1433	$vbox->add (my $buttons = new CFClient::UI::HBox);
1327	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1434	$vbox->add (my $viewer = new CFClient::UI::TextScroller
		1435	expand => 1, fontsize => 0.8, padding_x => 4);
1328		1436
1329	for (	1437	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
		1438	$buttons->add (my $combo = new CFClient::UI::Combobox
		1439	value => undef,
		1440	options => [
1330	[intro => "Introduction"],	1441	[intro => "Introduction"],
1331	[manual => "Manual"],	1442	[manual => "Main Manual"],
		1443	[skill_help => "Skill Reference"],
		1444	[command_help => "Command Reference"],
1332	[command_help => "Commands"],	1445	[dmcommand_help => "DM Commands"],
1333	[skill_help => "Skills"],	1446	[COPYING => "License Terms"],
1334	) {	1447	],
1335	my ($pod, $label) = @$_;	1448	on_changed => sub {
		1449	my ($self, $pod) = @_;
1336		1450
1337	$buttons->add (new CFClient::UI::Button
1338	text => $label,
1339	on_activate => sub {
1340	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1451	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1341	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1452	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1342		1453
1343	$viewer->clear;	1454	$viewer->clear;
		1455
		1456	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
		1457	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
		1458	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
		1459	# ]);#d#
1344		1460
1345	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1461	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1346	for @$pom;	1462	for @$pom;
1347		1463
1348	$viewer->set_offset (0);	1464	$viewer->set_offset (0);
		1465
1349	},	1466	0
		1467	},
		1468	on_visibility_change => sub {
		1469	my ($self, $visible) = @_;
		1470	return unless $visible;
		1471	return if $self->{value};
		1472	$self->set_value ("intro");
		1473	0
		1474	},
1350	);	1475	);
1351	}
1352
1353	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1354		1476
1355	$win	1477	$win
1356	}	1478	}
1357		1479
1358	sub sdl_init {	1480	sub sdl_init {
…		…
1395	z => 100,	1517	z => 100,
1396	force_x => "max",	1518	force_x => "max",
1397	force_y => 0;	1519	force_y => 0;
1398	$DEBUG_STATUS->show;	1520	$DEBUG_STATUS->show;
1399		1521
1400	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1522	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1401		1523
1402	$STATUSBOX = new CFClient::UI::Statusbox;	1524	$STATUSBOX = new CFClient::UI::Statusbox;
1403	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1525	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1404		1526
1405	(new CFClient::UI::Frame	1527	(new CFClient::UI::Frame
…		…
1425	$MAPWIDGET->connect (activate_console => sub {	1547	$MAPWIDGET->connect (activate_console => sub {
1426	my ($mapwidget, $preset) = @_;	1548	my ($mapwidget, $preset) = @_;
1427		1549
1428	if ($CONSOLE) {	1550	if ($CONSOLE) {
1429	$CONSOLE->{input}->{auto_activated} = 1;	1551	$CONSOLE->{input}->{auto_activated} = 1;
1430	$CONSOLE->{input}->focus_in;	1552	$CONSOLE->{input}->grab_focus;
1431		1553
1432	if ($preset && $CONSOLE->{input}->get_text eq '') {	1554	if ($preset && $CONSOLE->{input}->get_text eq '') {
1433	$CONSOLE->{input}->set_text ($preset);	1555	$CONSOLE->{input}->set_text ($preset);
1434	}	1556	}
1435	}	1557	}
1436	});	1558	});
1437	$MAPWIDGET->show;	1559	$MAPWIDGET->show;
1438	$MAPWIDGET->focus_in;	1560	$MAPWIDGET->grab_focus;
1439		1561
1440	$LOGVIEW = new CFClient::UI::TextView	1562	$LOGVIEW = new CFClient::UI::TextScroller
1441	expand => 1,	1563	expand => 1,
1442	font => $FONT_FIXED,	1564	font => $FONT_FIXED,
1443	fontsize => $::CFG->{log_fontsize},	1565	fontsize => $::CFG->{log_fontsize},
1444	indent => -4,	1566	indent => -4,
1445	can_hover => 1,	1567	can_hover => 1,
…		…
1453	x => 'center',	1575	x => 'center',
1454	y => 'center',	1576	y => 'center',
1455	z => 2,	1577	z => 2,
1456	force_w => $::WIDTH * 0.6,	1578	force_w => $::WIDTH * 0.6,
1457	force_h => $::HEIGHT * 0.6,	1579	force_h => $::HEIGHT * 0.6,
		1580	has_close_button => 1,
1458	;	1581	;
1459		1582
1460	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1583	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1461	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1584	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1462		1585
…		…
1467	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1590	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1468	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1591	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1469	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1592	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1470	"Configure the use of audio, sound effects and background music.");	1593	"Configure the use of audio, sound effects and background music.");
1471	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1594	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1472	"Lets you define, edit and delete bindings."	1595	"Lets you define, edit and delete key bindings."
1473	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1596	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1474	. "with nothing set and the recording started. After doing the actions you "	1597	. "with nothing set and the recording started. After doing the actions you "
1475	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1598	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1476	. "After pressing the combo the binding will be saved automatically and the "	1599	. "After pressing the combo the binding will be saved automatically and the "
1477	. "binding editor closes");	1600	. "binding editor closes");
1478	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1601	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1479	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1602	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1603	$SETUP_NOTEBOOK->add (Debug => debug_setup,
		1604	"Some debuggin' options. Do not ask.");
1480		1605
1481	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1606	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1482		1607
1483	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1608	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1484	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1609	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
…		…
1499	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1624	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1500	on_activate => sub {	1625	on_activate => sub {
1501	$::CFG->{layout} = CFClient::UI::get_layout;	1626	$::CFG->{layout} = CFClient::UI::get_layout;
1502	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1627	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1503	status "Configuration Saved";	1628	status "Configuration Saved";
		1629	0
1504	},	1630	},
1505	);	1631	);
1506		1632
1507	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1633	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1508	tooltip => "View Documentation");	1634	tooltip => "View Documentation");
1509		1635
1510	$BUTTONBAR->add (new CFClient::UI::Button	1636	$BUTTONBAR->add (new CFClient::UI::Button
1511	text => "Quit",	1637	text => "Quit",
1512	tooltip => "Terminates the program",	1638	tooltip => "Terminates the program",
…		…
1514	if ($CONN) {	1640	if ($CONN) {
1515	open_quit_dialog;	1641	open_quit_dialog;
1516	} else {	1642	} else {
1517	exit;	1643	exit;
1518	}	1644	}
		1645	0
1519	},	1646	},
1520	);	1647	);
1521		1648
1522	$BUTTONBAR->show;	1649	$BUTTONBAR->show;
1523	$SETUP_DIALOG->show;	1650	$SETUP_DIALOG->show;
…		…
1525		1652
1526	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1653	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1527	}	1654	}
1528		1655
1529	sub video_shutdown {	1656	sub video_shutdown {
		1657	CFClient::OpenGL::shutdown;
		1658
1530	undef $SDL_ACTIVE;	1659	undef $SDL_ACTIVE;
1531	}	1660	}
1532		1661
1533	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1662	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1534	my $bgmusic;#TODO#hack#d#	1663	my $bgmusic;#TODO#hack#d#
…		…
1750		1879
1751	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1880	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1752	CFClient::UI::set_layout ($::CFG->{layout});	1881	CFClient::UI::set_layout ($::CFG->{layout});
1753		1882
1754	my %DEF_CFG = (	1883	my %DEF_CFG = (
1755	sdl_mode => 0,	1884	sdl_mode => 0,
1756	width => 640,	1885	width => 640,
1757	height => 480,	1886	height => 480,
1758	fullscreen => 0,	1887	fullscreen => 0,
1759	fast => 0,	1888	fast => 0,
1760	map_scale => 1,	1889	map_scale => 1,
1761	fow_enable => 1,	1890	fow_enable => 1,
1762	fow_intensity => 0.45,	1891	fow_intensity => 0.45,
1763	fow_smooth => 0,	1892	fow_smooth => 0,
1764	gui_fontsize => 1,	1893	gui_fontsize => 1,
1765	log_fontsize => 0.7,	1894	log_fontsize => 0.7,
1766	gauge_fontsize=> 1,	1895	gauge_fontsize => 1,
1767	gauge_size => 0.35,	1896	gauge_size => 0.35,
1768	stat_fontsize => 0.7,	1897	stat_fontsize => 0.7,
1769	mapsize => 100,	1898	mapsize => 100,
1770	host => "crossfire.schmorp.de",
1771	say_command => 'say',	1899	say_command => 'say',
1772	audio_enable => 1,	1900	audio_enable => 1,
1773	bgm_enable => 1,	1901	bgm_enable => 1,
1774	bgm_volume => 0.25,	1902	bgm_volume => 0.25,
1775	face_prefetch => 0,	1903	face_prefetch => 0,
1776	output_sync => 1,	1904	output_sync => 1,
1777	output_count => 1,	1905	output_count => 1,
		1906	pickup => 0,
		1907	default => "profile", # default profile
		1908	);
1778	);	1909
1779
1780	while (my ($k, $v) = each %DEF_CFG) {	1910	while (my ($k, $v) = each %DEF_CFG) {
1781	$CFG->{$k} = $v unless exists $CFG->{$k};	1911	$CFG->{$k} = $v unless exists $CFG->{$k};
1782	}	1912	}
		1913
		1914	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";
1783		1915
1784	sdl_init;	1916	sdl_init;
1785		1917
1786	@SDL_MODES = reverse	1918	@SDL_MODES = reverse
1787	grep $_->[0] >= 640 && $_->[1] >= 480,	1919	grep $_->[0] >= 640 && $_->[1] >= 480,
…		…
1829	video_init;	1961	video_init;
1830	audio_init;	1962	audio_init;
1831	}	1963	}
1832		1964
1833	Event::loop;	1965	Event::loop;
		1966	#CFClient::SDL_Quit;
		1967	#CFClient::_exit 0;
1834		1968
1835	END { CFClient::SDL_Quit }	1969	END { CFClient::SDL_Quit }
1836		1970
1837	=head1 NAME	1971	=head1 NAME
1838		1972

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs. Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC