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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.63 by root, Mon Apr 10 22:53:50 2006 UTC vs. Revision 1.113 by root, Sat Apr 15 19:35:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.63 by root, Mon Apr 10 22:53:50 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 19:35:22 2006 UTC