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

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.107 by root, Sat Apr 15 00:04:59 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.107 by root, Sat Apr 15 00:04:59 2006 UTC