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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.31 by elmex, Sat Apr 8 16:34:47 2006 UTC vs. Revision 1.97 by root, Thu Apr 13 23:31:43 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.31 by elmex, Sat Apr 8 16:34:47 2006 UTC vs.
Revision 1.97 by root, Thu Apr 13 23:31:43 2006 UTC