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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC vs.
Revision 1.107 by root, Sat Apr 15 00:04:59 2006 UTC

…		…
34		34
35	our @SDL_MODES;	35	our @SDL_MODES;
36	our $WIDTH;	36	our $WIDTH;
37	our $HEIGHT;	37	our $HEIGHT;
38	our $FULLSCREEN;	38	our $FULLSCREEN;
		39	our $FONTSIZE;
39		40
		41	our $MAP;
40	our $MAPWIDGET;	42	our $MAPWIDGET;
41	our $FONTSIZE;
42		43
43	our $SDL_ACTIVE;	44	our $SDL_ACTIVE;
44	our $SDL_EV;	45	our $SDL_EV;
45	our %SDL_CB;	46	our %SDL_CB;
46		47
47	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
48	our $STATUS_LINE;	49	our $STATUS_LINE;
49	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
		51	our $BUTTONBAR;
		52	our $LOGVIEW;
		53	our $CONSOLE;
50		54
51	sub status {	55	sub status {
52	$STATUS_LINE->set_text ($_[0]);	56	$STATUS_LINE->set_text ($_[0]);
53	my ($w, $h) = $STATUS_LINE->size_request;	57	my ($w, $h) = $STATUS_LINE->size_request;
54	$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);
…		…
61	}	65	}
62		66
63	sub start_game {	67	sub start_game {
64	status "logging in...";	68	status "logging in...";
65		69
66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	70	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
67		71
		72	$MAP = new CFClient::Map $mapsize, $mapsize;
		73
68	$CONN = new conn	74	$CONN = new conn
69	host => $CFG->{host},	75	host => $CFG->{host},
70	port => $CFG->{port},	76	port => $CFG->{port},
71	user => $CFG->{user},	77	user => $CFG->{user},
72	pass => $CFG->{password},	78	pass => $CFG->{password},
…		…
82	sub stop_game {	88	sub stop_game {
83	undef $CONN;	89	undef $CONN;
84	}	90	}
85		91
86	sub config_dialog {	92	sub config_dialog {
87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	93	my $dialog = new CFClient::UI::FancyFrame
88	child => (my $vbox = new CFClient::UI::VBox);	94	child => (my $vbox = new CFClient::UI::VBox);
89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90	$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]);
91		97
92	$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");
…		…
114	my ($self, $value) = @_;	120	my ($self, $value) = @_;
115	$CFG->{fast} = $value;	121	$CFG->{fast} = $value;
116	});	122	});
117		123
118	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	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");
119	$table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	131	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
120	my ($self, $value) = @_;	132	my ($self, $value) = @_;
121	$CFG->{fow_intensity} = $value;	133	$CFG->{fow_intensity} = $value;
122	});	134	});
123		135
124	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");	136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
125	$table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
126	my ($self, $value) = @_;	138	my ($self, $value) = @_;
127	$CFG->{fow_smooth} = $value;	139	$CFG->{fow_smooth} = $value;
128	});	140	});
129		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
130	$table->add (1, 5, 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 {
131	destroy_screen ();	149	destroy_screen ();
132	init_screen ();	150	init_screen ();
133	});	151	});
134		152
135	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
136	$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]);
137	$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");
138	$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 {
139		157	my ($self, $value) = @_;
		158	$CFG->{host} = $value;
		159	});
		160
140	$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");
141	$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	});
142		166
143	$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");
144	$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	});
145		172
146	$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");
147	$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	});
148		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
149	$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");
150	$table->add (1, 6, new CFClient::UI::Slider	186	$table->add (1, 7, new CFClient::UI::Slider
151	req_w => 100,	187	req_w => 100,
152	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	188	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
153	connect_changed => sub {	189	connect_changed => sub {
154	my ($self, $value) = @_;	190	my ($self, $value) = @_;
155		191
156	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	192	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
157	},	193	},
158	);	194	);
159		195
160	$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 {
161	start_game;	197	start_game;
162	});	198	});
163		199
164	$vbox->add (my $hbox = new CFClient::UI::HBox);	200	$vbox->add (my $hbox = new CFClient::UI::HBox);
165		201
166	$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 {
167	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
168	status "Configuration Saved";	204	status "Configuration Saved";
169	});	205	});
170	$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
171	}	247	}
172		248
173	sub sdl_init {	249	sub sdl_init {
174	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
175	and die "SDL::Init failed!\n";	251	and die "SDL::Init failed!\n";
…		…
214		290
215	$FONTSIZE = int $HEIGHT / 40;	291	$FONTSIZE = int $HEIGHT / 40;
216		292
217	#############################################################################	293	#############################################################################
218		294
219	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
220	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
221		297
222	$STATUS_LINE = new CFClient::UI::Label	298	$STATUS_LINE = new CFClient::UI::Label
223	padding => 0,	299	padding => 0,
224	y => $HEIGHT * 49 / 50 - $FONTSIZE;	300	y => $HEIGHT * 44 / 45 - $FONTSIZE;
225	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
226		302
227	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
228	padding => 0,	304	padding => 0,
229	y => $HEIGHT * 49 / 50,	305	y => $HEIGHT * 44 / 45,
230	height => $HEIGHT / 50,	306	height => $HEIGHT / 45,
231	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
232	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
233		309
234	$MAPWIDGET = new CFClient::UI::MapWidget;
235	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);	310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
236	$MAPWIDGET->focus_in;	311	$MAPWIDGET->focus_in;
		312	$MAPWIDGET->connect (activate_console => sub {
		313	my ($mapwidget, $preset) = @_;
237		314
238	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);
239	}	328	}
240		329
241	sub destroy_screen {	330	sub destroy_screen {
242	$CFClient::UI::TOPLEVEL->{children} = [];	331	$CFClient::UI::TOPLEVEL->{children} = [];
243	undef $SDL_ACTIVE;	332	undef $SDL_ACTIVE;
…		…
257	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;	346	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
258	debug sprintf "%3.2f", $fps;	347	debug sprintf "%3.2f", $fps;
259		348
260	$want_refresh = 0;	349	$want_refresh = 0;
261	$can_refresh = 0;	350	$can_refresh = 0;
262
263	glViewport 0, 0, $WIDTH, $HEIGHT;
264
265	glMatrixMode GL_PROJECTION;
266	glLoadIdentity;
267	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
268	glMatrixMode GL_MODELVIEW;
269	glLoadIdentity;
270
271	glClearColor +($CFG->{fow_intensity}) x 3, 1;
272	glClear GL_COLOR_BUFFER_BIT;
273		351
274	$CFClient::UI::TOPLEVEL->draw;	352	$CFClient::UI::TOPLEVEL->draw;
275		353
276	SDL::GLSwapBuffers;	354	SDL::GLSwapBuffers;
277		355
…		…
317		395
318	$self->send ($command);	396	$self->send ($command);
319	status $command;	397	status $command;
320	}	398	}
321		399
322	sub conn::map_update {	400	sub conn::feed_map1a {
323	my ($self, $dirty) = @_;	401	my ($self, $data) = @_;
324		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);
325	$MAPWIDGET->update;	407	$MAPWIDGET->update;
326	}	408	}
327		409
328	sub conn::map_scroll {	410	#sub conn::map_update {
329	my ($self, $dx, $dy) = @_;	411	# my ($self, $dirty) = @_;
330		412	#
331	# refresh;	413	# $MAPWIDGET->update;
332	}	414	#}
333		415
334	sub conn::map_clear {	416	sub conn::map_clear {
335	my ($self) = @_;	417	my ($self) = @_;
336		418
		419	$MAP->clear;
		420
337	# refresh;	421	# refresh;
338	}	422	}
339		423
340	sub conn::face_find {	424	sub conn::face_find {
341	my ($self, $face) = @_;	425	my ($self, $face) = @_;
342		426
343	$FACECACHE->{"$face->{chksum},$face->{name}"}	427	$FACECACHE->{"$face->{chksum},$face->{name}"}
344	}	428	}
345		429
346	sub conn::face_update {	430	sub conn::face_update {
347	my ($self, $face) = @_;	431	my ($self, $facenum, $face) = @_;
348		432
349	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	433	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
350		434
351	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	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)}, @{$tex->{minified}});
		438	$MAPWIDGET->update;
352	}	439	}
353		440
354	sub conn::query {	441	sub conn::query {
355	my ($self, $flags, $prompt) = @_;	442	my ($self, $flags, $prompt) = @_;
356		443
		444	#TODO
357	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	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);
358	}	468	}
359		469
360	%SDL_CB = (	470	%SDL_CB = (
361	SDL_QUIT() => sub {	471	SDL_QUIT() => sub {
362	Event::unloop -1;	472	Event::unloop -1;
…		…
367	refresh;	477	refresh;
368	},	478	},
369	SDL_KEYDOWN() => sub {	479	SDL_KEYDOWN() => sub {
370	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) {
371	# alt-enter	481	# alt-enter
372	$FULLSCREEN = !$FULLSCREEN;
373	destroy_screen;	482	destroy_screen;
		483	$CFG->{fullscreen} = !$CFG->{fullscreen};
374	init_screen;	484	init_screen;
375	} else {	485	} else {
376	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	486	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
377	}	487	}
378	},	488	},
…		…
396	#############################################################################	506	#############################################################################
397		507
398	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
399		509
400	my %DEF_CFG = (	510	my %DEF_CFG = (
		511	sdl_mode => 0,
401	width => 640,	512	width => 640,
402	height => 480,	513	height => 480,
		514	fullscreen => 0,
403	fast => 0,	515	fast => 0,
		516	fow_enable => 1,
404	fow_intensity => 0.45,	517	fow_intensity => 0.45,
405	fow_smooth => 0,	518	fow_smooth => 0,
406	fullscreen => 0,	519	log_fontsize => 14,
407	sdl_mode => 0,
408	mapsize => 100,	520	mapsize => 100,
409	host => "crossfire.schmorp.de",	521	host => "crossfire.schmorp.de",
410	port => 13327,	522	port => 13327,
		523	say_command => 'say',
411	);	524	);
412		525
413	while (my ($k, $v) = each %DEF_CFG) {	526	while (my ($k, $v) = each %DEF_CFG) {
414	$CFG->{$k} = $v unless exists $CFG->{$k};	527	$CFG->{$k} = $v unless exists $CFG->{$k};
415	}	528	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC vs. Revision 1.107 by root, Sat Apr 15 00:04:59 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC vs.
Revision 1.107 by root, Sat Apr 15 00:04:59 2006 UTC