[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC

…		…
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
10	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
11	#our @ACTIVE_WIDGETS;
12		11
13	# class methods for events	12	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	13	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	14	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16	sub feed_sdl_button_down_event { }	15	sub feed_sdl_button_down_event { }
…		…
20	my $class = shift;	19	my $class = shift;
21		20
22	bless { @_ }, $class	21	bless { @_ }, $class
23	}	22	}
24		23
25	#sub activate {
26	# push @ACTIVE_WIDGETS, $_[0];
27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	#}
29
30	#sub deactivate {
31	# @ACTIVE_WIDGETS =
32	# sort { $a->{z} <=> $b->{z} }
33	# grep { $_ && $_ != $_[0] }
34	# @ACTIVE_WIDGETS;
35	#}
36
37	sub move {	24	sub move {
38	my ($self, $x, $y, $z) = @_;	25	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	26	$self->{x} = $x;
40	$self->{y} = $y;	27	$self->{y} = $y;
41	$self->{z} = $z if defined $z;	28	$self->{z} = $z if defined $z;
…		…
44	sub needs_redraw {	31	sub needs_redraw {
45	0	32	0
46	}	33	}
47		34
48	sub size_request {	35	sub size_request {
		36	require Carp;
49	die "size_request is abtract";	37	Carp::confess "size_request is abtract";
		38	}
		39
		40	sub size_allocate {
		41	my ($self, $w, $h) = @_;
		42
		43	$self->{w} = $w;
		44	$self->{h} = $h;
50	}	45	}
51		46
52	sub focus_in {	47	sub focus_in {
53	my ($widget) = @_;	48	my ($widget) = @_;
54	$FOCUS = $widget;	49	$FOCUS = $widget;
…		…
72		67
73	sub button_up {	68	sub button_up {
74	my ($widget, $sdlev) = @_;	69	my ($widget, $sdlev) = @_;
75	}	70	}
76		71
77	sub w { $_[0]->{w} }	72	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78	sub h { $_[0]->{h} }	73	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	74	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	75	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	76	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82		77
83	sub draw {	78	sub draw {
…		…
88	$self->_draw;	83	$self->_draw;
89	glPopMatrix;	84	glPopMatrix;
90	}	85	}
91		86
92	sub _draw {	87	sub _draw {
93	my ($widget) = @_;	88	my ($self) = @_;
		89
		90	warn "no draw defined for $self\n";
94	}	91	}
95		92
96	sub bbox {	93	sub bbox {
97	my ($self) = @_;	94	my ($self) = @_;
98	my ($w, $h) = $self->size_request;	95	my ($w, $h) = $self->size_request;
…		…
102	$self->{x} = $w,	99	$self->{x} = $w,
103	$self->{y} = $h	100	$self->{y} = $h
104	)	101	)
105	}	102	}
106		103
		104	sub find_widget {
		105	my ($self, $x, $y) = @_;
		106
		107	return $self
		108	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		109	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		110
		111	()
		112	}
		113
107	sub del_parent { $_[0]->{parent} = undef }	114	sub del_parent { $_[0]->{parent} = undef }
108		115
109	sub set_parent {	116	sub set_parent {
110	my ($self, $par) = @_;	117	my ($self, $par) = @_;
111		118
…		…
128	my ($self) = @_;	135	my ($self) = @_;
129		136
130	#$self->deactivate;	137	#$self->deactivate;
131	}	138	}
132		139
		140	#############################################################################
		141
133	package Crossfire::Client::Widget::Container;	142	package Crossfire::Client::Widget::Container;
134		143
135	our @ISA = Crossfire::Client::Widget::;	144	our @ISA = Crossfire::Client::Widget::;
136		145
137	use SDL::OpenGL;	146	sub new {
		147	my ($class, @widgets) = @_;
138		148
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	149	my $self = $class->SUPER::new (children => []);
140	sub get { $_[0]->{child} }	150	$self->add ($_) for @widgets;
		151
		152	$self
		153	}
		154
		155	sub add {
		156	my ($self, $chld, $expand) = @_;
		157
		158	$chld->{expand} = $expand;
		159	$chld->set_parent ($self);
		160
		161	@{$self->{children}} =
		162	sort { $a->{z} <=> $b->{z} }
		163	@{$self->{children}}, $chld;
		164
		165	$self->size_allocate ($self->{w}, $self->{h});
		166	}
		167
141	sub remove {	168	sub remove {
		169	my ($self, $widget) = @_;
		170
		171	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		172
		173	$self->size_allocate ($self->{w}, $self->{h});
		174	}
		175
		176	sub find_widget {
		177	my ($self, $x, $y) = @_;
		178
		179	my $res;
		180
		181	for (@{ $self->{children} }) {
		182	$res = $_->find_widget ($x, $y)
		183	and return $res;
		184	}
		185
		186	()
		187	}
		188
		189	sub size_request {
		190	my ($self) = @_;
		191
		192	my ($hs, $ws) = (0, 0);
		193	for (@{$self->{children} \|\| []}) {
		194	my ($w, $h) = $_->size_request;
		195	$hs += $h;
		196	if ($ws < $w) { $ws = $w }
		197	}
		198
		199	return ($ws, $hs);
		200	}
		201
		202	sub _draw {
		203	my ($self) = @_;
		204
		205	$_->draw for @{$self->{children}};
		206	}
		207
		208	#############################################################################
		209
		210	package Crossfire::Client::Widget::Bin;
		211
		212	our @ISA = Crossfire::Client::Widget::Container::;
		213
		214	sub child { $_[0]->{children}[0] }
		215
		216	sub size_request {
		217	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		218	}
		219
		220	sub size_allocate {
142	my ($self, $chld) = @_;	221	my ($self, $w, $h) = @_;
143	delete $self->{child}	222	$self->SUPER::size_allocate ($w, $h);
144	if $self->{child} == $chld;	223	$self->{children}[0]->size_allocate ($w, $h)
		224	if $self->{children}[0]
145	}	225	}
146		226
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	227	#############################################################################
148
149	sub _draw { die "Containers can't be drawn!" }
150		228
151	package Crossfire::Client::Widget::Toplevel;	229	package Crossfire::Client::Widget::Toplevel;
152		230
		231	our @ISA = Crossfire::Client::Widget::Container::;
		232
		233	sub update {
		234	my ($self) = @_;
		235
		236	::refresh ();
		237	}
		238
		239	#############################################################################
		240
		241	package Crossfire::Client::Widget::Window;
		242
153	our @ISA = Crossfire::Client::Widget::;	243	our @ISA = Crossfire::Client::Widget::Bin::;
154		244
155	use SDL::OpenGL;	245	use SDL::OpenGL;
156		246
157	sub add {	247	sub add {
158	my ($self, $chld) = @_;	248	my ($self, $chld) = @_;
159		249	warn "ADD $chld\n";
160	push @{$self->{childs}}, $chld;
161	@{$self->{childs}} =
162	sort { $a->{z} <=> $b->{z} }
163	@{$self->{childs}};
164
165	$chld->set_parent ($self);
166	}
167
168	sub remove {
169	my ($self, $chld) = @_;
170	@{$self->{childs}} =
171	sort { $a->{z} <=> $b->{z} }
172	grep { $_ && $_ != $_[0] }
173	@{$self->{childs}}
174	}
175
176	sub update {
177	my ($self) = @_;
178	::refresh ();
179	}
180
181	sub _draw {
182	my ($self) = @_;
183
184	$_->draw for @{$self->{childs}};
185	}
186
187	package Crossfire::Client::Widget::Window;
188
189	our @ISA = Crossfire::Client::Widget::Container::;
190
191	use SDL::OpenGL;
192
193	sub add {
194	my ($self, $chld) = @_;
195	$self->SUPER::add ($chld);	250	$self->SUPER::add ($chld);
196	$chld->set_parent ($self);	251	$chld->set_parent ($self);
197	$self->update; #TODO: Move this to the size_request event propably?
198	}	252	}
199		253
200	sub remove {	254	sub remove {
201	my ($self) = @_;	255	my ($self) = @_;
202	# TODO FIXME: removing a child from a window will crash, see render_chld	256	# TODO FIXME: removing a child from a window will crash, see render_chld
203	$self->update;	257	# $self->update;
204	}	258	}
205		259
206	sub update {	260	sub update {
207	my ($self) = @_;	261	my ($self) = @_;
208	$self->render_chld;	262	$self->render_chld;
…		…
211	sub render_chld {	265	sub render_chld {
212	my ($self) = @_;	266	my ($self) = @_;
213	my $chld = $self->get;	267	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;	268	my ($w, $h) = $self->size_request;
215		269
		270	require Carp;
		271	Carp::cluck "RENDERCHI $w $h";
		272	warn "RENDERCHI $w $h\n";
216	$self->{texture} =	273	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (	274	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }	275	$w, $h, sub { $chld->draw }
219	);	276	);
220	$self->{texture}->upload;	277	$self->{texture}->upload;
221	}	278	}
222		279
223	sub size_request {	280	sub size_request {
224	my ($self) = @_;	281	my ($self) = @_;
225	my $chld = $self->get	282	($self->w, $self->h)
226	or return (0, 0);	283	}
227	$chld->size_request	284
		285	sub size_allocate {
		286	my ($self, $w, $h) = @_;
		287
		288	$self->w ($w);
		289	$self->h ($h);
		290	$self->get->size_allocate ($w, $h);
		291
		292	$self->update; #TODO: Move this to the size_request event propably?
228	}	293	}
229		294
230	sub _draw {	295	sub _draw {
231	my ($self) = @_;	296	my ($self) = @_;
232		297
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture	298	my ($w, $h) = ($self->w, $self->h);
234		299
235	my $tex = $self->{texture}	300	my $tex = $self->{texture}
236	or return;	301	or return;
237		302
238	glEnable GL_BLEND;	303	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	304	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};	306	glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243	glColor 1, 0, 1;
244		307
245	glBegin GL_QUADS;	308	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;	309	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;	310	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;	311	glTexCoord 1, 1; glVertex $w, $h;
…		…
251		314
252	glDisable GL_BLEND;	315	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	316	glDisable GL_TEXTURE_2D;
254	}	317	}
255		318
		319	#############################################################################
		320
256	package Crossfire::Client::Widget::Frame;	321	package Crossfire::Client::Widget::Frame;
257		322
258	our @ISA = Crossfire::Client::Widget::Container::;	323	our @ISA = Crossfire::Client::Widget::Bin::;
259		324
260	use SDL::OpenGL;	325	use SDL::OpenGL;
261		326
262	sub size_request {	327	sub size_request {
263	my ($self) = @_;	328	my ($self) = @_;
264	my $chld = $self->get	329	my $chld = $self->child
265	or return (0, 0);	330	or return (0, 0);
266		331
267	$chld->move (2, 2);	332	$chld->move (2, 2);
268		333
269	map { $_ + 4 } $chld->size_request;	334	map { $_ + 4 } $chld->size_request;
270	}	335	}
271		336
		337	sub size_allocate {
		338	my ($self, $w, $h) = @_;
		339
		340	$self->w ($w);
		341	$self->h ($h);
		342
		343	$self->child->size_allocate ($w - 4, $h - 4);
		344	$self->child->move (2, 2);
		345	}
		346
272	sub _draw {	347	sub _draw {
273	my ($self) = @_;	348	my ($self) = @_;
274		349
275	my $chld = $self->get;	350	my $chld = $self->child;
276		351
277	my ($w, $h) = $chld->size_request;	352	my ($w, $h) = $chld->size_request;
278		353
279	glBegin GL_QUADS;	354	glBegin GL_QUADS;
280	glColor 0, 0, 0;	355	glColor 0, 0, 0;
…		…
285	glEnd;	360	glEnd;
286		361
287	$chld->draw;	362	$chld->draw;
288	}	363	}
289		364
		365	#############################################################################
		366
290	package Crossfire::Client::Widget::FancyFrame;	367	package Crossfire::Client::Widget::FancyFrame;
291		368
292	our @ISA = Crossfire::Client::Widget::Frame::;	369	our @ISA = Crossfire::Client::Widget::Frame::;
293		370
294	use SDL::OpenGL;	371	use SDL::OpenGL;
295		372
296	#TODO: implement themed frame	373	sub new {
		374	my ($self, $theme) = @_;
		375	$self = $self->SUPER::new;
		376
		377	$self->{txts} = [
		378	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		379	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png)
		380	];
		381	$self
		382	}
		383
		384	sub size_request {
		385	my ($self) = @_;
		386
		387	my ($w, $h) = $self->SUPER::size_request;
		388
		389	$h += $self->{txts}->[1]->{height};
		390	$h += $self->{txts}->[4]->{height};
		391	$w += $self->{txts}->[2]->{width};
		392	$w += $self->{txts}->[3]->{width};
		393
		394	($w, $h)
		395	}
		396
		397	sub size_allocate {
		398	my ($self, $w, $h) = @_;
		399
		400	$self->SUPER::size_allocate ($w, $h);
		401
		402	$h -= $self->{txts}->[1]->{height};
		403	$h -= $self->{txts}->[4]->{height};
		404	$w -= $self->{txts}->[2]->{width};
		405	$w -= $self->{txts}->[3]->{width};
		406
		407	$h = $h < 0 ? 0 : $h;
		408	$w = $w < 0 ? 0 : $w;
		409	warn "CHILD:$w $h\n";
		410	$self->child->size_allocate ($w, $h);
		411	$self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
		412	}
		413
		414	sub _draw {
		415	my ($self) = @_;
		416
		417	my ($w, $h) = ($self->w, $self->h);
		418	my ($cw, $ch) = ($self->child->w, $self->child->h);
		419
		420	glEnable GL_BLEND;
		421	glEnable GL_TEXTURE_2D;
		422	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		423	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		424
		425	my $top = $self->{txts}->[1];
		426	glBindTexture GL_TEXTURE_2D, $top->{name};
		427
		428	glBegin GL_QUADS;
		429	glTexCoord 0, 0; glVertex 0 , 0;
		430	glTexCoord 0, 1; glVertex 0 , $top->{height};
		431	glTexCoord 1, 1; glVertex $w , $top->{height};
		432	glTexCoord 1, 0; glVertex $w , 0;
		433	glEnd;
		434
		435	my $left = $self->{txts}->[3];
		436	glBindTexture GL_TEXTURE_2D, $left->{name};
		437
		438	glBegin GL_QUADS;
		439	glTexCoord 0, 0; glVertex 0 , $top->{height};
		440	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		441	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		442	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		443	glEnd;
		444
		445	my $right = $self->{txts}->[2];
		446	glBindTexture GL_TEXTURE_2D, $right->{name};
		447
		448	glBegin GL_QUADS;
		449	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		450	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		451	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		452	glTexCoord 1, 0; glVertex $w , $top->{height};
		453	glEnd;
		454
		455	my $bottom = $self->{txts}->[4];
		456	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		457
		458	glBegin GL_QUADS;
		459	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		460	glTexCoord 0, 1; glVertex 0 , $h;
		461	glTexCoord 1, 1; glVertex $w , $h;
		462	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		463	glEnd;
		464
		465	my $bg = $self->{txts}->[0];
		466	glBindTexture GL_TEXTURE_2D, $bg->{name};
		467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		468	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		469	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		470
		471	my $rep_x = $cw / $bg->{width};
		472	my $rep_y = $ch / $bg->{height};
		473
		474	glBegin GL_QUADS;
		475	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		476	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		477	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		478	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		479	glEnd;
		480
		481	glDisable GL_BLEND;
		482	glDisable GL_TEXTURE_2D;
		483
		484	$self->child->draw;
		485
		486	}
		487
		488	#############################################################################
297		489
298	package Crossfire::Client::Widget::Table;	490	package Crossfire::Client::Widget::Table;
299		491
300	our @ISA = Crossfire::Client::Widget::Container::;	492	our @ISA = Crossfire::Client::Widget::Bin::;
301		493
302	use SDL::OpenGL;	494	use SDL::OpenGL;
303		495
304	sub add {	496	sub add {
305	my ($self, $x, $y, $chld) = @_;	497	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	498	my $old_chld = $self->{children}[$y][$x];
307		499
308	$self->{childs}[$y][$x] = $chld;	500	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	501	$chld->set_parent ($self);
310	$self->update;	502	$self->update;
311	}	503	}
312		504
313	sub max_row_height {	505	sub max_row_height {
314	my ($self, $row) = @_;	506	my ($self, $row) = @_;
315		507
316	my $hs = 0;	508	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	509	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	510	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	511	if ($c) {
320	my ($w, $h) = $c->size_request;	512	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	513	if ($hs < $h) { $hs = $h }
322	}	514	}
323	}	515	}
…		…
326		518
327	sub max_col_width {	519	sub max_col_width {
328	my ($self, $col) = @_;	520	my ($self, $col) = @_;
329		521
330	my $ws = 0;	522	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	523	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	524	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	525	if ($c) {
334	my ($w, $h) = $c->size_request;	526	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	527	if ($ws < $w) { $ws = $w }
336	}	528	}
337	}	529	}
…		…
341	sub size_request {	533	sub size_request {
342	my ($self) = @_;	534	my ($self) = @_;
343		535
344	my ($hs, $ws) = (0, 0);	536	my ($hs, $ws) = (0, 0);
345		537
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	538	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	539	$hs += $self->max_row_height ($yi);
348	}	540	}
349		541
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	542	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	543	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	544	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	545	$wm += $self->max_col_width ($xi)
354	}	546	}
355	if ($ws < $wm) { $ws = $wm }	547	if ($ws < $wm) { $ws = $wm }
356	}	548	}
357		549
…		…
360		552
361	sub _draw {	553	sub _draw {
362	my ($self) = @_;	554	my ($self) = @_;
363		555
364	my $y = 0;	556	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	557	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	558	my $x = 0;
367		559
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	560	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		561
370	my $c = $self->{childs}->[$yi]->[$xi];	562	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	563	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	564	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	565	$c->draw if $c;
374	}	566	}
375		567
…		…
378		570
379	$y += $self->max_row_height ($yi);	571	$y += $self->max_row_height ($yi);
380	}	572	}
381	}	573	}
382		574
		575	#############################################################################
		576
383	package Crossfire::Client::Widget::VBox;	577	package Crossfire::Client::Widget::VBox;
384		578
385	our @ISA = Crossfire::Client::Widget::Container::;	579	our @ISA = Crossfire::Client::Widget::Container::;
386		580
387	use SDL::OpenGL;	581	use SDL::OpenGL;
388		582
389	sub add {	583	sub size_allocate {
390	my ($self, $chld) = @_;	584	my ($self, $w, $h) = @_;
391	push @{$self->{childs}}, $chld;
392	$chld->set_parent ($self);
393	$self->update;
394	}
395		585
396	sub size_request {	586	$self->w ($w);
397	my ($self) = @_;	587	$self->h ($h);
398		588
399	my ($hs, $ws) = (0, 0);	589	my $exp;
		590	my @oth;
		591	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	592	for (@{$self->{children}}) {
		593	if ($_->{expand}) {
		594	$exp = $_;
		595	last;
		596	}
		597	push @oth, $_;
		598	}
		599
		600	my ($ow, $oh);
		601
		602	# get sizes of other widgets
		603	for (@oth) {
401	my ($w, $h) = $_->size_request;	604	my ($w, $h) = $_->size_request;
402	$hs += $h;	605	$oh += $h;
403	if ($ws < $w) { $ws = $w }	606	if ($ow < $w) { $ow = $w }
404	}	607	}
405		608
406	return ($ws, $hs);	609	my $y = 0;
		610	for (@{$self->{children}}) {
		611	$_->move (0, $y);
		612
		613	if ($_ == $exp) {
		614	$_->size_allocate ($w, $h - $oh);
		615	$y += $h - $oh;
		616	} else {
		617	my ($cw, $h) = $_->size_request;
		618	$_->size_allocate ($w, $h);
		619	$y += $h;
		620	}
		621	}
407	}	622	}
408		623
409	sub _draw {	624	sub _draw {
410	my ($self) = @_;	625	my ($self) = @_;
411		626
412	my ($x, $y);	627	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	628	for (@{$self->{children} \|\| []}) {
414	$_->move (0, $y, 0); #TODO: move to size_request
415	$_->draw;	629	$_->draw;
416	my ($w, $h) = $_->size_request;
417	$y += $h;	630	$y += $_->h;
418	}	631	}
419	}	632	}
		633
		634	#############################################################################
420		635
421	package Crossfire::Client::Widget::Label;	636	package Crossfire::Client::Widget::Label;
422		637
423	our @ISA = Crossfire::Client::Widget::;	638	our @ISA = Crossfire::Client::Widget::;
424		639
425	use SDL::OpenGL;	640	use SDL::OpenGL;
426		641
427	sub new {	642	sub new {
428	my ($class, $x, $y, $z, $height, $text) = @_;	643	my ($class, $x, $y, $z, $height, $text) = @_;
429		644
		645	# TODO: color, and make height, xyz etc. optional
430	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	646	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
431		647
432	$self->set_text ($text);	648	$self->set_text ($text);
433		649
434	$self	650	$self
…		…
467	glEnable GL_TEXTURE_2D;	683	glEnable GL_TEXTURE_2D;
468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	684	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
470	glBindTexture GL_TEXTURE_2D, $tex->{name};	686	glBindTexture GL_TEXTURE_2D, $tex->{name};
471		687
472	glColor 1, 1, 1, 0.8;	688	glColor 1, 0, 0, 1; # TODO color
473		689
474	glBegin GL_QUADS;	690	glBegin GL_QUADS;
475	glTexCoord 0, 0; glVertex 0 , 0;	691	glTexCoord 0, 0; glVertex 0 , 0;
476	glTexCoord 0, 1; glVertex 0 , $tex->{height};	692	glTexCoord 0, 1; glVertex 0 , $tex->{height};
477	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	693	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
480		696
481	glDisable GL_BLEND;	697	glDisable GL_BLEND;
482	glDisable GL_TEXTURE_2D;	698	glDisable GL_TEXTURE_2D;
483	}	699	}
484		700
		701	#############################################################################
		702
485	package Crossfire::Client::Widget::TextEntry;	703	package Crossfire::Client::Widget::TextEntry;
486		704
487	our @ISA = Crossfire::Client::Widget::Label::;	705	our @ISA = Crossfire::Client::Widget::Label::;
488		706
489	use SDL;	707	use SDL;
…		…
507	$text .= chr $uni;	725	$text .= chr $uni;
508	}	726	}
509	$self->set_text ($text);	727	$self->set_text ($text);
510	}	728	}
511		729
512		730	#############################################################################
513	# XXX: TextView isn't neccessary with pango multiline text rendering
514	package Crossfire::Client::Widget::TextView;
515
516	use strict;
517
518	our @ISA = qw/Crossfire::Client::Widget/;
519
520	use SDL::OpenGL;
521	use SDL::OpenGL::Constants;
522
523	sub new {
524	my ($class, $text, $h) = @_;
525	my $self = $class->SUPER::new ();
526
527	$self->{txt_height} = $h;
528	@{$self->{lines}} = split /\r?\n/, $text;
529
530	for (split /\r?\n/, $text) {
531	$self->add_line ($_);
532	}
533	$self
534	}
535
536	#sub render_lines {
537	# my ($self) = @_;
538	#
539	# $self->{txt_lines} = [];
540	#
541	# for (@{$self->{lines}}) {
542	# push @{$self->{txt_lines}},
543	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
544	# }
545	#}
546
547	sub add_line {
548	my ($self, $line) = @_;
549	push @{$self->{lines}}, $line;
550
551	push @{$self->{txt_lines}},
552	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
553	}
554
555	sub size_request {
556	my ($self) = @_;
557
558	my $w = 0;
559	my $h = 0;
560
561	for (@{$self->{txt_lines}}) {
562	if ($w < $_->{width}) { $w = $_->{width} }
563	$h += $_->{height};
564	}
565
566	return ($w, $h);
567	}
568
569	sub draw_line {
570	my ($self, $tex, $y) = @_;
571
572	glBindTexture GL_TEXTURE_2D, $tex->{name};
573
574	glColor 1, 0, 1;
575
576	glBegin GL_QUADS;
577	glTexCoord 0, 0; glVertex 0 , $y;
578	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
579	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
580	glTexCoord 1, 0; glVertex $tex->{width}, $y;
581	glEnd;
582	}
583
584	sub _draw {
585	my ($self) = @_;
586
587	glEnable GL_BLEND;
588	glEnable GL_TEXTURE_2D;
589	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
590
591	my $l = 0;
592	for (@{$self->{txt_lines}}) {
593	$self->draw_line ($_, $l);
594	$l += $_->{height};
595	}
596
597	glDisable GL_BLEND;
598	glDisable GL_TEXTURE_2D;
599	}
600		731
601	package Crossfire::Client::Widget::MapWidget;	732	package Crossfire::Client::Widget::MapWidget;
602		733
603	use strict;	734	use strict;
604		735
…		…
613	sub key_down {	744	sub key_down {
614	print "MAPKEYDOWN\n";	745	print "MAPKEYDOWN\n";
615	}	746	}
616		747
617	sub key_up {	748	sub key_up {
		749	}
		750
		751	sub size_request {
		752
		753	}
		754
		755	sub size_allocate {
618	}	756	}
619		757
620	sub _draw {	758	sub _draw {
621	my ($self) = @_;	759	my ($self) = @_;
622		760
…		…
642	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	780	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
643	}	781	}
644		782
645	glEnable GL_TEXTURE_2D;	783	glEnable GL_TEXTURE_2D;
646	glEnable GL_BLEND;	784	glEnable GL_BLEND;
647	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	785	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		786
		787	my $sw4 = ($sw + 3) & ~3;
		788	my $lighting = "\x00" x ($sw4 * $sh);
648		789
649	for my $x (0 .. $sw - 1) {	790	for my $x (0 .. $sw - 1) {
650	for my $y (0 .. $sh - 1) {	791	for my $y (0 .. $sh - 1) {
651		792
652	my $cell = $map->[$x + $xofs][$y + $yofs]	793	my $cell = $map->[$x + $xofs][$y + $yofs]
653	or next;	794	or next;
654		795
655	my $darkness = $cell->[0] * (1 / 255);	796	my $darkness = $cell->[0] * (1 / 255);
656	if ($darkness < 0) {	797	if ($darkness < 0) {
657	glColor 0.3, 0.3, 0.3;	798	$darkness = 0.15;
658	} else {
659	glColor $darkness, $darkness, $darkness;
660	}	799	}
		800	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
661		801
662	for my $num (grep $_, @$cell[1,2,3]) {	802	for my $num (grep $_, @$cell[1,2,3]) {
663	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	803	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
664		804
665	glBindTexture GL_TEXTURE_2D, $tex->{name};	805	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
677	glTexCoord 1, 0; glVertex $px + $w, $py;	817	glTexCoord 1, 0; glVertex $px + $w, $py;
678	glEnd;	818	glEnd;
679	}	819	}
680	}	820	}
681	}	821	}
		822
		823	# if (1) { # higher quality darkness
		824	# $lighting =~ s/(.)/$1$1$1/gs;
		825	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		826	#
		827	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		828	#
		829	# $lighting = $pb->get_pixels;
		830	# $lighting =~ s/(.)../$1/gs;
		831	# }
		832
		833	$lighting = new Crossfire::Client::Texture
		834	width => $sw4,
		835	height => $sh,
		836	data => $lighting,
		837	internalformat => GL_ALPHA4,
		838	format => GL_ALPHA;
		839
		840	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		841	glColor 0, 0, 0, 0.75;
		842	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		843	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		844	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		845	glBegin GL_QUADS;
		846	glTexCoord 0, 0; glVertex 0 , 0;
		847	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		848	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		849	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		850	glEnd;
682		851
683	glDisable GL_TEXTURE_2D;	852	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	853	glDisable GL_BLEND;
685	}	854	}
686		855
…		…
733	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	902	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
734	$::CONN->send ("command run_stop");	903	$::CONN->send ("command run_stop");
735	}	904	}
736	}	905	}
737		906
		907	#############################################################################
		908
		909	package Crossfire::Client::Widget::Animator;
		910
		911	use SDL::OpenGL;
		912
		913	our @ISA = Crossfire::Client::Widget::Bin::;
		914
		915	sub moveto {
		916	my ($self, $x, $y) = @_;
		917
		918	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		919	$self->{speed} = 0.2;
		920	$self->{time} = 1;
		921
		922	::animation_start $self;
		923	}
		924
		925	sub animate {
		926	my ($self, $interval) = @_;
		927
		928	$self->{time} -= $interval * $self->{speed};
		929	if ($self->{time} <= 0) {
		930	$self->{time} = 0;
		931	::animation_stop $self;
		932	}
		933
		934	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		935
		936	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		937	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		938	}
		939
		940	sub _draw {
		941	my ($self) = @_;
		942
		943	glPushMatrix;
		944	glRotate $self->{time} * 10000, 0, 1, 0;
		945	$self->{children}[0]->draw;
		946	glPopMatrix;
		947	}
		948
738	1;	949	1;
739		950

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs. Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC