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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.61 by root, Mon Apr 10 11:57:17 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use Crossfire::Client;	18	use CFClient;
20	use Crossfire::Client::Widget;	19	use CFClient::UI;
		20
		21	our $VERSION = '0.1';
		22
		23	my $MAX_FPS = 60;
		24	my $MIN_FPS = 5; # unused as of yet
		25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
21		27
22	our $FACECACHE;	28	our $FACECACHE;
23		29
24	our $VERSION = '0.1';	30	our $LAST_REFRESH;
25		31	our $NOW;
26	our %GL_EXT;
27		32
28	our $CFG;	33	our $CFG;
29	our $CONN;	34	our $CONN;
		35	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
30		36
		37	our @SDL_MODES;
31	our $WIDTH;	38	our $WIDTH;
32	our $HEIGHT;	39	our $HEIGHT;
33	our $FULLSCREEN;	40	our $FULLSCREEN;
34
35	our $FONTSIZE;	41	our $FONTSIZE;
36		42
		43	our $MAP;
		44	our $MAPWIDGET;
		45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
		49
37	our $SDL_TIMER;	50	our $SDL_ACTIVE;
38	our $SDL_APP;
39	our $SDL_EV;	51	our $SDL_EV;
40	our %SDL_CB;	52	our %SDL_CB;
41		53
42	our @GL_INIT; # hooks called on every gl init
43
44	our $ALT_ENTER_MESSAGE;	54	our $ALT_ENTER_MESSAGE;
45	our $STATUS_LINE;	55	our $STATUS_LINE;
		56	our $DEBUG_STATUS;
46		57
47	my $last_refresh;	58	sub status {
48	my %ANIMATE;	59	$STATUS_LINE->set_text ($_[0]);
49	my $refresh_handler;	60	my ($w, $h) = $STATUS_LINE->size_request;
		61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		62	}
50		63
51	our ($tw, $te); # Test widget #d#	64	sub debug {
		65	$DEBUG_STATUS->set_text ($_[0]);
		66	my ($w, $h) = $DEBUG_STATUS->size_request;
		67	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		68	}
52		69
53	sub init_screen {	70	sub start_game {
54	$SDL_APP = new SDL::App	71	status "logging in...";
55	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
56	-title => "Crossfire+ Client",
57	-width => $WIDTH,
58	-height => $HEIGHT,
59	-opengl => 1,
60	-red_size => 5,
61	-green_size => 5,
62	-blue_size => 5,
63	-alpha_size => 0,
64	-double_buffer => 1,
65	-fullscreen => $FULLSCREEN,
66	-resizeable => 0;
67		72
68	$SDL_EV = new SDL::Event;	73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
69	$SDL_EV->set_unicode (1);
70		74
71	$last_refresh = SDL::GetTicks;	75	$MAP = new CFClient::Map $mapsize, $mapsize;
72		76
73	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;	77	my ($host, $port) = split /:/, $CFG->{host};
74
75	$GL_EXT{GL_ARB_texture_non_power_of_two}
76	or warn "WARNING: non-power-of-two opengl extension required";
77
78	$FONTSIZE = int $HEIGHT / 50;
79
80	#############################################################################
81
82	glClearColor 0.7, 0.7, 0.7, 1;
83
84	glEnable GL_TEXTURE_2D;
85	glEnable GL_COLOR_MATERIAL;
86	glShadeModel GL_FLAT;
87	glDisable GL_DEPTH_TEST;
88	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89
90	$_->() for @GL_INIT;
91
92	#############################################################################
93		78
94	$STATUS_LINE = new Crossfire::Client::Widget::Label
95	0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE,
96	"";
97	$Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE);
98
99	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
100	0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60,
101	"Use <b>Alt-Enter</b> to toggle fullscreen mode";
102	$Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
103
104	# Test code #d#
105	unless ($tw) { # haha...
106	$te = new Crossfire::Client::Widget::FancyFrame;
107	$te->add (new Crossfire::Client::Widget::Entry);
108	$te->move (300, 0, 2);
109	$Crossfire::Client::Widget::TOPLEVEL->add ($te);
110
111	$tw = new Crossfire::Client::Widget::Animator;
112	my $lbl1 = new Crossfire::Client::Widget::Label
113	0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
114	my $lbl2 = new Crossfire::Client::Widget::Label
115	0, 0, 10, $FONTSIZE, "LBL2";
116
117	my $vb = new Crossfire::Client::Widget::VBox;
118	my $f = new Crossfire::Client::Widget::FancyFrame;
119	my $f2 = new Crossfire::Client::Widget::FancyFrame;
120	$f->add ($lbl1);
121	$f2->add ($lbl2);
122	$vb->add ($f);
123	$vb->add ($f2, 1);
124
125	$tw->add ($vb);
126	$tw->w (400);
127	$tw->h (300);
128	$tw->move ($WIDTH - 200, 0);
129	$tw->moveto (0, 0);
130	$Crossfire::Client::Widget::TOPLEVEL->add ($tw);
131
132	# $f->move ($WIDTH - 200, 0);
133	# $Crossfire::Client::Widget::TOPLEVEL->add ($f);
134	}
135	}
136
137	sub start_game {
138	$SDL_TIMER = add Glib::Timeout 1000/50, sub {
139	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
140	while $SDL_EV->poll;
141
142	1
143	};
144
145	$WIDTH = $CFG->{width};
146	$HEIGHT = $CFG->{height};
147	$FULLSCREEN = 0;
148
149	init_screen;
150
151	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
152
153	$CONN = new conn	79	$CONN = new conn
154	host => $CFG->{host},	80	host => $host,
155	port => $CFG->{port},	81	port => $port \|\| 13327,
156	user => $CFG->{user},	82	user => $CFG->{user},
157	pass => $CFG->{password},	83	pass => $CFG->{password},
158	mapw => $mapsize,	84	mapw => $mapsize,
159	maph => $mapsize,	85	maph => $mapsize,
160	;	86	;
161		87
		88	status "login successful";
		89
162	Crossfire::Client::lowdelay fileno $CONN->{fh};	90	CFClient::lowdelay fileno $CONN->{fh};
163	}	91	}
164		92
165	sub stop_game {	93	sub stop_game {
166	remove Glib::Source $SDL_TIMER;
167	remove Glib::Source $refresh_handler if $refresh_handler;
168	undef $refresh_handler;
169
170	undef $SDL_APP;
171	undef $CONN;	94	undef $CONN;
		95	}
		96
		97	sub client_setup {
		98	my $dialog = new CFClient::UI::FancyFrame
		99	child => (my $vbox = new CFClient::UI::VBox);
		100	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		101	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		102
		103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		104	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		105
		106	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		107	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		108
		109	$mode_slider->connect (changed => sub {
		110	my ($self, $value) = @_;
		111
		112	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		113	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		114	});
		115	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		116
		117	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		118	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		119	my ($self, $value) = @_;
		120	$CFG->{fullscreen} = $value;
		121	});
		122
		123	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		124	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fast} = $value;
		127	});
		128
		129	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		130	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_enable} = $value;
		133	});
		134
		135	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		136	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_intensity} = $value;
		139	});
		140
		141	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_smooth} = $value;
		145	});
		146
		147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		151	});
		152
		153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		154	destroy_screen ();
		155	init_screen ();
		156	});
		157
		158	$dialog
		159	}
		160
		161	sub metaserver_dialog {
		162	my $dialog = new CFClient::UI::FancyFrame
		163	child => (my $vbox = new CFClient::UI::VBox);
		164
		165	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		166
		167	$dialog
		168	}
		169
		170	sub update_metaserver {
		171	my ($HOST) = @_;
		172
		173	status "fetching metaserver list...";
		174
		175	my $buf;
		176
		177	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		178
		179	Event->io (fd => $fh, poll => 'r', cb => sub {
		180	my $res = sysread $fh, $buf, 8192, length $buf;
		181
		182	if (!defined $res) {
		183	$_[0]->w->cancel;
		184	status "metaserver: $!";
		185	} elsif ($res == 0) {
		186	$_[0]->w->cancel;
		187	status "server list retrieved";
		188
		189	my $table = $METASERVER->{table};
		190
		191	$table->clear;
		192
		193	my @col = qw(Use #Users Host Uptime Version Description);
		194	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		195	for 0 .. $#col;
		196
		197	my @align = qw(1 0 1 1 -1);
		198
		199	my $y = 0;
		200	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		201	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		202
		203	for ($desc) {
		204	s/<br>/\n/gi;
		205	s/<li>/\n· /gi;
		206	s/<.*?>//sgi;
		207	s/&/&/g;
		208	s/</</g;
		209	s/>/>/g;
		210	}
		211
		212	$uptime = sprintf "%dd %02d:%02d:%02d",
		213	(int $m->[8] / 86400),
		214	(int $m->[8] / 3600) % 24,
		215	(int $m->[8] / 60) % 60,
		216	$m->[8] % 60;
		217
		218	$m = [$users, $host, $uptime, $version, $desc];
		219
		220	$y++;
		221
		222	$table->add (0, $y, new CFClient::UI::VBox children => [
		223	(new CFClient::UI::Button text => " ", connect_activate => sub {
		224	$HOST->set_text ($CFG->{host} = $host);
		225	}),
		226	(new CFClient::UI::Empty expand => 1),
		227	]);
		228
		229	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		230	for 0 .. $#$m;
		231	}
		232	}
		233	});
		234	}
		235
		236	sub server_setup {
		237	my $dialog = new CFClient::UI::FancyFrame
		238	child => (my $vbox = new CFClient::UI::VBox);
		239
		240	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		241	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		242	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		243
		244	{
		245	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		246
		247	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		248	my ($self, $value) = @_;
		249	$CFG->{host} = $value;
		250	});
		251
		252	$METASERVER = metaserver_dialog;
		253
		254	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		255	update_metaserver $HOST;
		256	});
		257	}
		258
		259	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		260	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		261	my ($self, $value) = @_;
		262	$CFG->{user} = $value;
		263	});
		264
		265	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		266	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{password} = $value;
		269	});
		270
		271	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		272	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{say_command} = $value;
		275	});
		276
		277	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
		278	$table->add (1, 7, new CFClient::UI::Slider
		279	req_w => 100,
		280	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		281	connect_changed => sub {
		282	my ($self, $value) = @_;
		283
		284	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		285	},
		286	);
		287
		288	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		289	start_game;
		290	});
		291
		292	$dialog
		293	}
		294
		295	sub message_window {
		296	my $window = new CFClient::UI::FancyFrame
		297	border_bg => [1, 1, 1, 0.5],
		298	bg => [0.3, 0.3, 0.3, 0.8],
		299	user_w => $::WIDTH/4,
		300	user_h => $::HEIGHT,
		301	child => (my $vbox = new CFClient::UI::VBox);
		302
		303	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		304	expand => 1,
		305	fontsize => $::CFG->{log_fontsize},
		306	);
		307
		308	$vbox->add (my $input = new CFClient::UI::LineEntry);
		309	$input->connect (activate => sub {
		310	my ($input, $text) = @_;
		311	$input->set_text ('');
		312
		313	if ($text =~ /^\/(.*)/) {
		314	$::CONN->user_send ("command $1");
		315	} else {
		316	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		317	$::CONN->user_send ("command $say_cmd $text");
		318	}
		319	1
		320	});
		321	$input->connect (escape => sub {
		322	$MAPWIDGET->focus_in
		323	});
		324	$input->focus_in;
		325
		326	$CONSOLE = {
		327	window => $window,
		328	input => $input
		329	};
		330
		331	$window
		332	}
		333
		334	sub sdl_init {
		335	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		336	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		337	and die "SDL::Init failed!\n";
		338	}
		339
		340	sub init_screen {
		341	sdl_init;
		342
		343	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		344	$FULLSCREEN = $CFG->{fullscreen};
		345	$FAST = $CFG->{fast};
		346
		347	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		348	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		349	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		350	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
		351
		352	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		353	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		354	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		355	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		356
		357	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		358	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		359	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		360
		361	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		362	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		363	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		364	or die "SDL::SetVideoMode failed!\n";
		365
		366	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		367
		368	$SDL_EV = new SDL::Event;
		369	$SDL_EV->set_unicode (1);
		370
		371	$SDL_ACTIVE = 1;
		372
		373	$LAST_REFRESH = time - 0.01;
		374
		375	CFClient::gl_init;
		376
		377	$FONTSIZE = int $HEIGHT / 40;
		378
		379	#############################################################################
		380
		381	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
		382	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
		383
		384	$STATUS_LINE = new CFClient::UI::Label
		385	padding => 0,
		386	y => $HEIGHT * 44 / 45 - $FONTSIZE;
		387	$CFClient::UI::ROOT->add ($STATUS_LINE);
		388
		389	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		390	padding => 0,
		391	y => $HEIGHT * 44 / 45,
		392	height => $HEIGHT / 45,
		393	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		394	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
		395
		396	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
		397	$MAPWIDGET->focus_in;
		398	$MAPWIDGET->connect (activate_console => sub {
		399	my ($mapwidget, $preset) = @_;
		400
		401	if ($CONSOLE) {
		402	$CONSOLE->{input}->focus_in;
		403
		404	if ($preset && $CONSOLE->{input}->get_text eq '') {
		405	$CONSOLE->{input}->set_text ($preset);
		406	}
		407	}
		408	});
		409
		410	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		411
		412	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		413	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		414	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		415
		416	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		417	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		418	status "Configuration Saved";
		419	});
		420
		421	$BUTTONBAR->{children}[0]->emit ("activate");
		422	}
		423
		424	sub destroy_screen {
		425	$CFClient::UI::ROOT->{children} = [];
		426	undef $SDL_ACTIVE;
		427	undef $SDL_EV;
172	SDL::Quit;	428	SDL::Quit;
173	}	429	}
174		430
		431	my %animate_object;
		432	my $animate_timer;
		433
		434	my $want_refresh;
		435	my $can_refresh;
		436
		437	my $fps = 9;
		438
175	sub force_refresh {	439	sub force_refresh {
176	glViewport 0, 0, $WIDTH, $HEIGHT;	440	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		441	debug sprintf "%3.2f", $fps;
177		442
178	glMatrixMode GL_PROJECTION;	443	$want_refresh = 0;
179	glLoadIdentity;	444	$can_refresh = 0;
180	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181	glMatrixMode GL_MODELVIEW;
182		445
183	glClear GL_COLOR_BUFFER_BIT;	446	$CFClient::UI::ROOT->draw;
184
185	$Crossfire::Client::Widget::TOPLEVEL->draw;
186		447
187	SDL::GLSwapBuffers;	448	SDL::GLSwapBuffers;
		449
		450	$LAST_REFRESH = $NOW;
188	}	451	}
		452
		453	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		454	$NOW = time;
		455
		456	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		457	while $SDL_EV->poll;
		458
		459	if (%animate_object) {
		460	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		461	$want_refresh++;
		462	}
		463
		464	if ($want_refresh) {
		465	force_refresh;
		466	} else {
		467	$can_refresh = 1;
		468	}
		469	});
189		470
190	sub refresh {	471	sub refresh {
191	$refresh_handler \|\|= add Glib::Idle sub {	472	$want_refresh++;
192	if ($SDL_APP) {
193	my $next_refresh = SDL::GetTicks;
194	my $interval = ($next_refresh - $last_refresh) * 0.001;
195	$last_refresh = $next_refresh;
196
197	force_refresh;
198	$_->animate ($interval) for grep $_, values %ANIMATE;
199
200	if (%ANIMATE) {
201	1
202	} else {
203	undef $refresh_handler;
204	0
205	}
206	} else {
207	undef $refresh_handler;
208	0
209	}
210	};
211	}	473	}
212		474
213	sub animation_start {	475	sub animation_start {
214	my ($widget) = @_;	476	my ($widget) = @_;
215	$ANIMATE{$widget} = $widget;	477	$animate_object{$widget} = $widget;
216	Scalar::Util::weaken $ANIMATE{$widget};
217
218	refresh;
219	}	478	}
220		479
221	sub animation_stop {	480	sub animation_stop {
222	my ($widget) = @_;	481	my ($widget) = @_;
223	delete $ANIMATE{$widget};	482	delete $animate_object{$widget};
		483	}
		484
		485	@conn::ISA = Crossfire::Protocol::;
		486
		487	sub conn::user_send {
		488	my ($self, $command) = @_;
		489
		490	$self->send ($command);
		491	status $command;
		492	}
		493
		494	sub conn::feed_map1a {
		495	my ($self, $data) = @_;
		496
		497	# $self->Crossfire::Protocol::feed_map1a ($data);
		498
		499	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		500	$MAP->map1a_update ($data);
		501	$MAPWIDGET->update;
		502	}
		503
		504	#sub conn::map_update {
		505	# my ($self, $dirty) = @_;
		506	#
		507	# $MAPWIDGET->update;
		508	#}
		509
		510	sub conn::map_clear {
		511	my ($self) = @_;
		512
		513	$MAP->clear;
		514
		515	# refresh;
		516	}
		517
		518	sub conn::map_info {
		519	my ($self, $mode, $x, $y, $w, $h, $hash) = @_;
		520
		521	warn "mapinfo <$mode,$x,$y,$w,$h,$hash>\n";#d#
		522	}
		523
		524	sub conn::face_find {
		525	my ($self, $face) = @_;
		526
		527	my $data;
		528
		529	$FACECACHE->get ("$face->{chksum},$face->{name}")
		530	}
		531
		532	sub conn::face_update {
		533	my ($self, $facenum, $face) = @_;
		534
		535	$FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
		536
		537	my $tex = $face->{texture} =
		538	new_from_image CFClient::Texture
		539	delete $face->{image}, minify => 1;
		540
		541	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		542	$MAPWIDGET->update;
		543	}
		544
		545	sub conn::query {
		546	my ($self, $flags, $prompt) = @_;
		547
		548	#TODO
		549	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		550	}
		551
		552	sub conn::drawinfo {
		553	my ($self, $color, $text) = @_;
		554
		555	my @color = (
		556	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		557	[1.00, 1.00, 1.00],
		558	[0.00, 0.00, 0.55],
		559	[1.00, 0.00, 0.00],
		560	[1.00, 0.54, 0.00],
		561	[0.11, 0.56, 1.00],
		562	[0.93, 0.46, 0.00],
		563	[0.18, 0.54, 0.34],
		564	[0.56, 0.73, 0.56],
		565	[0.80, 0.80, 0.80],
		566	[0.55, 0.41, 0.13],
		567	[0.99, 0.77, 0.26],
		568	[0.74, 0.65, 0.41],
		569	);
		570
		571	$LOGVIEW->add_paragraph ($color[$color], $text);
224	}	572	}
225		573
226	%SDL_CB = (	574	%SDL_CB = (
227	SDL_QUIT() => sub {	575	SDL_QUIT() => sub {
228	main_quit Gtk2;	576	Event::unloop -1;
229	},	577	},
230	SDL_VIDEORESIZE() => sub {	578	SDL_VIDEORESIZE() => sub {
231	},	579	},
232	SDL_VIDEOEXPOSE() => sub {	580	SDL_VIDEOEXPOSE() => sub {
233	refresh;	581	refresh;
234	},	582	},
235	SDL_KEYDOWN() => sub {	583	SDL_KEYDOWN() => sub {
236	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	584	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237	# alt-enter	585	# alt-enter
238	$FULLSCREEN = !$FULLSCREEN;	586	destroy_screen;
		587	$CFG->{fullscreen} = !$CFG->{fullscreen};
239	init_screen;	588	init_screen;
240	} else {	589	} else {
241	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	590	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242	}	591	}
243	},	592	},
244	SDL_KEYUP() => sub {	593	SDL_KEYUP() => sub {
245	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	594	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246	},	595	},
247	SDL_MOUSEMOTION() => sub {	596	SDL_MOUSEMOTION() => sub {
248	Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);	597	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249	},	598	},
250	SDL_MOUSEBUTTONDOWN() => sub {	599	SDL_MOUSEBUTTONDOWN() => sub {
251	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	600	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252	},	601	},
253	SDL_MOUSEBUTTONUP() => sub {	602	SDL_MOUSEBUTTONUP() => sub {
254	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	603	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255	},	604	},
256	SDL_ACTIVEEVENT() => sub {	605	SDL_ACTIVEEVENT() => sub {
257	printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	606	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258	},	607	},
259	);	608	);
260		609
261	@conn::ISA = Crossfire::Protocol::;
262
263	sub conn::map_update {
264	my ($self, $dirty) = @_;
265
266	refresh;
267	}
268
269	sub conn::map_scroll {
270	my ($self, $dx, $dy) = @_;
271
272	# refresh;
273	}
274
275	sub conn::map_clear {
276	my ($self) = @_;
277
278	# refresh;
279	}
280
281	sub conn::face_find {
282	my ($self, $face) = @_;
283
284	$FACECACHE->{"$face->{chksum},$face->{name}"}
285	}
286
287	sub conn::face_update {
288	my ($self, $face) = @_;
289
290	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291
292	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
293	}
294
295	sub conn::query {
296	my ($self, $flags, $prompt) = @_;
297
298	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
299	}
300
301	sub gtk_add_cfg_field {
302	my ($tbl, $cfg, $klbl, $key, $value) = @_;
303	my $i = $cfg->{_i}++;
304	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
305	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
306	if ($key eq 'password') {
307	$ent->set_invisible_char ("*");
308	$ent->set (visibility => 0)
309	}
310	$ent->set_text ($value);
311	$ent->signal_connect (changed => sub {
312	my ($ent) = @_;
313	$cfg->{$key} = $ent->get_text;
314	# TODO: Mapsize should be a slider in the game gui
315	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
316	$cfg->{$key} = 100;
317	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
318	$cfg->{$key} = 50;
319	}
320	});
321	}
322
323	sub run_config_dialog {
324	my (%events) = @_;
325
326	my $w = Gtk2::Window->new;
327
328	my @cfg = (
329	[qw/Host host/],
330	[qw/Port port/],
331	[qw/Mapsize% mapsize/],
332	[qw/Username user/],
333	[qw/Password password/],
334	);
335
336	my $cfg = {};
337
338	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
339	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
340
341	$w->add (my $vb = Gtk2::VBox->new);
342	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
343	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
344	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
345	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
346	my $i = 0;
347	my $act = 0;
348	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
349	if ($_ eq $selmode) { $act = $i }
350	$cb->append_text ($_);
351	$i++;
352	}
353	$cb->set_active ($act);
354	$cb->signal_connect (changed => sub {
355	my ($cb) = @_;
356	my $txt = $cb->get_active_text;
357	if ($txt =~ m/(\d+)x(\d+)/) {
358	$::CFG->{width} = $1;
359	$::CFG->{height} = $2;
360	}
361	});
362
363	$cfg->{_i} = 1;
364	for (@cfg) {
365	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
366	}
367
368	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
369	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
370	$cb->signal_connect (clicked => sub {
371	for (keys %$cfg) {
372	$::CFG->{$_} = $cfg->{$_}
373	if $_ ne '_i';
374	}
375	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
376	});
377	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378	$cb->signal_connect (clicked => sub {
379	for (keys %$cfg) {
380	$::CFG->{$_} = $cfg->{$_}
381	if $_ ne '_i';
382	}
383	my $cb = $events{login} \|\| sub {};
384	$cb->($::CFG->{user}, $::CFG->{password});
385	});
386	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
387	$cb->signal_connect (clicked => sub {
388	my $cb = $events{logout} \|\| sub {};
389	$cb->();
390	});
391	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
392	$cb->signal_connect (clicked => sub { $w->destroy });
393
394	$w->show_all;
395
396	$w->signal_connect (destroy => sub { Gtk2->main_quit });
397	}
398
399
400	#############################################################################	610	#############################################################################
401		611
402	SDL::Init SDL_INIT_EVERYTHING;	612	$FACECACHE = CFClient::db_table "facecache";
403		613
404	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
405
406	$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407	$mapwidget->focus_in;
408
409	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	614	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410		615
411	$CFG \|\|= {	616	my %DEF_CFG = (
		617	sdl_mode => 0,
412	width => 640,	618	width => 640,
413	height => 480,	619	height => 480,
		620	fullscreen => 0,
		621	fast => 0,
		622	fow_enable => 1,
		623	fow_intensity => 0.45,
		624	fow_smooth => 0,
		625	log_fontsize => 14,
414	mapsize => 100,	626	mapsize => 100,
415	fullscreen => 0,
416	host => "crossfire.schmorp.de",	627	host => "crossfire.schmorp.de",
417	port => 13327,	628	say_command => 'say',
418	};	629	);
419		630
420	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";	631	while (my ($k, $v) = each %DEF_CFG) {
		632	$CFG->{$k} = $v unless exists $CFG->{$k};
		633	}
421		634
422	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	635	sdl_init;
423		636
424	run_config_dialog	637	@SDL_MODES = reverse
425	login => sub { start_game },	638	grep $_->[0] >= 640 && $_->[1] >= 480,
426	logout => sub { stop_game };	639	map [SDL::RectW ($_), SDL::RectH ($_)],
		640	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
427		641
428	main Gtk2;	642	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
429		643
430	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	644	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		645
		646	init_screen;
		647
		648	{
		649	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		650
		651	CFClient::add_font $_ for @fonts;
		652	CFClient::set_font $fonts[0];
		653	}
		654
		655	Event::loop;
		656
		657

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.61 by root, Mon Apr 10 11:57:17 2006 UTC vs. Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.61 by root, Mon Apr 10 11:57:17 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC