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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.40 by root, Sun Apr 9 01:19:16 2006 UTC vs. Revision 1.98 by root, Fri Apr 14 00:15:52 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.40 by root, Sun Apr 9 01:19:16 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 00:15:52 2006 UTC