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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs.
Revision 1.140 by root, Wed Apr 19 06:06:46 2006 UTC

…		…
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
		13
		14	use SDL::Mixer;
		15	use SDL::Sound;
		16	use SDL::Music;
		17
13	use SDL::OpenGL;	18	use SDL::OpenGL;
14		19
15	use Crossfire;	20	use Crossfire;
16	use Crossfire::Protocol;	21	use Crossfire::Protocol;
17		22
		23	use Compress::LZF;
		24
18	use CFClient;	25	use CFClient;
19	use CFClient::UI;	26	use CFClient::UI;
20		27
21	our $VERSION = '0.1';	28	our $VERSION = '0.1';
22		29
23	my $MAX_FPS = 60;	30	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	31	my $MIN_FPS = 5; # unused as of yet
25		32
		33	our $META_SERVER = "crossfire.real-time.com:13326";
		34
		35	our $FACEMAP;
		36	our $TILECACHE;
26	our $FACECACHE;	37	our $MAPCACHE;
27		38
28	our $LAST_REFRESH;	39	our $LAST_REFRESH;
29	our $NOW;	40	our $NOW;
30		41
31	our $CFG;	42	our $CFG;
…		…
38	our $FULLSCREEN;	49	our $FULLSCREEN;
39	our $FONTSIZE;	50	our $FONTSIZE;
40		51
41	our $MAP;	52	our $MAP;
42	our $MAPWIDGET;	53	our $MAPWIDGET;
		54	our $BUTTONBAR;
		55	our $LOGVIEW;
		56	our $CONSOLE;
		57	our $METASERVER;
		58
		59	our $GAUGES;
43		60
44	our $SDL_ACTIVE;	61	our $SDL_ACTIVE;
45	our $SDL_EV;	62	our $SDL_EV;
46	our %SDL_CB;	63	our %SDL_CB;
47		64
		65	our $SDL_MIXER;
		66	our @SOUNDS; # event => file mapping
		67	our %AUDIO_CHUNKS; # audio files
		68
48	our $ALT_ENTER_MESSAGE;	69	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	70	our $STATUS_LINE;
50	our $DEBUG_STATUS;	71	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53	our $CONSOLE;
54		72
55	sub status {	73	sub status {
56	$STATUS_LINE->set_text ($_[0]);	74	$STATUS_LINE->set_text ($_[0]);
57	my ($w, $h) = $STATUS_LINE->size_request;
58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	75	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
59	}	76	}
60		77
61	sub debug {	78	sub debug {
62	$DEBUG_STATUS->set_text ($_[0]);	79	$DEBUG_STATUS->set_text ($_[0]);
63	my ($w, $h) = $DEBUG_STATUS->size_request;	80	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
64	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
65	}	81	}
66		82
67	sub start_game {	83	sub start_game {
68	status "logging in...";	84	status "logging in...";
69		85
70	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	86	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
71		87
		88	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
		89
72	$MAP = new CFClient::Map $mapsize, $mapsize;	90	$MAP = new CFClient::Map $mapsize, $mapsize;
		91
		92	my ($host, $port) = split /:/, $CFG->{host};
73		93
74	$CONN = new conn	94	$CONN = new conn
75	host => $CFG->{host},	95	host => $host,
76	port => $CFG->{port},	96	port => $port \|\| 13327,
77	user => $CFG->{user},	97	user => $CFG->{user},
78	pass => $CFG->{password},	98	pass => $CFG->{password},
79	mapw => $mapsize,	99	mapw => $mapsize,
80	maph => $mapsize,	100	maph => $mapsize,
81	;	101	;
…		…
87		107
88	sub stop_game {	108	sub stop_game {
89	undef $CONN;	109	undef $CONN;
90	}	110	}
91		111
92	sub config_dialog {	112	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame	113	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	114	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	115	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	116	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		117
98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	118	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
99	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	119	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
100		120
101	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	121	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
102	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);	122	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);
103		123
104	$mode_slider->connect (changed => sub {	124	$mode_slider->connect (changed => sub {
105	my ($self, $value) = @_;	125	my ($self, $value) = @_;
106		126
107	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	127	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
108	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	128	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
109	});	129	});
110	$mode_slider->emit (changed => $mode_slider->{range}[0]);	130	$mode_slider->emit (changed => $mode_slider->{range}[0]);
111		131
112	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");	132	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	133	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114	my ($self, $value) = @_;	134	my ($self, $value) = @_;
115	$CFG->{fullscreen} = $value;	135	$CFG->{fullscreen} = $value;
116	});	136	});
117		137
118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");	138	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
119	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	139	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
120	my ($self, $value) = @_;	140	my ($self, $value) = @_;
121	$CFG->{fast} = $value;	141	$CFG->{fast} = $value;
122	});	142	});
123		143
124	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	144	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
125	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	145	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
126	my ($self, $value) = @_;	146	my ($self, $value) = @_;
127	$CFG->{fow_enable} = $value;	147	$CFG->{fow_enable} = $value;
128	});	148	});
129		149
130	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	150	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
131	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	151	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
132	my ($self, $value) = @_;	152	my ($self, $value) = @_;
133	$CFG->{fow_intensity} = $value;	153	$CFG->{fow_intensity} = $value;
134	});	154	});
135		155
136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	156	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	157	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138	my ($self, $value) = @_;	158	my ($self, $value) = @_;
139	$CFG->{fow_smooth} = $value;	159	$CFG->{fow_smooth} = $value;
		160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
140	});	161	});
141		162
142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");	163	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Log Fontsize");
		164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.5, 1.5, 0.1], connect_changed => sub {
		165	$CFG->{gui_fontsize} = 0.1 * int $_[0] * 10;
		166	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		167	});
		168
		169	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Log Fontsize");
143	$table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	170	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.5, 0.1], connect_changed => sub {
144	my ($self, $value) = @_;
145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	171	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[0] * 10);
146	});	172	});
147		173
148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	174	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
149	destroy_screen ();	175	video_shutdown ();
150	init_screen ();	176	video_init ();
		177	});
		178
		179	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		180	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
		181	$CFG->{audio_enable} = $_[1];
		182	});
		183	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		184	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		185	# $CFG->{effects_volume} = $_[1];
151	});	186	# });
		187	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Bg. Music");
		188	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);
		189	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
		190	$CFG->{bgm_enable} = $_[1];
		191	});
		192	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {
		193	$CFG->{bgm_volume} = $_[1];
		194	$SDL_MIXER->music_volume ($_[1]);
		195	});
		196
		197	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		198	audio_shutdown ();
		199	audio_init ();
		200	});
		201
		202	$dialog
		203	}
		204
		205	sub metaserver_dialog {
		206	my $dialog = new CFClient::UI::FancyFrame
		207	child => (my $vbox = new CFClient::UI::VBox);
		208
		209	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		210
		211	$dialog
		212	}
		213
		214	sub update_metaserver {
		215	my ($HOST) = @_;
		216
		217	status "fetching metaserver list...";
		218
		219	my $buf;
		220
		221	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		222
		223	Event->io (fd => $fh, poll => 'r', cb => sub {
		224	my $res = sysread $fh, $buf, 8192, length $buf;
		225
		226	if (!defined $res) {
		227	$_[0]->w->cancel;
		228	status "metaserver: $!";
		229	} elsif ($res == 0) {
		230	$_[0]->w->cancel;
		231	status "server list retrieved";
		232
		233	my $table = $METASERVER->{table};
		234
		235	$table->clear;
		236
		237	my @col = qw(Use #Users Host Uptime Version Description);
		238	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		239	for 0 .. $#col;
		240
		241	my @align = qw(1 0 1 1 -1);
		242
		243	my $y = 0;
		244	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		245	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		246
		247	for ($desc) {
		248	s/<br>/\n/gi;
		249	s/<li>/\n· /gi;
		250	s/<.*?>//sgi;
		251	s/&/&/g;
		252	s/</</g;
		253	s/>/>/g;
		254	}
		255
		256	$uptime = sprintf "%dd %02d:%02d:%02d",
		257	(int $m->[8] / 86400),
		258	(int $m->[8] / 3600) % 24,
		259	(int $m->[8] / 60) % 60,
		260	$m->[8] % 60;
		261
		262	$m = [$users, $host, $uptime, $version, $desc];
		263
		264	$y++;
		265
		266	$table->add (0, $y, new CFClient::UI::VBox children => [
		267	(new CFClient::UI::Button text => " ", connect_activate => sub {
		268	$HOST->set_text ($CFG->{host} = $host);
		269	}),
		270	(new CFClient::UI::Empty expand => 1),
		271	]);
		272
		273	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
		274	for 0 .. $#$m;
		275	}
		276	}
		277	});
		278	}
		279
		280	sub server_setup {
		281	my $dialog = new CFClient::UI::FancyFrame
		282	child => (my $vbox = new CFClient::UI::VBox);
152		283
153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	284	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
154	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	285	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
155	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	286	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		287
		288	{
		289	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		290
156	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	291	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
157	my ($self, $value) = @_;	292	my ($self, $value) = @_;
158	$CFG->{host} = $value;	293	$CFG->{host} = $value;
159	});	294	});
160		295
161	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	296	$METASERVER = metaserver_dialog;
162	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {	297
163	my ($self, $value) = @_;	298	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
164	$CFG->{port} = $value;	299	update_metaserver $HOST;
165	});	300	});
		301	}
166		302
167	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	303	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
168	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	304	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169	my ($self, $value) = @_;	305	my ($self, $value) = @_;
170	$CFG->{user} = $value;	306	$CFG->{user} = $value;
171	});	307	});
172		308
173	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	309	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
174	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	310	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175	my ($self, $value) = @_;	311	my ($self, $value) = @_;
176	$CFG->{password} = $value;	312	$CFG->{password} = $value;
177	});	313	});
178		314
179	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	315	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
195		331
196	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	332	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
197	start_game;	333	start_game;
198	});	334	});
199		335
200	$vbox->add (my $hbox = new CFClient::UI::HBox);
201
202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
204	status "Configuration Saved";
205	});
206
207	$dialog	336	$dialog
208	}	337	}
209		338
210	sub console_window {	339	sub message_window {
211	my $window = new CFClient::UI::FancyFrame	340	my $window = new CFClient::UI::FancyFrame
212	border_bg => [1, 1, 1, 0.5],	341	border_bg => [1, 1, 1, 0.5],
213	bg => [0.3, 0.3, 0.3, 0.8],	342	bg => [0.3, 0.3, 0.3, 0.8],
214	user_w => $::WIDTH/4,	343	user_w => int $::WIDTH / 3,
215	user_h => $::HEIGHT,	344	user_h => int $::HEIGHT / 5,
216	child => (my $vbox = new CFClient::UI::VBox);	345	child => (my $vbox = new CFClient::UI::VBox);
217		346
218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	347	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
219	expand => 1,	348	expand => 1,
220	fontsize => $::CFG->{log_fontsize},	349	fontsize => $::CFG->{log_fontsize},
221	);	350	);
222		351
223	$vbox->add (my $input = new CFClient::UI::LineEntry);	352	$vbox->add (my $input = new CFClient::UI::Entry
		353	connect_focus_in => sub {
		354	my ($input, $prev_focus) = @_;
		355
		356	delete $input->{refocus_map};
		357
		358	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		359	$input->{refocus_map} = 1;
		360	}
		361	delete $input->{auto_activated};
		362	},
224	$input->connect (activate => sub {	363	connect_activate => sub {
225	my ($input, $text) = @_;	364	my ($input, $text) = @_;
226	$input->set_text ('');	365	$input->set_text ('');
227		366
228	if ($text =~ /^\/(.*)/) {	367	if ($text =~ /^\/(.*)/) {
229	$::CONN->user_send ("command $1");	368	$::CONN->user_send ($1);
230	} else {	369	} else {
231	my $say_cmd = $::CFG->{say_command} \|\| 'say';	370	my $say_cmd = $::CFG->{say_command} \|\| 'say';
232	$::CONN->user_send ("command $say_cmd $text");	371	$::CONN->user_send ("$say_cmd $text");
233	}	372	}
		373	if ($input->{refocus_map}) {
		374	delete $input->{refocus_map};
		375	$MAPWIDGET->focus_in
234	1	376	}
235	});	377	},
236	$input->connect (escape => sub {	378	connect_escape => sub {
237	$MAPWIDGET->focus_in	379	$MAPWIDGET->focus_in
238	});	380	},
239	$input->focus_in;	381	);
240		382
241	$CONSOLE = {	383	$CONSOLE = {
242	window => $window,	384	window => $window,
243	input => $input	385	input => $input
244	};	386	};
245		387
246	$window	388	$window
247	}	389	}
248		390
249	sub sdl_init {	391	sub sdl_init {
		392	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	393	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
251	and die "SDL::Init failed!\n";	394	and die "SDL::Init failed!\n";
252	}	395	}
253		396
254	sub init_screen {	397	sub video_init {
255	sdl_init;	398	sdl_init;
256		399
257	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	400	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
258	$FULLSCREEN = $CFG->{fullscreen};	401	$FULLSCREEN = $CFG->{fullscreen};
259	$FAST = $CFG->{fast};	402	$FAST = $CFG->{fast};
260		403
261	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	404	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
262	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	405	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
263	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	406	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
264	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	407	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
265		408
266	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	409	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
267	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	410	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
268	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	411	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
269	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	412	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
286		429
287	$LAST_REFRESH = time - 0.01;	430	$LAST_REFRESH = time - 0.01;
288		431
289	CFClient::gl_init;	432	CFClient::gl_init;
290		433
291	$FONTSIZE = int $HEIGHT / 40;	434	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
292		435
293	#############################################################################	436	#############################################################################
294		437
295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	438	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	439	$DEBUG_STATUS->show;
297		440
298	$STATUS_LINE = new CFClient::UI::Label	441	$STATUS_LINE = new CFClient::UI::Label
299	padding => 0,	442	padding => 0,
300	y => $HEIGHT * 44 / 45 - $FONTSIZE;	443	y => $HEIGHT - $FONTSIZE * 1.8;
301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	444	$STATUS_LINE->show;
302		445
303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	446	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
304	padding => 0,	447	padding => 0,
305	y => $HEIGHT * 44 / 45,	448	fontsize => 0.8,
306	height => $HEIGHT / 45,
307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	449	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	450	$ALT_ENTER_MESSAGE->show;
		451	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
309		452
310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	453	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
311	$MAPWIDGET->focus_in;	454	$MAPWIDGET->focus_in;
312	$MAPWIDGET->connect (activate_console => sub {	455	$MAPWIDGET->connect (activate_console => sub {
313	my ($mapwidget, $preset) = @_;	456	my ($mapwidget, $preset) = @_;
314		457
315	if ($CONSOLE) {	458	if ($CONSOLE) {
		459	$CONSOLE->{input}->{auto_activated} = 1;
316	$CONSOLE->{input}->focus_in;	460	$CONSOLE->{input}->focus_in;
317		461
318	if ($preset && $CONSOLE->{input}->get_text eq '') {	462	if ($preset && $CONSOLE->{input}->get_text eq '') {
319	$CONSOLE->{input}->set_text ($preset);	463	$CONSOLE->{input}->set_text ($preset);
320	}	464	}
321	}	465	}
322	});	466	});
323		467
324	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	468	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
325		469
326	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	470	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	471	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
328	}	472	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
329		473
330	sub destroy_screen {	474	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		475	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		476	status "Configuration Saved";
		477	});
		478
		479	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		480
		481	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		482	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		483
		484	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
		485	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
		486	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
		487	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
		488
		489	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		490	$CFClient::UI::ROOT->add ($tgw);
		491	}
		492
		493	sub video_shutdown {
331	$CFClient::UI::TOPLEVEL->{children} = [];	494	$CFClient::UI::ROOT->{children} = [];
332	undef $SDL_ACTIVE;	495	undef $SDL_ACTIVE;
333	undef $SDL_EV;	496	undef $SDL_EV;
334	SDL::Quit;	497	}
		498
		499	my $bgmusic;#TODO#hack#d#
		500
		501	sub audio_init {
		502	if ($CFG->{audio_enable}) {
		503	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		504	$SDL_MIXER = new SDL::Mixer;
		505	$SDL_MIXER->allocate_channels (8);
		506
		507	# TODO: hack, do play loop and mood music
		508	if ($CFG->{bgm_enable}) {
		509	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
		510	$SDL_MIXER->play_music ($bgmusic, -1);
		511	$SDL_MIXER->music_volume ($CFG->{bgm_volume});
		512	}
		513
		514	while (<$fh>) {
		515	next if /^\s*#/;
		516	next if /^\s*$/;
		517
		518	my ($file, $volume, $event) = split /\s+/, $_, 3;
		519
		520	push @SOUNDS, "$volume,$file";
		521
		522	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		523	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
		524	$chunk->volume ($volume * 128 / 100);
		525	$chunk
		526	};
		527	}
		528	} else {
		529	status "unable to open sound config: $!";
		530	}
		531	}
		532	}
		533
		534	sub audio_shutdown {
		535	undef $SDL_MIXER;
		536	@SOUNDS = ();
		537	%AUDIO_CHUNKS = ();
335	}	538	}
336		539
337	my %animate_object;	540	my %animate_object;
338	my $animate_timer;	541	my $animate_timer;
339		542
…		…
347	debug sprintf "%3.2f", $fps;	550	debug sprintf "%3.2f", $fps;
348		551
349	$want_refresh = 0;	552	$want_refresh = 0;
350	$can_refresh = 0;	553	$can_refresh = 0;
351		554
352	$CFClient::UI::TOPLEVEL->draw;	555	$CFClient::UI::ROOT->draw;
353		556
354	SDL::GLSwapBuffers;	557	SDL::GLSwapBuffers;
355		558
356	$LAST_REFRESH = $NOW;	559	$LAST_REFRESH = $NOW;
357	}	560	}
…		…
388	delete $animate_object{$widget};	591	delete $animate_object{$widget};
389	}	592	}
390		593
391	@conn::ISA = Crossfire::Protocol::;	594	@conn::ISA = Crossfire::Protocol::;
392		595
		596	sub conn::stats_update {
		597	my ($self, $stats) = @_;
		598
		599	# i love text protocols!!!
		600	# FIXME: the stats are somehow weird
		601	my $hp = $stats->{1};
		602	my $hp_m = $stats->{2};
		603	my $sp = $stats->{3};
		604	my $sp_m = $stats->{4};
		605	my $fo = $stats->{18};
		606	my $fo_m = 1000;
		607	my $gr = $stats->{23};
		608	my $gr_m = $stats->{24};
		609
		610	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		611	$GAUGES->{hp}->set_value ($hp, $hp_m);
		612	$GAUGES->{mana}->set_value ($sp, $sp_m);
		613	$GAUGES->{food}->set_value ($fo, $fo_m);
		614	$GAUGES->{grace}->set_value ($gr, $gr_m);
		615	}
		616
393	sub conn::user_send {	617	sub conn::user_send {
394	my ($self, $command) = @_;	618	my ($self, $command) = @_;
395		619
396	$self->send ($command);	620	$self->send_command ($command);
397	status $command;	621	status $command;
		622	}
		623
		624	sub conn::map_scroll {
		625	my ($self, $dx, $dy) = @_;
		626
		627	$MAP->scroll ($dx, $dy);
398	}	628	}
399		629
400	sub conn::feed_map1a {	630	sub conn::feed_map1a {
401	my ($self, $data) = @_;	631	my ($self, $data) = @_;
402		632
403	# $self->Crossfire::Protocol::feed_map1a ($data);	633	# $self->Crossfire::Protocol::feed_map1a ($data);
404		634
405	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
406	$MAP->map1a_update ($data);	635	$MAP->map1a_update ($data);
407	$MAPWIDGET->update;	636	$MAPWIDGET->update;
408	}	637	}
409		638
410	#sub conn::map_update {	639	sub conn::flush_map {
411	# my ($self, $dirty) = @_;	640	my ($self) = @_;
412	#	641
413	# $MAPWIDGET->update;	642	my $map_info = delete $self->{map_info}
414	#}	643	or return;
		644
		645	my ($hash, $x, $y, $w, $h) = @$map_info;
		646
		647	my $data = $MAP->get_rect ($x, $y, $w, $h);
		648	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		649
		650	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		651
		652	}
415		653
416	sub conn::map_clear {	654	sub conn::map_clear {
417	my ($self) = @_;	655	my ($self) = @_;
418		656
		657	$self->flush_map;
		658	delete $self->{neigh};
		659
419	$MAP->clear;	660	$MAP->clear;
		661	}
420		662
421	# refresh;	663
		664	sub conn::load_map($$$) {
		665	my ($self, $hash, $x, $y) = @_;
		666
		667	if (defined (my $data = $MAPCACHE->get ($hash))) {
		668	$data = Compress::LZF::decompress $data;
		669	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		670	for my $id ($MAP->set_rect ($x, $y, $data)) {
		671	my $data = $TILECACHE->get ($id)
		672	or next;
		673
		674	$self->set_texture ($id => $data);
		675	}
		676	}
		677	}
		678
		679	sub conn::flood_fill {
		680	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		681
		682	# the server does not allow map paths > 6
		683	return if 6 <= length $path;
		684
		685	for my $tile (1..4) {
		686	next if $self->{neigh}{$hash}[$tile];
		687	next unless $flags & (1 << ($tile - 1));
		688
		689	my $neigh = $self->{neigh}{$hash} \|\|= [];
		690
		691	$self->send_mapinfo ("spatial $path$tile", sub {
		692	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		693
		694	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		695	return if $mode ne "spatial";
		696
		697	$x += $MAP->ox;
		698	$y += $MAP->oy;
		699
		700	$self->load_map ($hash, $x, $y)
		701	unless $self->{neigh}{$hash}[5]++;#d#
		702
		703	$neigh->[$tile] = [$x, $y, $w, $h];
		704
		705	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		706	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		707	});
		708	}
		709	}
		710
		711	sub conn::map_change {
		712	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		713
		714	$self->flush_map;
		715
		716	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		717
		718	my $mapmapw = 250;
		719	my $mapmaph = 250;
		720
		721	$self->flood_fill ("", $hash, $flags,
		722	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		723	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		724
		725	$x += $ox;
		726	$y += $oy;
		727
		728	$self->{map_info} = [$hash, $x, $y, $w, $h];
		729
		730	$self->load_map ($hash, $x, $y);
422	}	731	}
423		732
424	sub conn::face_find {	733	sub conn::face_find {
425	my ($self, $face) = @_;	734	my ($self, $facenum, $face) = @_;
426		735
427	$FACECACHE->{"$face->{chksum},$face->{name}"}	736	my $hash = "$face->{chksum},$face->{name}";
		737
		738	my $id = $FACEMAP->get ($hash);
		739
		740	unless ($id) {
		741	# create new id for face
		742	# i love transactions
		743	for (1..100) {
		744	my $txn = $CFClient::DB_ENV->txn_begin;
		745	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		746	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		747	$id++;
		748	if ($FACEMAP->put (id => $id) == 0
		749	&& $FACEMAP->put ($hash => $id) == 0) {
		750	$txn->txn_commit;
		751
		752	goto gotid;
		753	}
		754	}
		755	$txn->abort;
		756	}
		757
		758	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		759	}
		760
		761	gotid:
		762	$face->{id} = $id;
		763	$MAP->set_face ($facenum => $id);
		764	$TILECACHE->get ($id)
428	}	765	}
429		766
430	sub conn::face_update {	767	sub conn::face_update {
431	my ($self, $facenum, $face) = @_;	768	my ($self, $facenum, $face) = @_;
432		769
433	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	770	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
434		771
435	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	772	$self->set_texture ($face->{id} => delete $face->{image});
		773	}
436		774
		775	sub conn::set_texture {
		776	my ($self, $id, $data) = @_;
		777
		778	$self->{texture}[$id] \|\|= do {
		779	my $tex =
		780	new_from_image CFClient::Texture
		781	$data, minify => 1;
		782
437	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	783	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
438	$MAPWIDGET->update;	784	$MAPWIDGET->update;
		785
		786	$tex
		787	};
		788	}
		789
		790	sub conn::sound_play {
		791	my ($self, $x, $y, $soundnum, $type) = @_;
		792
		793	$SDL_MIXER
		794	or return;
		795
		796	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		797	or return;
		798
		799	$SDL_MIXER->play_channel (-1, $chunk);
		800	warn "sound $x,$y,$soundnum,$type\n";#d#
439	}	801	}
440		802
441	sub conn::query {	803	sub conn::query {
442	my ($self, $flags, $prompt) = @_;	804	my ($self, $flags, $prompt) = @_;
443		805
…		…
449	my ($self, $color, $text) = @_;	811	my ($self, $color, $text) = @_;
450		812
451	my @color = (	813	my @color = (
452	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	814	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
453	[1.00, 1.00, 1.00],	815	[1.00, 1.00, 1.00],
454	[0.00, 0.00, 0.55],	816	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
455	[1.00, 0.00, 0.00],	817	[1.00, 0.00, 0.00],
456	[1.00, 0.54, 0.00],	818	[1.00, 0.54, 0.00],
457	[0.11, 0.56, 1.00],	819	[0.11, 0.56, 1.00],
458	[0.93, 0.46, 0.00],	820	[0.93, 0.46, 0.00],
459	[0.18, 0.54, 0.34],	821	[0.18, 0.54, 0.34],
…		…
477	refresh;	839	refresh;
478	},	840	},
479	SDL_KEYDOWN() => sub {	841	SDL_KEYDOWN() => sub {
480	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	842	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
481	# alt-enter	843	# alt-enter
482	destroy_screen;	844	video_shutdown;
483	$CFG->{fullscreen} = !$CFG->{fullscreen};	845	$CFG->{fullscreen} = !$CFG->{fullscreen};
484	init_screen;	846	video_init;
485	} else {	847	} else {
486	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	848	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
487	}	849	}
488	},	850	},
489	SDL_KEYUP() => sub {	851	SDL_KEYUP() => sub {
…		…
503	},	865	},
504	);	866	);
505		867
506	#############################################################################	868	#############################################################################
507		869
		870	$SIG{INT} = $SIG{TERM} = sub { exit };
		871
		872	$TILECACHE = CFClient::db_table "tilecache";
		873	$FACEMAP = CFClient::db_table "facemap";
		874
508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	875	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
509		876
510	my %DEF_CFG = (	877	my %DEF_CFG = (
511	sdl_mode => 0,	878	sdl_mode => 0,
512	width => 640,	879	width => 640,
…		…
514	fullscreen => 0,	881	fullscreen => 0,
515	fast => 0,	882	fast => 0,
516	fow_enable => 1,	883	fow_enable => 1,
517	fow_intensity => 0.45,	884	fow_intensity => 0.45,
518	fow_smooth => 0,	885	fow_smooth => 0,
		886	gui_fontsize => 1,
519	log_fontsize => 14,	887	log_fontsize => 14,
520	mapsize => 100,	888	mapsize => 100,
521	host => "crossfire.schmorp.de",	889	host => "crossfire.schmorp.de",
522	port => 13327,
523	say_command => 'say',	890	say_command => 'say',
		891	audio_enable => 1,
		892	bgm_enable => 1,
		893	bgm_volume => 64,
524	);	894	);
525		895
526	while (my ($k, $v) = each %DEF_CFG) {	896	while (my ($k, $v) = each %DEF_CFG) {
527	$CFG->{$k} = $v unless exists $CFG->{$k};	897	$CFG->{$k} = $v unless exists $CFG->{$k};
528	}	898	}
…		…
536		906
537	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	907	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
538		908
539	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	909	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
540		910
541	init_screen;
542
543	{	911	{
544	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	912	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
545		913
546	CFClient::add_font $_ for @fonts;	914	CFClient::add_font $_ for @fonts;
547	CFClient::set_font $fonts[0];	915	CFClient::set_font $fonts[0];
548	}	916	}
549		917
550	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	918	video_init;
		919	audio_init;
551		920
552	Event::loop;	921	Event::loop;
553		922
554	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	923	END { SDL::Quit }
555		924
		925

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs. Revision 1.140 by root, Wed Apr 19 06:06:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs.
Revision 1.140 by root, Wed Apr 19 06:06:46 2006 UTC