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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC vs. Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC vs.
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC