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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
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	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
20	use CFClient::UI;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
25	my $MIN_FPS = 5; # unused	24	my $MIN_FPS = 5; # unused as of yet
26	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
27		25
28	our $FACECACHE;	26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
29		30
30	our $CFG;	31	our $CFG;
31	our $CONN;	32	our $CONN;
32	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
33		34
34	our @SDL_MODES;	35	our @SDL_MODES;
35	our $WIDTH;	36	our $WIDTH;
36	our $HEIGHT;	37	our $HEIGHT;
37	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
38		40
39	our $NOW;	41	our $MAP;
40
41	our $MAPWIDGET;	42	our $MAPWIDGET;
42	our $FONTSIZE;
43		43
44	our $SDL_TIMER;	44	our $SDL_ACTIVE;
45	our $SDL_APP;
46	our $SDL_EV;	45	our $SDL_EV;
47	our %SDL_CB;	46	our %SDL_CB;
48		47
49	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
50	our $STATUS_LINE;	49	our $STATUS_LINE;
51	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
52		51	our $BUTTONBAR;
53	my $last_refresh;	52	our $LOGVIEW;
54	my %ANIMATE;	53	our $CONSOLE;
55	my $refresh_handler;
56		54
57	sub status {	55	sub status {
58	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
59	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
60	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
69	sub start_game {	67	sub start_game {
70	status "logging in...";	68	status "logging in...";
71		69
72	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	70	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73		71
		72	$MAP = new CFClient::Map $mapsize, $mapsize;
		73
74	$CONN = new conn	74	$CONN = new conn
75	host => $CFG->{host},	75	host => $CFG->{host},
76	port => $CFG->{port},	76	port => $CFG->{port},
77	user => $CFG->{user},	77	user => $CFG->{user},
78	pass => $CFG->{password},	78	pass => $CFG->{password},
…		…
88	sub stop_game {	88	sub stop_game {
89	undef $CONN;	89	undef $CONN;
90	}	90	}
91		91
92	sub config_dialog {	92	sub config_dialog {
93	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		97
98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114	my ($self, $value) = @_;	114	my ($self, $value) = @_;
115	$CFG->{fullscreen} = $value;	115	$CFG->{fullscreen} = $value;
116	});	116	});
117		117
		118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		119	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fast} = $value;
		122	});
		123
		124	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		125	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		126	my ($self, $value) = @_;
		127	$CFG->{fow_enable} = $value;
		128	});
		129
		130	$table->add (0, 4, new CFClient::UI::Label 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 {
		132	my ($self, $value) = @_;
		133	$CFG->{fow_intensity} = $value;
		134	});
		135
		136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		138	my ($self, $value) = @_;
		139	$CFG->{fow_smooth} = $value;
		140	});
		141
		142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		143	$table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		144	my ($self, $value) = @_;
		145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		146	});
		147
118	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
119	destroy_screen ();	149	destroy_screen ();
120	init_screen ();	150	init_screen ();
121	});	151	});
122		152
123	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
124	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	154	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
125	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	155	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
126	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	156	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
127		157	my ($self, $value) = @_;
		158	$CFG->{host} = $value;
		159	});
		160
128	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	161	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
129	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	162	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
		163	my ($self, $value) = @_;
		164	$CFG->{port} = $value;
		165	});
130		166
131	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	167	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
132	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	168	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		169	my ($self, $value) = @_;
		170	$CFG->{user} = $value;
		171	});
133		172
134	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	173	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
135	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	174	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		175	my ($self, $value) = @_;
		176	$CFG->{password} = $value;
		177	});
136		178
		179	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		180	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		181	my ($self, $value) = @_;
		182	$CFG->{say_command} = $value;
		183	});
		184
137	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	185	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
138	$table->add (1, 6, new CFClient::UI::Slider	186	$table->add (1, 7, new CFClient::UI::Slider
139	req_w => 100,	187	req_w => 100,
140	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	188	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
141	connect_changed => sub {	189	connect_changed => sub {
142	my ($self, $value) = @_;	190	my ($self, $value) = @_;
143		191
144	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	192	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
145	},	193	},
146	);	194	);
147		195
148	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	196	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
149	start_game;	197	start_game;
150	});	198	});
151		199
152	$vbox->add (my $hbox = new CFClient::UI::HBox);	200	$vbox->add (my $hbox = new CFClient::UI::HBox);
153		201
154	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
155	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
156	status "Configuration Saved";	204	status "Configuration Saved";
157	});	205	});
158	$CFClient::UI::TOPLEVEL->add ($dialog);	206
		207	$dialog
		208	}
		209
		210	sub console_window {
		211	my $window = new CFClient::UI::FancyFrame
		212	border_bg => [1, 1, 1, 0.5],
		213	bg => [0.3, 0.3, 0.3, 0.8],
		214	user_w => $::WIDTH/4,
		215	user_h => $::HEIGHT,
		216	child => (my $vbox = new CFClient::UI::VBox);
		217
		218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		219	expand => 1,
		220	fontsize => $::CFG->{log_fontsize},
		221	);
		222
		223	$vbox->add (my $input = new CFClient::UI::LineEntry);
		224	$input->connect (activate => sub {
		225	my ($input, $text) = @_;
		226	$input->set_text ('');
		227
		228	if ($text =~ /^\/(.*)/) {
		229	$::CONN->user_send ("command $1");
		230	} else {
		231	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		232	$::CONN->user_send ("command $say_cmd $text");
		233	}
		234	1
		235	});
		236	$input->connect (escape => sub {
		237	$MAPWIDGET->focus_in
		238	});
		239	$input->focus_in;
		240
		241	$CONSOLE = {
		242	window => $window,
		243	input => $input
		244	};
		245
		246	$window
		247	}
		248
		249	sub sdl_init {
		250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		251	and die "SDL::Init failed!\n";
159	}	252	}
160		253
161	sub init_screen {	254	sub init_screen {
		255	sdl_init;
		256
162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	257	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163	$FULLSCREEN = $CFG->{fullscreen};	258	$FULLSCREEN = $CFG->{fullscreen};
		259	$FAST = $CFG->{fast};
164		260
165	$SDL_APP = new SDL::App	261	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	262	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
167	-title => "Crossfire+ Client",	263	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
168	-width => $WIDTH,	264	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
169	-height => $HEIGHT,	265
170	-opengl => 1,	266	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
171	-red_size => 5,	267	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
172	-green_size => 5,	268	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
173	-blue_size => 5,	269	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
174	-alpha_size => 0,	270
175	-double_buffer => 1,	271	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
176	-fullscreen => $FULLSCREEN,	272	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
177	-resizeable => 0;	273	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		274
		275	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		276	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		277	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		278	or die "SDL::SetVideoMode failed!\n";
		279
		280	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
178		281
179	$SDL_EV = new SDL::Event;	282	$SDL_EV = new SDL::Event;
180	$SDL_EV->set_unicode (1);	283	$SDL_EV->set_unicode (1);
181		284
182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	285	$SDL_ACTIVE = 1;
183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
184	while $SDL_EV->poll;
185		286
186	1	287	$LAST_REFRESH = time - 0.01;
187	};
188
189	$last_refresh = SDL::GetTicks;
190		288
191	CFClient::gl_init;	289	CFClient::gl_init;
192		290
193	$FONTSIZE = int $HEIGHT / 40;	291	$FONTSIZE = int $HEIGHT / 40;
194		292
195	#############################################################################	293	#############################################################################
196		294
197	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
198	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
199		297
200	$STATUS_LINE = new CFClient::UI::Label	298	$STATUS_LINE = new CFClient::UI::Label
201	padding => 0,	299	padding => 0,
202	y => $HEIGHT * 49 / 50 - $FONTSIZE;	300	y => $HEIGHT * 44 / 45 - $FONTSIZE;
203	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
204		302
205	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
206	padding => 0,	304	padding => 0,
207	y => $HEIGHT * 49 / 50,	305	y => $HEIGHT * 44 / 45,
208	height => $HEIGHT / 50,	306	height => $HEIGHT / 45,
209	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
210	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
211		309
212	$MAPWIDGET = new CFClient::UI::MapWidget;
213	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);	310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
214	$MAPWIDGET->focus_in;	311	$MAPWIDGET->focus_in;
		312	$MAPWIDGET->connect (activate_console => sub {
		313	my ($mapwidget, $preset) = @_;
215		314
216	config_dialog;	315	if ($CONSOLE) {
		316	$CONSOLE->{input}->focus_in;
		317
		318	if ($preset && $CONSOLE->{input}->get_text eq '') {
		319	$CONSOLE->{input}->set_text ($preset);
		320	}
		321	}
		322	});
		323
		324	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
		325
		326	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
		327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
217	}	328	}
218		329
219	sub destroy_screen {	330	sub destroy_screen {
220	$CFClient::UI::TOPLEVEL->{children} = [];	331	$CFClient::UI::TOPLEVEL->{children} = [];
221	remove Glib::Source $SDL_TIMER;
222	remove Glib::Source $refresh_handler if $refresh_handler;
223	undef $refresh_handler;
224	undef $SDL_APP;	332	undef $SDL_ACTIVE;
225	undef $SDL_EV;	333	undef $SDL_EV;
226	SDL::Quit;	334	SDL::Quit;
227	}	335	}
228		336
		337	my %animate_object;
		338	my $animate_timer;
		339
		340	my $want_refresh;
		341	my $can_refresh;
		342
		343	my $fps = 9;
		344
229	sub force_refresh {	345	sub force_refresh {
230	glViewport 0, 0, $WIDTH, $HEIGHT;	346	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		347	debug sprintf "%3.2f", $fps;
231		348
232	glMatrixMode GL_PROJECTION;	349	$want_refresh = 0;
233	glLoadIdentity;	350	$can_refresh = 0;
234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
235	glMatrixMode GL_MODELVIEW;
236	glLoadIdentity;
237
238	glClear GL_COLOR_BUFFER_BIT;
239		351
240	$CFClient::UI::TOPLEVEL->draw;	352	$CFClient::UI::TOPLEVEL->draw;
241		353
242	SDL::GLSwapBuffers;	354	SDL::GLSwapBuffers;
243	}
244		355
245	my $FPS;	356	$LAST_REFRESH = $NOW;
		357	}
		358
		359	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		360	$NOW = time;
		361
		362	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		363	while $SDL_EV->poll;
		364
		365	if (%animate_object) {
		366	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		367	$want_refresh++;
		368	}
		369
		370	if ($want_refresh) {
		371	force_refresh;
		372	} else {
		373	$can_refresh = 1;
		374	}
		375	});
246		376
247	sub refresh {	377	sub refresh {
248	$refresh_handler \|\|= add Glib::Idle sub {	378	$want_refresh++;
249	if ($SDL_APP) {
250	$NOW = SDL::GetTicks;
251
252	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
253	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
254	$NOW = SDL::GetTicks;
255	}
256
257	my $interval = ($NOW - $last_refresh) * 0.001;
258	$last_refresh = $NOW;
259
260	if ($interval) {
261	$FPS \|\|= 1 / $interval;
262	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
263	debug sprintf "%5.02f", $FPS;
264	}
265
266	force_refresh;
267	$_->animate ($interval) for grep $_, values %ANIMATE;
268
269	if (%ANIMATE) {
270	1
271	} else {
272	undef $refresh_handler;
273	0
274	}
275	} else {
276	undef $refresh_handler;
277	0
278	}
279	};
280	}	379	}
281		380
282	sub animation_start {	381	sub animation_start {
283	my ($widget) = @_;	382	my ($widget) = @_;
284	$ANIMATE{$widget} = $widget;	383	$animate_object{$widget} = $widget;
285	Scalar::Util::weaken $ANIMATE{$widget};
286
287	refresh;
288	}	384	}
289		385
290	sub animation_stop {	386	sub animation_stop {
291	my ($widget) = @_;	387	my ($widget) = @_;
292	delete $ANIMATE{$widget};	388	delete $animate_object{$widget};
		389	}
		390
		391	@conn::ISA = Crossfire::Protocol::;
		392
		393	sub conn::user_send {
		394	my ($self, $command) = @_;
		395
		396	$self->send ($command);
		397	status $command;
		398	}
		399
		400	sub conn::feed_map1a {
		401	my ($self, $data) = @_;
		402
		403	# $self->Crossfire::Protocol::feed_map1a ($data);
		404
		405	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		406	$MAP->map1a_update ($data);
		407	$MAPWIDGET->update;
		408	}
		409
		410	#sub conn::map_update {
		411	# my ($self, $dirty) = @_;
		412	#
		413	# $MAPWIDGET->update;
		414	#}
		415
		416	sub conn::map_clear {
		417	my ($self) = @_;
		418
		419	$MAP->clear;
		420
		421	# refresh;
		422	}
		423
		424	sub conn::face_find {
		425	my ($self, $face) = @_;
		426
		427	$FACECACHE->{"$face->{chksum},$face->{name}"}
		428	}
		429
		430	sub conn::face_update {
		431	my ($self, $facenum, $face) = @_;
		432
		433	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		434
		435	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		436
		437	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
		438	$MAPWIDGET->update;
		439	}
		440
		441	sub conn::query {
		442	my ($self, $flags, $prompt) = @_;
		443
		444	#TODO
		445	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		446	}
		447
		448	sub conn::drawinfo {
		449	my ($self, $color, $text) = @_;
		450
		451	my @color = (
		452	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		453	[1.00, 1.00, 1.00],
		454	[0.00, 0.00, 0.55],
		455	[1.00, 0.00, 0.00],
		456	[1.00, 0.54, 0.00],
		457	[0.11, 0.56, 1.00],
		458	[0.93, 0.46, 0.00],
		459	[0.18, 0.54, 0.34],
		460	[0.56, 0.73, 0.56],
		461	[0.80, 0.80, 0.80],
		462	[0.55, 0.41, 0.13],
		463	[0.99, 0.77, 0.26],
		464	[0.74, 0.65, 0.41],
		465	);
		466
		467	$LOGVIEW->add_paragraph ($color[$color], $text);
293	}	468	}
294		469
295	%SDL_CB = (	470	%SDL_CB = (
296	SDL_QUIT() => sub {	471	SDL_QUIT() => sub {
297	main_quit Gtk2;	472	Event::unloop -1;
298	},	473	},
299	SDL_VIDEORESIZE() => sub {	474	SDL_VIDEORESIZE() => sub {
300	},	475	},
301	SDL_VIDEOEXPOSE() => sub {	476	SDL_VIDEOEXPOSE() => sub {
302	refresh;	477	refresh;
303	},	478	},
304	SDL_KEYDOWN() => sub {	479	SDL_KEYDOWN() => sub {
305	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	480	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
306	# alt-enter	481	# alt-enter
307	$FULLSCREEN = !$FULLSCREEN;
308	destroy_screen;	482	destroy_screen;
		483	$CFG->{fullscreen} = !$CFG->{fullscreen};
309	init_screen;	484	init_screen;
310	} else {	485	} else {
311	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	486	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
312	}	487	}
313	},	488	},
…		…
326	SDL_ACTIVEEVENT() => sub {	501	SDL_ACTIVEEVENT() => sub {
327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	502	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
328	},	503	},
329	);	504	);
330		505
331	@conn::ISA = Crossfire::Protocol::;
332
333	sub conn::map_update {
334	my ($self, $dirty) = @_;
335
336	$MAPWIDGET->update;
337	}
338
339	sub conn::map_scroll {
340	my ($self, $dx, $dy) = @_;
341
342	# refresh;
343	}
344
345	sub conn::map_clear {
346	my ($self) = @_;
347
348	# refresh;
349	}
350
351	sub conn::face_find {
352	my ($self, $face) = @_;
353
354	$FACECACHE->{"$face->{chksum},$face->{name}"}
355	}
356
357	sub conn::face_update {
358	my ($self, $face) = @_;
359
360	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
361
362	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
363	}
364
365	sub conn::query {
366	my ($self, $flags, $prompt) = @_;
367
368	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
369	}
370
371	sub gtk_add_cfg_field {
372	my ($tbl, $cfg, $klbl, $key, $value) = @_;
373	my $i = $cfg->{_i}++;
374	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
375	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
376	if ($key eq 'password') {
377	$ent->set_invisible_char ("*");
378	$ent->set (visibility => 0)
379	}
380	$ent->set_text ($value);
381	$ent->signal_connect (changed => sub {
382	my ($ent) = @_;
383	$cfg->{$key} = $ent->get_text;
384	# TODO: Mapsize should be a slider in the game gui
385	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
386	$cfg->{$key} = 100;
387	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
388	$cfg->{$key} = 50;
389	}
390	});
391	}
392
393	sub run_config_dialog {
394	my (%events) = @_;
395
396	my $w = Gtk2::Window->new;
397
398	my @cfg = (
399	[qw/Host host/],
400	[qw/Port port/],
401	[qw/Mapsize% mapsize/],
402	[qw/Username user/],
403	[qw/Password password/],
404	);
405
406	my $cfg = {};
407
408	$w->add (my $vb = Gtk2::VBox->new);
409	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
410	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
411	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
412	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
413	my $i = 0;
414	my $act = 0;
415	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
416	if ($_ eq $selmode) { $act = $i }
417	$cb->append_text ($_);
418	$i++;
419	}
420	$cb->set_active ($act);
421	$cb->signal_connect (changed => sub {
422	my ($cb) = @_;
423	my $txt = $cb->get_active_text;
424	if ($txt =~ m/(\d+)x(\d+)/) {
425	$::CFG->{width} = $1;
426	$::CFG->{height} = $2;
427	}
428	});
429
430	$cfg->{_i} = 1;
431	for (@cfg) {
432	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
433	}
434
435	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
436	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
437	$cb->signal_connect (clicked => sub {
438	for (keys %$cfg) {
439	$::CFG->{$_} = $cfg->{$_}
440	if $_ ne '_i';
441	}
442	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
443	});
444	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
445	$cb->signal_connect (clicked => sub {
446	for (keys %$cfg) {
447	$::CFG->{$_} = $cfg->{$_}
448	if $_ ne '_i';
449	}
450	my $cb = $events{login} \|\| sub {};
451	$cb->($::CFG->{user}, $::CFG->{password});
452	});
453	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
454	$cb->signal_connect (clicked => sub {
455	my $cb = $events{logout} \|\| sub {};
456	$cb->();
457	});
458	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
459	$cb->signal_connect (clicked => sub { $w->destroy });
460
461	$w->show_all;
462
463	$w->signal_connect (destroy => sub { Gtk2->main_quit });
464	}
465
466
467	#############################################################################	506	#############################################################################
468		507
469	SDL::Init SDL_INIT_EVERYTHING;
470
471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
473
474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
475		509
476	$CFG \|\|= {	510	my %DEF_CFG = (
		511	sdl_mode => 0,
477	width => 640,	512	width => 640,
478	height => 480,	513	height => 480,
479	fullscreen => 0,	514	fullscreen => 0,
480	sdl_mode => 0,	515	fast => 0,
		516	fow_enable => 1,
		517	fow_intensity => 0.45,
		518	fow_smooth => 0,
		519	log_fontsize => 14,
481	mapsize => 100,	520	mapsize => 100,
482	host => "crossfire.schmorp.de",	521	host => "crossfire.schmorp.de",
483	port => 13327,	522	port => 13327,
484	};	523	say_command => 'say',
		524	);
		525
		526	while (my ($k, $v) = each %DEF_CFG) {
		527	$CFG->{$k} = $v unless exists $CFG->{$k};
		528	}
		529
		530	sdl_init;
		531
		532	@SDL_MODES = reverse
		533	grep $_->[0] >= 640 && $_->[1] >= 480,
		534	map [SDL::RectW ($_), SDL::RectH ($_)],
		535	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		536
		537	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		538
		539	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		540
		541	init_screen;
485		542
486	{	543	{
487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	544	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488		545
489	CFClient::add_font $_ for @fonts;	546	CFClient::add_font $_ for @fonts;
490	CFClient::set_font $fonts[0];	547	CFClient::set_font $fonts[0];
491	}	548	}
492		549
493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	550	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
494		551
495	init_screen;	552	Event::loop;
496
497	main Gtk2;
498		553
499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	554	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500		555

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs. Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC