[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.101 by elmex, Fri Apr 14 11:32:22 2006 UTC

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

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.101 by elmex, Fri Apr 14 11:32:22 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.101 by elmex, Fri Apr 14 11:32:22 2006 UTC