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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.77 by root, Tue Apr 11 22:49:13 2006 UTC vs. Revision 1.94 by root, Thu Apr 13 01:55:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.77 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.94 by root, Thu Apr 13 01:55:39 2006 UTC