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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use Crossfire;	6	use Time::HiRes 'time';
6	use Crossfire::Client;	7	use Event;
7	use Crossfire::Protocol;
8
9	use Client::Util;
10
11	package Crossfire::Client; # uh, yeah
12
13	use strict;
14
15	our $CFG;
16	our $VERSION = '0.1';
17		8
18	use SDL;	9	use SDL;
19	use SDL::App;	10	use SDL::App;
20	use SDL::Event;	11	use SDL::Event;
21	use SDL::Surface;	12	use SDL::Surface;
22	use SDL::OpenGL;	13	use SDL::OpenGL;
23	use SDL::OpenGL::Constants;
24		14
25	my $conn;	15	use Crossfire;
26	my $app;	16	use Crossfire::Protocol;
27		17
28	my $WIDTH = 640;	18	use CFClient;
29	my $HEIGHT = 480;	19	use CFClient::UI;
30		20
31	sub glinit {	21	our $VERSION = '0.1';
32	# nuke all gl context data	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";
		27
		28	our $FACECACHE;
		29
		30	our $LAST_REFRESH;
		31	our $NOW;
		32
		33	our $CFG;
		34	our $CONN;
		35	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
		36
		37	our @SDL_MODES;
		38	our $WIDTH;
		39	our $HEIGHT;
		40	our $FULLSCREEN;
		41	our $FONTSIZE;
		42
		43	our $MAP;
		44	our $MAPWIDGET;
		45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
		49
		50	our $SDL_ACTIVE;
		51	our $SDL_EV;
		52	our %SDL_CB;
		53
		54	our $ALT_ENTER_MESSAGE;
		55	our $STATUS_LINE;
		56	our $DEBUG_STATUS;
		57
		58	sub status {
		59	$STATUS_LINE->set_text ($_[0]);
		60	my ($w, $h) = $STATUS_LINE->size_request;
		61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		62	}
		63
		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	}
		69
		70	sub start_game {
		71	status "logging in...";
		72
		73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		74
		75	$MAP = new CFClient::Map $mapsize, $mapsize;
		76
		77	my ($host, $port) = split /:/, $CFG->{host};
33		78
34	$app = new SDL::App	79	$CONN = new conn
35	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	80	host => $host,
36	-title => "Crossfire+ Client",	81	port => $port \|\| 13327,
37	-width => $WIDTH,	82	user => $CFG->{user},
38	-height => $HEIGHT,	83	pass => $CFG->{password},
39	-opengl => 1,	84	mapw => $mapsize,
40	-red_size => 8,	85	maph => $mapsize,
41	-green_size => 8,	86	;
42	-blue_size => 8,
43	-double_buffer => 1,
44	-resizeable => 0;
45		87
46	glEnable GL_TEXTURE_2D;	88	status "login successful";
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
48	glShadeModel GL_FLAT;
49	glDisable GL_DEPTH_TEST;
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51	glEnable GL_BLEND;
52		89
53	glMatrixMode GL_PROJECTION;	90	CFClient::lowdelay fileno $CONN->{fh};
54	glLoadIdentity;
55	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;
56
57	# re-bind all textures
58	}	91	}
59		92
60	sub refresh {	93	sub stop_game {
61	glClearColor 0, 0, 0, 0;	94	undef $CONN;
62	glClear GL_COLOR_BUFFER_BIT;	95	}
63		96
64	my $map = $conn->{map};	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]);
65		102
66	for my $x (0 .. $conn->{mapw} - 1) {	103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
67	for my $y (0 .. $conn->{maph} - 1) {	104	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
68		105
69	my $cell = $map->[$x][$y]	106	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
70	or next;	107	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
71		108
72	my $darkness = $cell->[3] * (1 / 255);	109	$mode_slider->connect (changed => sub {
73	my $darkness = 0.8 + 0.2*rand;	110	my ($self, $value) = @_;
74	glColor $darkness, $darkness, $darkness;
75		111
76	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	112	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
77	my $tex = $conn->{face}[$num]{texture} \|\| 0;	113	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
78		114	});
79	glBindTexture GL_TEXTURE_2D, $tex;	115	$mode_slider->emit (changed => $mode_slider->{range}[0]);
80		116
81	glBegin GL_QUADS;	117	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
82	glTexCoord 0, 0; glVertex $x, $y;	118	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
83	glTexCoord 0, 1; glVertex $x, $y + 1;	119	my ($self, $value) = @_;
84	glTexCoord 1, 1; glVertex $x + 1, $y + 1;	120	$CFG->{fullscreen} = $value;
85	glTexCoord 1, 0; glVertex $x + 1, $y;	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	]);
86	glEnd;	228
		229	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		230	for 0 .. $#$m;
87	}	231	}
88	}	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	});
89	}	257	}
90		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;
		428	SDL::Quit;
		429	}
		430
		431	my %animate_object;
		432	my $animate_timer;
		433
		434	my $want_refresh;
		435	my $can_refresh;
		436
		437	my $fps = 9;
		438
		439	sub force_refresh {
		440	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		441	debug sprintf "%3.2f", $fps;
		442
		443	$want_refresh = 0;
		444	$can_refresh = 0;
		445
		446	$CFClient::UI::ROOT->draw;
		447
91	SDL::GLSwapBuffers;	448	SDL::GLSwapBuffers;
92	}
93		449
94	my $ev = new SDL::Event;	450	$LAST_REFRESH = $NOW;
95	my %ev_cb;
96
97	sub event(&$) {
98	$ev_cb{$_[0]->()} = $_[1];
99	}	451	}
100		452
101	sub does(&) { shift }	453	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		454	$NOW = time;
102		455
103	event {SDL_QUIT} does {	456	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
104	exit;	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	}
105	};	469	});
106		470
107	event {SDL_VIDEORESIZE} does {	471	sub refresh {
108	print "resize\n";	472	$want_refresh++;
109	};	473	}
110		474
111	event {SDL_VIDEOEXPOSE} does {	475	sub animation_start {
112	refresh;	476	my ($widget) = @_;
113	};	477	$animate_object{$widget} = $widget;
		478	}
114		479
115	event {SDL_KEYDOWN} does {	480	sub animation_stop {
116	print "keypress\n";	481	my ($widget) = @_;
117	};	482	delete $animate_object{$widget};
118		483	}
119	event {SDL_KEYUP} does {
120	print "keyup\n";#d#
121	};
122
123	event {SDL_MOUSEMOTION} does {
124	print "motion\n";
125	};
126
127	event {SDL_MOUSEBUTTONDOWN} does {
128	print "button\n";
129	};
130
131	event {SDL_MOUSEBUTTONUP} does {
132	print "buttup\n";
133	};
134
135	event {SDL_ACTIVEEVENT} does {
136	print "active\n";
137	};
138
139	package Crossfire::Client;
140		484
141	@conn::ISA = Crossfire::Protocol::;	485	@conn::ISA = Crossfire::Protocol::;
142		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
143	sub conn::map_update {	504	#sub conn::map_update {
144	my ($self, $dirty) = @_;	505	# my ($self, $dirty) = @_;
145		506	#
146	refresh;	507	# $MAPWIDGET->update;
147	}	508	#}
148
149	sub conn::map_scroll {
150	my ($self, $dx, $dy) = @_;
151
152	refresh;
153	}
154		509
155	sub conn::map_clear {	510	sub conn::map_clear {
156	my ($self) = @_;	511	my ($self) = @_;
157		512
		513	$MAP->clear;
		514
158	refresh;	515	# refresh;
		516	}
		517
		518	sub conn::face_find {
		519	my ($self, $face) = @_;
		520
		521	my $data;
		522
		523	$FACECACHE->get ("$face->{chksum},$face->{name}")
159	}	524	}
160		525
161	sub conn::face_update {	526	sub conn::face_update {
162	my ($self, $num, $face) = @_;	527	my ($self, $facenum, $face) = @_;
163		528
164	warn "up face $self,$num,$face\n";#d#	529	$FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
165	use Gtk2;
166		530
167	my $pb = new Gtk2::Gdk::PixbufLoader;	531	my $tex = $face->{texture} =
168	$pb->write ($face->{image});	532	new_from_image CFClient::Texture
169	$pb->close;	533	delete $face->{image}, minify => 1;
170		534
171	$pb = $pb->get_pixbuf;	535	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
172	$pb = $pb->add_alpha (0, 0, 0, 0);	536	$MAPWIDGET->update;
		537	}
173		538
174	glGetError();	539	sub conn::query {
175	my ($tex) = @{glGenTextures 1};	540	my ($self, $flags, $prompt) = @_;
176		541
177	$face->{texture} = $tex;	542	#TODO
		543	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		544	}
		545
		546	sub conn::drawinfo {
		547	my ($self, $color, $text) = @_;
		548
		549	my @color = (
		550	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		551	[1.00, 1.00, 1.00],
		552	[0.00, 0.00, 0.55],
		553	[1.00, 0.00, 0.00],
		554	[1.00, 0.54, 0.00],
		555	[0.11, 0.56, 1.00],
		556	[0.93, 0.46, 0.00],
		557	[0.18, 0.54, 0.34],
		558	[0.56, 0.73, 0.56],
		559	[0.80, 0.80, 0.80],
		560	[0.55, 0.41, 0.13],
		561	[0.99, 0.77, 0.26],
		562	[0.74, 0.65, 0.41],
178		563	);
179	glBindTexture GL_TEXTURE_2D, $tex;	564
180	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;	565	$LOGVIEW->add_paragraph ($color[$color], $text);
181		566	}
182	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;	567
183	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;	568	%SDL_CB = (
184	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	569	SDL_QUIT() => sub {
185	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	570	Event::unloop -1;
186		571	},
187	glTexImage2D GL_TEXTURE_2D, 0,	572	SDL_VIDEORESIZE() => sub {
188	GL_RGBA8,	573	},
189	$pb->get_width, $pb->get_height,	574	SDL_VIDEOEXPOSE() => sub {
190	0,	575	refresh;
191	GL_RGBA,	576	},
192	GL_UNSIGNED_BYTE,	577	SDL_KEYDOWN() => sub {
193	$pb->get_pixels;	578	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
194	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;	579	# alt-enter
195	}	580	destroy_screen;
		581	$CFG->{fullscreen} = !$CFG->{fullscreen};
		582	init_screen;
		583	} else {
		584	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
		585	}
		586	},
		587	SDL_KEYUP() => sub {
		588	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
		589	},
		590	SDL_MOUSEMOTION() => sub {
		591	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
		592	},
		593	SDL_MOUSEBUTTONDOWN() => sub {
		594	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
		595	},
		596	SDL_MOUSEBUTTONUP() => sub {
		597	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
		598	},
		599	SDL_ACTIVEEVENT() => sub {
		600	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
		601	},
		602	);
196		603
197	#############################################################################	604	#############################################################################
198		605
199	use Event;	606	$FACECACHE = CFClient::db_table "facecache";
200		607
201	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	608	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
202		609
203		610	my %DEF_CFG = (
204	if ($ARGV[0] eq 'config') {	611	sdl_mode => 0,
205	Client::Util::run_config_dialog;	612	width => 640,
206	}	613	height => 480,
207		614	fullscreen => 0,
208	glinit;	615	fast => 0,
209		616	fow_enable => 1,
210	$conn = new conn	617	fow_intensity => 0.45,
		618	fow_smooth => 0,
		619	log_fontsize => 14,
		620	mapsize => 100,
211	host => "cf.schmorp.de",	621	host => "crossfire.schmorp.de",
212	port => 13327;	622	say_command => 'say',
213
214	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {
215	while ($ev->poll) {
216	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
217	}
218	});	623	);
		624
		625	while (my ($k, $v) = each %DEF_CFG) {
		626	$CFG->{$k} = $v unless exists $CFG->{$k};
		627	}
		628
		629	sdl_init;
		630
		631	@SDL_MODES = reverse
		632	grep $_->[0] >= 640 && $_->[1] >= 480,
		633	map [SDL::RectW ($_), SDL::RectH ($_)],
		634	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		635
		636	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		637
		638	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		639
		640	init_screen;
		641
		642	{
		643	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		644
		645	CFClient::add_font $_ for @fonts;
		646	CFClient::set_font $fonts[0];
		647	}
219		648
220	Event::loop;	649	Event::loop;
221		650
		651

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs. Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.12 by elmex, Fri Apr 7 16:29:19 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC