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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.64 by root, Tue Apr 11 12:21:30 2006 UTC vs. Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.64 by root, Tue Apr 11 12:21:30 2006 UTC vs.
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC