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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs. Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC