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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
		6	use List::Util ();
		7
		8	use CFClient;
		9
		10	our ($FOCUS, $HOVER, $GRAB); # various widgets
		11
		12	our $TOPLEVEL;
		13	our $BUTTON_STATE;
		14
		15	# class methods for events
		16	sub feed_sdl_key_down_event {
		17	$FOCUS->key_down ($_[0]) if $FOCUS;
		18	}
		19
		20	sub feed_sdl_key_up_event {
		21	$FOCUS->key_up ($_[0]) if $FOCUS;
		22	}
		23
		24	sub feed_sdl_button_down_event {
		25	my ($ev) = @_;
		26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		27
		28	if (!$BUTTON_STATE) {
		29	my $widget = $TOPLEVEL->find_widget ($x, $y);
		30
		31	$GRAB = $widget;
		32	$GRAB->update if $GRAB;
		33	}
		34
		35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
		36
		37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		38	}
		39
		40	sub feed_sdl_button_up_event {
		41	my ($ev) = @_;
		42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		43
		44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		45
		46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		47
		48	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		49
		50	if (!$BUTTON_STATE) {
		51	my $grab = $GRAB; undef $GRAB;
		52	$grab->update if $grab;
		53	$GRAB->update if $GRAB;
		54	}
		55	}
		56
		57	sub feed_sdl_motion_event {
		58	my ($ev) = @_;
		59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		60
		61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		62
		63	if ($widget != $HOVER) {
		64	my $hover = $HOVER; $HOVER = $widget;
		65
		66	$hover->update if $hover;
		67	$HOVER->update if $HOVER;
		68	}
		69
		70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
		71	}
		72
		73	#############################################################################
		74
		75	package CFClient::UI::Base;
		76
		77	use strict;
6		78
7	use SDL::OpenGL;	79	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;
9
10	use Crossfire::Client;
11
12	our $FOCUS; # the widget with current focus
13
14	# class methods for events
15	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
16	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
17	sub feed_sdl_button_down_event { }
18	sub feed_sdl_button_up_event { }
19		80
20	sub new {	81	sub new {
21	my $class = shift;	82	my $class = shift;
22		83
23	bless { @_ }, $class	84	bless {
		85	x => 0,
		86	y => 0,
		87	z => 0,
		88	@_
		89	}, $class
24	}	90	}
25		91
26	sub move {	92	sub move {
27	my ($self, $x, $y, $z) = @_;	93	my ($self, $x, $y, $z) = @_;
28	$self->{x} = $x;	94	$self->{x} = $x;
44		110
45	$self->{w} = $w;	111	$self->{w} = $w;
46	$self->{h} = $h;	112	$self->{h} = $h;
47	}	113	}
48		114
		115	# translate global koordinates to local coordinate system
		116	sub translate {
		117	my ($self, $x, $y) = @_;
		118
		119	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
		120	}
		121
49	sub focus_in {	122	sub focus_in {
50	my ($widget) = @_;	123	my ($self) = @_;
51	$FOCUS = $widget;	124
		125	return if $FOCUS == $self;
		126
		127	my $focus = $FOCUS; $FOCUS = $self;
		128	$focus->update if $focus;
		129	$FOCUS->update;
52	}	130	}
53		131
54	sub focus_out {	132	sub focus_out {
55	my ($widget) = @_;	133	my ($self) = @_;
56	}
57		134
		135	return unless $FOCUS == $self;
		136
		137	my $focus = $FOCUS; undef $FOCUS;
		138	$focus->update if $focus; #?
		139	}
		140
		141	sub mouse_motion { }
		142	sub button_up { }
58	sub key_down {	143	sub key_down { }
59	my ($widget, $sdlev) = @_;
60	}
61
62	sub key_up {	144	sub key_up { }
63	my ($widget, $sdlev) = @_;
64	}
65		145
66	sub button_down {	146	sub button_down {
67	my ($widget, $sdlev) = @_;	147	my ($self, $ev, $x, $y) = @_;
68	}
69		148
70	sub button_up {	149	$self->focus_in;
71	my ($widget, $sdlev) = @_;
72	}	150	}
73		151
74	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	152	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	153	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	154	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	155	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	156	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79		157
80	sub draw {	158	sub draw {
81	my ($self) = @_;	159	my ($self) = @_;
		160
		161	return unless $self->{h} && $self->{w};
82		162
83	glPushMatrix;	163	glPushMatrix;
84	glTranslate $self->{x}, $self->{y}, 0;	164	glTranslate $self->{x}, $self->{y}, 0;
85	$self->_draw;	165	$self->_draw;
86	glPopMatrix;	166	glPopMatrix;
		167
		168	if ($self == $HOVER) {
		169	my ($x, $y) = @$self{qw(x y)};
		170
		171	glColor 1, 1, 1, 0.1;
		172	glEnable GL_BLEND;
		173	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		174	glBegin GL_QUADS;
		175	glVertex $x , $y;
		176	glVertex $x + $self->{w}, $y;
		177	glVertex $x + $self->{w}, $y + $self->{h};
		178	glVertex $x , $y + $self->{h};
		179	glEnd;
		180	glDisable GL_BLEND;
		181	}
87	}	182	}
88		183
89	sub _draw {	184	sub _draw {
90	my ($self) = @_;	185	my ($self) = @_;
91		186
…		…
131		226
132	$self->{parent}->update	227	$self->{parent}->update
133	if $self->{parent};	228	if $self->{parent};
134	}	229	}
135		230
		231	sub connect {
		232	my ($self, $signal, $cb) = @_;
		233
		234	push @{ $self->{cb}{$signal} }, $cb;
		235	}
		236
		237	sub emit {
		238	my ($self, $signal, @args) = @_;
		239
		240	$_->($self, @args)
		241	for @{$self->{cb}{$signal} \|\| []};
		242	}
		243
136	sub DESTROY {	244	sub DESTROY {
137	my ($self) = @_;	245	my ($self) = @_;
138		246
139	#$self->deactivate;	247	#$self->deactivate;
140	}	248	}
141		249
142	#############################################################################	250	#############################################################################
143		251
144	package Crossfire::Client::Widget::Container;	252	package CFClient::UI::DrawBG;
145		253
146	our @ISA = Crossfire::Client::Widget::;	254	our @ISA = CFClient::UI::Base::;
		255
		256	use strict;
		257	use SDL::OpenGL;
147		258
148	sub new {	259	sub new {
		260	my $class = shift;
		261
		262	# range [value, low, high, page]
		263
		264	$class->SUPER::new (
		265	bg => [0, 0, 0, 0.4],
		266	active_bg => [1, 1, 1],
		267	@_
		268	)
		269	}
		270
		271	sub _draw {
		272	my ($self) = @_;
		273
		274	my ($w, $h) = @$self{qw(w h)};
		275
		276	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		277	glBegin GL_QUADS;
		278	glVertex 0 , 0;
		279	glVertex 0 , $h;
		280	glVertex $w, $h;
		281	glVertex $w, 0;
		282	glEnd;
		283	}
		284
		285	#############################################################################
		286
		287	package CFClient::UI::Empty;
		288
		289	our @ISA = CFClient::UI::Base::;
		290
		291	sub size_request {
		292	(0, 0)
		293	}
		294
		295	sub draw { }
		296
		297	#############################################################################
		298
		299	package CFClient::UI::Container;
		300
		301	our @ISA = CFClient::UI::Base::;
		302
		303	sub new {
149	my ($class, @widgets) = @_;	304	my ($class, %arg) = @_;
150		305
		306	my $children = delete $arg{children} \|\| [];
		307
151	my $self = $class->SUPER::new (children => []);	308	my $self = $class->SUPER::new (children => [], %arg);
152	$self->add ($_) for @widgets;	309	$self->add ($_) for @$children;
153		310
154	$self	311	$self
155	}	312	}
156		313
157	sub add {	314	sub add {
158	my ($self, $chld, $expand) = @_;	315	my ($self, $chld, $expand) = @_;
159		316
160	$chld->{expand} = $expand;	317	$chld->{expand} = $expand;
161	$chld->set_parent ($self);	318	$chld->set_parent ($self);
162		319
163	@{$self->{children}} =	320	$self->{children} = [
164	sort { $a->{z} <=> $b->{z} }	321	sort { $a->{z} <=> $b->{z} }
165	@{$self->{children}}, $chld;	322	@{$self->{children}}, $chld
		323	];
166		324
167	$self->size_allocate ($self->{w}, $self->{h})	325	$self->size_allocate ($self->{w}, $self->{h})
168	if $self->{w}; #TODO: check for "realised state"	326	if $self->{w}; #TODO: check for "realised state"
169	}	327	}
170		328
…		…
177	}	335	}
178		336
179	sub find_widget {	337	sub find_widget {
180	my ($self, $x, $y) = @_;	338	my ($self, $x, $y) = @_;
181		339
		340	$x -= $self->{x};
		341	$y -= $self->{y};
		342
182	my $res;	343	my $res;
183		344
184	for (@{ $self->{children} }) {	345	for (reverse @{ $self->{children} }) {
185	$res = $_->find_widget ($x, $y)	346	$res = $_->find_widget ($x, $y)
186	and return $res;	347	and return $res;
187	}	348	}
188		349
189	()	350	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
190	}	351	}
191		352
192	sub _draw {	353	sub _draw {
193	my ($self) = @_;	354	my ($self) = @_;
194		355
195	$_->draw for @{$self->{children}};	356	$_->draw for @{$self->{children}};
196	}	357	}
197		358
198	#############################################################################	359	#############################################################################
199		360
200	package Crossfire::Client::Widget::Bin;	361	package CFClient::UI::Bin;
201		362
202	our @ISA = Crossfire::Client::Widget::Container::;	363	our @ISA = CFClient::UI::Container::;
		364
		365	sub new {
		366	my ($class, %arg) = @_;
		367
		368	my $child = (delete $arg{child}) \|\| new CFClient::UI::Empty::;
		369
		370	$class->SUPER::new (children => [$child], %arg)
		371	}
		372
		373	sub add {
		374	my ($self, $widget) = @_;
		375
		376	$self->{children} = [];
		377
		378	$self->SUPER::add ($widget);
		379	}
		380
		381	sub remove {
		382	my ($self, $widget) = @_;
		383
		384	$self->SUPER::remove ($widget);
		385
		386	$self->{children} = [new CFClient::UI::Empty]
		387	unless @{$self->{children}};
		388	}
203		389
204	sub child { $_[0]->{children}[0] }	390	sub child { $_[0]->{children}[0] }
205		391
206	sub size_request {	392	sub size_request {
207	$_[0]{children}[0]->size_request if $_[0]{children}[0];	393	$_[0]{children}[0]->size_request
208	}	394	}
209		395
210	sub size_allocate {	396	sub size_allocate {
211	my ($self, $w, $h) = @_;	397	my ($self, $w, $h) = @_;
212		398
		399	return unless $self->{w} != $w \|\| $self->{h} != $h;
		400
213	$self->SUPER::size_allocate ($w, $h);	401	$self->SUPER::size_allocate ($w, $h);
214	$self->{children}[0]->size_allocate ($w, $h)	402	$self->{children}[0]->size_allocate ($w, $h);
215	if $self->{children}[0]
216	}	403	}
217		404
218	#############################################################################	405	#############################################################################
219		406
220	package Crossfire::Client::Widget::Toplevel;	407	package CFClient::UI::Window;
221		408
222	our @ISA = Crossfire::Client::Widget::Container::;	409	our @ISA = CFClient::UI::Bin::;
		410
		411	use SDL::OpenGL;
		412
		413	sub new {
		414	my ($class, %arg) = @_;
		415
		416	my $self = $class->SUPER::new (%arg);
		417	}
223		418
224	sub update {	419	sub update {
225	my ($self) = @_;	420	my ($self) = @_;
226		421
227	::refresh ();	422	# we want to do this delayed...
228	}
229
230	sub add {
231	my ($self, $widget) = @_;
232
233	$self->SUPER::add ($widget);
234
235	$widget->size_allocate ($widget->size_request);
236	}
237
238	#############################################################################
239
240	package Crossfire::Client::Widget::Window;
241
242	our @ISA = Crossfire::Client::Widget::Bin::;
243
244	use SDL::OpenGL;
245
246	sub new {
247	my ($class, $x, $y, $z, $w, $h) = @_;
248
249	my $self = $class->SUPER::new;
250
251	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
252	}
253
254	sub update {
255	my ($self) = @_;
256
257	$self->render_chld;	423	$self->render_chld;
258	$self->SUPER::update;	424	$self->SUPER::update;
259	}	425	}
260		426
261	sub render_chld {	427	sub render_chld {
262	my ($self) = @_;	428	my ($self) = @_;
263		429
264	$self->{texture} =	430	$self->{texture} =
265	Crossfire::Client::Texture->new_from_opengl (	431	CFClient::Texture->new_from_opengl (
266	$self->{w}, $self->{h}, sub { $self->child->draw }	432	$self->{w}, $self->{h}, sub { $self->child->draw }
267	);	433	);
268	}	434	}
269		435
270	sub size_allocate {	436	sub size_allocate {
271	my ($self, $w, $h) = @_;	437	my ($self, $w, $h) = @_;
272		438
		439	return unless $self->{w} != $w \|\| $self->{h} != $h;
		440
273	$self->{w} = $w;	441	$self->{w} = $w;
274	$self->{h} = $h;	442	$self->{h} = $h;
275		443
276	$self->child->size_allocate ($w, $h);	444	$self->child->size_allocate ($w, $h);
277		445
…		…
285		453
286	my $tex = $self->{texture}	454	my $tex = $self->{texture}
287	or return;	455	or return;
288		456
289	glEnable GL_BLEND;	457	glEnable GL_BLEND;
		458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
290	glEnable GL_TEXTURE_2D;	459	glEnable GL_TEXTURE_2D;
291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
292	glBindTexture GL_TEXTURE_2D, $tex->{name};
293		461
294	glBegin GL_QUADS;	462	$tex->draw_quad (0, 0, $w, $h);
295	glTexCoord 0, 0; glVertex 0, 0;
296	glTexCoord 0, 1; glVertex 0, $h;
297	glTexCoord 1, 1; glVertex $w, $h;
298	glTexCoord 1, 0; glVertex $w, 0;
299	glEnd;
300		463
301	glDisable GL_BLEND;	464	glDisable GL_BLEND;
302	glDisable GL_TEXTURE_2D;	465	glDisable GL_TEXTURE_2D;
303	}	466	}
304		467
305	#############################################################################	468	#############################################################################
306		469
307	package Crossfire::Client::Widget::Frame;	470	package CFClient::UI::Frame;
308		471
309	our @ISA = Crossfire::Client::Widget::Bin::;	472	our @ISA = CFClient::UI::Bin::;
310		473
311	use SDL::OpenGL;	474	use SDL::OpenGL;
312		475
313	sub size_request {	476	sub size_request {
314	my ($self) = @_;	477	my ($self) = @_;
…		…
321	}	484	}
322		485
323	sub size_allocate {	486	sub size_allocate {
324	my ($self, $w, $h) = @_;	487	my ($self, $w, $h) = @_;
325		488
		489	return unless $self->{w} != $w \|\| $self->{h} != $h;
		490
326	$self->{w} = $w;	491	$self->{w} = $w;
327	$self->{h} = $h;	492	$self->{h} = $h;
328		493
329	$self->child->size_allocate ($w - 4, $h - 4);	494	$self->child->size_allocate ($w - 4, $h - 4);
330	$self->child->move (2, 2);	495	$self->child->move (2, 2);
…		…
337		502
338	my ($w, $h) = $chld->size_request;	503	my ($w, $h) = $chld->size_request;
339		504
340	glBegin GL_QUADS;	505	glBegin GL_QUADS;
341	glColor 0, 0, 0;	506	glColor 0, 0, 0;
342	glTexCoord 0, 0; glVertex 0 , 0;	507	glVertex 0 , 0;
343	glTexCoord 0, 1; glVertex 0 , $h + 4;	508	glVertex 0 , $h + 4;
344	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	509	glVertex $w + 4 , $h + 4;
345	glTexCoord 1, 0; glVertex $w + 4 , 0;	510	glVertex $w + 4 , 0;
346	glEnd;	511	glEnd;
347		512
348	$chld->draw;	513	$chld->draw;
349	}	514	}
350		515
351	#############################################################################	516	#############################################################################
352		517
353	package Crossfire::Client::Widget::FancyFrame;	518	package CFClient::UI::FancyFrame;
354		519
355	our @ISA = Crossfire::Client::Widget::Bin::;	520	our @ISA = CFClient::UI::Bin::;
356		521
357	use SDL::OpenGL;	522	use SDL::OpenGL;
358		523
359	my @tex =	524	my @tex =
360	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }	525	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
361	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	526	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
362		527
363	sub size_request {	528	sub size_request {
364	my ($self) = @_;	529	my ($self) = @_;
365		530
366	my ($w, $h) = $self->SUPER::size_request;	531	my ($w, $h) = $self->SUPER::size_request;
367		532
368	$h += $tex[1]->{height};	533	$h += $tex[1]->{h};
369	$h += $tex[4]->{height};	534	$h += $tex[4]->{h};
370	$w += $tex[2]->{width};	535	$w += $tex[2]->{w};
371	$w += $tex[3]->{width};	536	$w += $tex[3]->{w};
372		537
373	($w, $h)	538	($w, $h)
374	}	539	}
375		540
376	sub size_allocate {	541	sub size_allocate {
377	my ($self, $w, $h) = @_;	542	my ($self, $w, $h) = @_;
378		543
		544	return unless $self->{w} != $w \|\| $self->{h} != $h;
		545
379	$self->SUPER::size_allocate ($w, $h);	546	$self->SUPER::size_allocate ($w, $h);
380		547
381	$h -= $tex[1]->{height};	548	$h -= $tex[1]->{h};
382	$h -= $tex[4]->{height};	549	$h -= $tex[4]->{h};
383	$w -= $tex[2]->{width};	550	$w -= $tex[2]->{w};
384	$w -= $tex[3]->{width};	551	$w -= $tex[3]->{w};
385		552
386	$h = $h < 0 ? 0 : $h;	553	$h = $h < 0 ? 0 : $h;
387	$w = $w < 0 ? 0 : $w;	554	$w = $w < 0 ? 0 : $w;
388		555
		556	my $child = $self->child;
		557
389	$self->child->size_allocate ($w, $h);	558	$child->size_allocate ($w, $h);
390	$self->child->move ($tex[3]->{width}, $tex[1]->{height});	559	$child->move ($tex[3]->{w}, $tex[1]->{h});
391	}	560	}
392		561
393	sub _draw {	562	sub _draw {
394	my ($self) = @_;	563	my ($self) = @_;
395		564
396	my ($w, $h) = ($self->{w}, $self->{h});	565	my ($w, $h) = ($self->{w}, $self->{h});
397	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	566	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
398		567
399	glEnable GL_BLEND;	568	glEnable GL_BLEND;
		569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
400	glEnable GL_TEXTURE_2D;	570	glEnable GL_TEXTURE_2D;
401	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403		572
404	my $top = $tex[1];	573	my $top = $tex[1];
405	glBindTexture GL_TEXTURE_2D, $top->{name};	574	$top->draw_quad (0, 0, $w, $top->{h});
406
407	glBegin GL_QUADS;
408	glTexCoord 0, 0; glVertex 0 , 0;
409	glTexCoord 0, 1; glVertex 0 , $top->{height};
410	glTexCoord 1, 1; glVertex $w , $top->{height};
411	glTexCoord 1, 0; glVertex $w , 0;
412	glEnd;
413		575
414	my $left = $tex[3];	576	my $left = $tex[3];
415	glBindTexture GL_TEXTURE_2D, $left->{name};	577	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
416
417	glBegin GL_QUADS;
418	glTexCoord 0, 0; glVertex 0 , $top->{height};
419	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422	glEnd;
423		578
424	my $right = $tex[2];	579	my $right = $tex[2];
425	glBindTexture GL_TEXTURE_2D, $right->{name};	580	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
426
427	glBegin GL_QUADS;
428	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431	glTexCoord 1, 0; glVertex $w , $top->{height};
432	glEnd;
433		581
434	my $bottom = $tex[4];	582	my $bottom = $tex[4];
435	glBindTexture GL_TEXTURE_2D, $bottom->{name};	583	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
436
437	glBegin GL_QUADS;
438	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439	glTexCoord 0, 1; glVertex 0 , $h;
440	glTexCoord 1, 1; glVertex $w , $h;
441	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442	glEnd;
443		584
444	my $bg = $tex[0];	585	my $bg = $tex[0];
445	glBindTexture GL_TEXTURE_2D, $bg->{name};	586	glBindTexture GL_TEXTURE_2D, $bg->{name};
446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;	588	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;	589	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449		590
450	my $rep_x = $cw / $bg->{width};	591	my $rep_x = $cw / $bg->{w};
451	my $rep_y = $ch / $bg->{height};	592	my $rep_y = $ch / $bg->{h};
452		593
453	glBegin GL_QUADS;	594	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
454	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458	glEnd;
459		595
460	glDisable GL_BLEND;	596	glDisable GL_BLEND;
461	glDisable GL_TEXTURE_2D;	597	glDisable GL_TEXTURE_2D;
462		598
463	$self->child->draw;	599	$self->child->draw;
464		600
465	}	601	}
466		602
467	#############################################################################	603	#############################################################################
468		604
469	package Crossfire::Client::Widget::Table;	605	package CFClient::UI::Table;
470		606
471	our @ISA = Crossfire::Client::Widget::Bin::;	607	our @ISA = CFClient::UI::Base::;
472		608
473	use SDL::OpenGL;	609	use SDL::OpenGL;
474		610
475	sub add {	611	sub add {
476	my ($self, $x, $y, $chld) = @_;	612	my ($self, $x, $y, $chld) = @_;
…		…
551	}	687	}
552	}	688	}
553		689
554	#############################################################################	690	#############################################################################
555		691
556	package Crossfire::Client::Widget::VBox;	692	package CFClient::UI::VBox;
557		693
558	our @ISA = Crossfire::Client::Widget::Container::;	694	our @ISA = CFClient::UI::Container::;
559		695
560	use SDL::OpenGL;	696	use SDL::OpenGL;
561		697
562	sub size_request {	698	sub size_request {
563	my ($self) = @_;	699	my ($self) = @_;
…		…
571	}	707	}
572		708
573	sub size_allocate {	709	sub size_allocate {
574	my ($self, $w, $h) = @_;	710	my ($self, $w, $h) = @_;
575		711
		712	return unless $self->{w} != $w \|\| $self->{h} != $h;
		713
576	$self->w ($w);	714	$self->{w} = $w;
577	$self->h ($h);	715	$self->{h} = $h;
578		716
579	my $exp;	717	return unless $self->{h};
580	my @oth;	718
581	# find expand widget	719	my $children = $self->{children};
582	for (@{$self->{children}}) {	720
583	if ($_->{expand}) {	721	my @h = map +($_->size_request)[1], @$children;
584	$exp = $_;	722
585	last;	723	my $req_h = List::Util::sum @h;
		724
		725	if ($req_h > $h) {
		726	# ah well, not enough space
		727	$_ = $h[$_] * $h / $req_h for @h;
		728	} else {
		729	my @exp = grep $_->{expand}, @$children;
		730	@exp = @$children unless @exp;
		731
		732	my %exp = map +($_ => 1), @exp;
		733
		734	for (0 .. $#$children) {
		735	my $child = $children->[$_];
		736
		737	my $alloc_h = $h[$_];
		738	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
		739	$h[$_] = $alloc_h;
586	}	740	}
587	push @oth, $_;
588	}
589
590	my ($ow, $oh);
591
592	# get sizes of other widgets
593	for (@oth) {
594	my ($w, $h) = $_->size_request;
595	$oh += $h;
596	if ($ow < $w) { $ow = $w }
597	}	741	}
598		742
599	my $y = 0;	743	my $y = 0;
600	for (@{$self->{children}}) {	744	for (0 .. $#$children) {
		745	my $child = $children->[$_];
		746	my $h = $h[$_];
601	$_->move (0, $y);	747	$child->move (0, $y);
602
603	if ($_ == $exp) {
604	$_->size_allocate ($w, $h - $oh);
605	$y += $h - $oh;
606	} else {
607	my ($cw, $h) = $_->size_request;
608	$_->size_allocate ($w, $h);	748	$child->size_allocate ($w, $h);
		749
609	$y += $h;	750	$y += $h;
610	}
611	}	751	}
612	}	752	}
613		753
614	#############################################################################	754	#############################################################################
615		755
616	package Crossfire::Client::Widget::Label;	756	package CFClient::UI::Label;
617		757
618	our @ISA = Crossfire::Client::Widget::;	758	our @ISA = CFClient::UI::Base::;
619		759
620	use SDL::OpenGL;	760	use SDL::OpenGL;
621		761
622	sub new {	762	sub new {
623	my ($class, $x, $y, $z, $height, $text) = @_;	763	my ($class, %arg) = @_;
624		764
625	# TODO: color, and make height, xyz etc. optional	765	my $self = $class->SUPER::new (
626	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	766	fg => [1, 1, 1],
		767	height => $::FONTSIZE,
		768	text => "",
		769	align => -1,
		770	layout => new CFClient::Layout,
		771	%arg
		772	);
627		773
628	$self->set_text ($text);	774	$self->set_text ($self->{text});
629		775
630	$self	776	$self
		777	}
		778
		779	sub escape_text {
		780	local $_ = $_[1];
		781
		782	s/&/&/g;
		783	s/>/>/g;
		784	s/</</g;
		785
		786	$_[1]
631	}	787	}
632		788
633	sub set_text {	789	sub set_text {
634	my ($self, $text) = @_;	790	my ($self, $text) = @_;
635		791
636	$self->{text} = $text;	792	$self->{text} = $text;
637	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	793	$self->{layout}->set_markup ($text);
638		794
		795	delete $self->{texture};
639	$self->update;	796	$self->update;
640	}	797	}
641		798
642	sub get_text {	799	sub get_text {
643	my ($self, $text) = @_;	800	my ($self, $text) = @_;
…		…
646	}	803	}
647		804
648	sub size_request {	805	sub size_request {
649	my ($self) = @_;	806	my ($self) = @_;
650		807
651	(	808	$self->{layout}->set_width;
		809	$self->{layout}->set_height ($self->{height});
		810	$self->{layout}->size
		811	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		812	# (
652	$self->{texture}{width},	813	# $self->{texture}{w},
653	$self->{texture}{height},	814	# $self->{texture}{h},
654	)	815	# )
		816	# } else {
		817	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
		818	#
		819	# ($w, $h)
		820	# }
		821	}
		822
		823	sub size_allocate {
		824	my ($self, $w, $h) = @_;
		825
		826	return unless $self->{w} != $w \|\| $self->{h} != $h;
		827
		828	$self->SUPER::size_allocate ($w, $h);
		829	delete $self->{texture};
		830	}
		831
		832	sub update {
		833	my ($self) = @_;
		834
		835	delete $self->{texture};
		836	$self->SUPER::update;
655	}	837	}
656		838
657	sub _draw {	839	sub _draw {
658	my ($self) = @_;	840	my ($self) = @_;
659		841
660	my $tex = $self->{texture};	842	my $tex = $self->{texture} \|\|= do {
		843	$self->{layout}->set_width ($self->{w});
		844	new_from_layout CFClient::Texture $self->{layout}
		845	};
661		846
662	glEnable GL_BLEND;	847	glEnable GL_BLEND;
		848	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
663	glEnable GL_TEXTURE_2D;	849	glEnable GL_TEXTURE_2D;
664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	850	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
666	glBindTexture GL_TEXTURE_2D, $tex->{name};
667		851
668	glColor 1, 0, 0, 1; # TODO color	852	glColor @{$self->{fg}};
669		853
670	glBegin GL_QUADS;	854	my $x =
671	glTexCoord 0, 0; glVertex 0 , 0;	855	$self->{align} < 0 ? 0
672	glTexCoord 0, 1; glVertex 0 , $tex->{height};	856	: $self->{align} > 0 ? $self->{w} - $tex->{w}
673	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	857	: ($self->{w} - $tex->{w}) * 0.5;
674	glTexCoord 1, 0; glVertex $tex->{width}, 0;
675	glEnd;
676		858
		859	$tex->draw_quad ($x, 0);
		860
		861	glDisable GL_TEXTURE_2D;
677	glDisable GL_BLEND;	862	glDisable GL_BLEND;
678	glDisable GL_TEXTURE_2D;	863	glGetError and die;
679	}	864	}
680		865
681	#############################################################################	866	#############################################################################
682		867
683	package Crossfire::Client::Widget::TextEntry;	868	package CFClient::UI::Entry;
684		869
685	our @ISA = Crossfire::Client::Widget::Label::;	870	our @ISA = CFClient::UI::Label::;
686		871
687	use SDL;	872	use SDL;
688	use SDL::OpenGL;	873	use SDL::OpenGL;
689		874
		875	sub new {
		876	my $class = shift;
		877
		878	$class->SUPER::new (
		879	fg => [1, 1, 1],
		880	bg => [0, 0, 0, 0.4],
		881	active_bg => [1, 1, 1],
		882	active_fg => [0, 0, 0],
		883	@_
		884	)
		885	}
		886
		887	sub _set_text {
		888	my ($self, $text) = @_;
		889
		890	$self->{last_activity} = $::NOW;
		891
		892	$self->{text} = $text;
		893	$self->{layout}->set_width ($self->{w});
		894
		895	$text =~ s/./*/g if $self->{hidden};
		896
		897
		898	$self->{layout}->set_markup ($self->escape_text ($text));
		899
		900	$text = substr $text, 0, $self->{cursor};
		901	utf8::encode $text;
		902
		903	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		904	}
		905
		906	sub size_request {
		907	my ($self) = @_;
		908
		909	my ($w, $h) = $self->SUPER::size_request;
		910
		911	($w + 1, $h) # add 1 for cursor
		912	}
		913
		914	sub size_allocate {
		915	my ($self, $w, $h) = @_;
		916
		917	return unless $self->{w} != $w \|\| $self->{h} != $h;
		918
		919	$self->SUPER::size_allocate ($w, $h);
		920
		921	$self->_set_text ($self->{text});
		922	}
		923
		924	sub set_text {
		925	my ($self, $text) = @_;
		926
		927	$self->{cursor} = length $text;
		928	$self->_set_text ($text);
		929	$self->update;
		930	}
		931
690	sub key_down {	932	sub key_down {
691	my ($self, $ev) = @_;	933	my ($self, $ev) = @_;
692		934
693	my $mod = $ev->key_mod;	935	my $mod = $ev->key_mod;
694	my $sym = $ev->key_sym;	936	my $sym = $ev->key_sym;
695		937
696	$ev->set_unicode (1);
697	my $uni = $ev->key_unicode;	938	my $uni = $ev->key_unicode;
698		939
699	my $text = $self->get_text;	940	my $text = $self->get_text;
700		941
701	if ($sym == SDLK_BACKSPACE) {	942	if ($sym == SDLK_BACKSPACE) {
702	substr $text, -1, 1, '';	943	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
703		944	} elsif ($sym == SDLK_DELETE) {
		945	substr $text, $self->{cursor}, 1, "";
		946	} elsif ($sym == SDLK_LEFT) {
		947	--$self->{cursor} if $self->{cursor};
		948	} elsif ($sym == SDLK_RIGHT) {
		949	++$self->{cursor} if $self->{cursor} < length $self->{text};
704	} elsif ($uni) {	950	} elsif ($uni) {
705	$text .= chr $uni;	951	substr $text, $self->{cursor}++, 0, chr $uni;
706	}	952	}
		953
707	$self->set_text ($text);	954	$self->_set_text ($text);
		955	$self->update;
708	}	956	}
709		957
710	#############################################################################	958	sub focus_in {
		959	my ($self) = @_;
711		960
		961	$self->{last_activity} = $::NOW;
		962
		963	$self->SUPER::focus_in;
		964	}
		965
		966	sub button_down {
		967	my ($self, $ev, $x, $y) = @_;
		968
		969	$self->SUPER::button_down ($ev, $x, $y);
		970
		971	my $idx = $self->{layout}->xy_to_index ($x, $y);
		972
		973	# byte-index to char-index
		974	my $text = $self->{layout};
		975	utf8::encode $text;
		976	$self->{cursor} = length substr $text, 0, $idx;
		977
		978	$self->_set_text ($self->{text});
		979	$self->update;
		980	}
		981
		982	sub mouse_motion {
		983	my ($self, $ev, $x, $y) = @_;
		984	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		985	}
		986
		987	sub _draw {
		988	my ($self) = @_;
		989
		990	local $self->{fg} = $self->{fg};
		991
		992	if ($FOCUS == $self) {
		993	glColor @{$self->{active_bg}};
		994	$self->{fg} = $self->{active_fg};
		995	} else {
		996	glColor @{$self->{bg}};
		997	}
		998
		999	glBegin GL_QUADS;
		1000	glVertex 0 , 0;
		1001	glVertex 0 , $self->{h};
		1002	glVertex $self->{w}, $self->{h};
		1003	glVertex $self->{w}, 0;
		1004	glEnd;
		1005
		1006	$self->SUPER::_draw;
		1007
		1008	#TODO: force update every cursor change :(
		1009	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1010	glColor @{$self->{fg}};
		1011	glBegin GL_LINES;
		1012	glVertex $self->{cur_x}, $self->{cur_y};
		1013	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
		1014	glEnd;
		1015	}
		1016	}
		1017
		1018	#############################################################################
		1019
		1020	package CFClient::UI::Slider;
		1021
		1022	use strict;
		1023
		1024	use SDL::OpenGL;
		1025
		1026	our @ISA = CFClient::UI::DrawBG::;
		1027
		1028	sub size_request {
		1029	my ($self) = @_;
		1030
		1031	my $w = 50;
		1032	my $h = 10;
		1033
		1034	$self->{vertical} ? ($h, $w) : ($w, $h)
		1035	}
		1036
		1037	sub new {
		1038	my $class = shift;
		1039
		1040	# range [value, low, high, page]
		1041
		1042	$class->SUPER::new (
		1043	fg => [1, 1, 1],
		1044	active_fg => [0, 0, 0],
		1045	range => [0, 0, 100, 10],
		1046	vertical => 1,
		1047	@_
		1048	)
		1049	}
		1050
		1051	sub button_down {
		1052	my ($self, $ev, $x, $y) = @_;
		1053
		1054	$self->SUPER::button_down ($ev, $x, $y);
		1055	$self->mouse_motion ($ev, $x, $y);
		1056	}
		1057
		1058	sub mouse_motion {
		1059	my ($self, $ev, $x, $y) = @_;
		1060
		1061	if ($GRAB == $self) {
		1062	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1063
		1064	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1065
		1066	$x = $x * ($hi - $lo) / $w + $lo;
		1067	$x = $lo if $x < $lo;
		1068	$x = $hi - $page if $x > $hi - $page;
		1069	$self->{range}[0] = $x;
		1070
		1071	$self->emit (changed => $x);
		1072	$self->update;
		1073	}
		1074	}
		1075
		1076	sub _draw {
		1077	my ($self) = @_;
		1078
		1079	$self->SUPER::_draw ();
		1080
		1081	my ($w, $h) = @$self{qw(w h)};
		1082
		1083	if ($self->{vertical}) {
		1084	# draw a vertical slider like a rotated horizontal slider
		1085
		1086	glRotate 90, 0, 0, 1;
		1087	glTranslate 0, -$self->{w}, 0;
		1088
		1089	($w, $h) = ($h, $w);
		1090	}
		1091
		1092	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
		1093	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
		1094
		1095	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1096
		1097	$page = int $page * $w / ($hi - $lo);
		1098	$value = int +($value - $lo) * $w / ($hi - $lo);
		1099
		1100	$w -= $page;
		1101	$page &= ~1;
		1102	glTranslate $page * 0.5, 0, 0;
		1103
		1104	glColor @$fg;
		1105	glBegin GL_LINES;
		1106	glVertex 0, 0; glVertex 0, $h;
		1107	glVertex $w - 1, 0; glVertex $w - 1, $h;
		1108	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
		1109	glEnd;
		1110
		1111	my $knob_a = $value - $page * 0.5;
		1112	my $knob_b = $value + $page * 0.5;
		1113
		1114	glBegin GL_QUADS;
		1115	glColor @$fg;
		1116	glVertex $knob_a, 0;
		1117	glVertex $knob_a, $h;
		1118	glVertex $knob_b, $h;
		1119	glVertex $knob_b, 0;
		1120
		1121	if ($knob_a < $knob_b - 2) {
		1122	glColor @$bg;
		1123	glVertex $knob_a + 1, 1;
		1124	glVertex $knob_a + 1, $h - 1;
		1125	glVertex $knob_b - 1, $h - 1;
		1126	glVertex $knob_b - 1, 1;
		1127	}
		1128	glEnd;
		1129	}
		1130
		1131	#############################################################################
		1132
712	package Crossfire::Client::Widget::MapWidget;	1133	package CFClient::UI::MapWidget;
713		1134
714	use strict;	1135	use strict;
715		1136
716	use List::Util qw(min max);	1137	use List::Util qw(min max);
717		1138
718	use SDL;	1139	use SDL;
719	use SDL::OpenGL;	1140	use SDL::OpenGL;
720	use SDL::OpenGL::Constants;
721		1141
722	our @ISA = Crossfire::Client::Widget::;	1142	our @ISA = CFClient::UI::Base::;
		1143
		1144	sub new {
		1145	my $class = shift;
		1146
		1147	$class->SUPER::new (
		1148	z => -1,
		1149	list => (glGenLists 1),
		1150	@_
		1151	)
		1152	}
723		1153
724	sub key_down {	1154	sub key_down {
725	print "MAPKEYDOWN\n";	1155	print "MAPKEYDOWN\n";
726	}	1156	}
727		1157
728	sub key_up {	1158	sub key_up {
729	}	1159	}
730		1160
731	sub size_request {	1161	sub size_request {
732		1162	(
		1163	1 + int $::WIDTH / 32,
		1164	1 + int $::HEIGHT / 32,
		1165	)
733	}	1166	}
734		1167
735	sub size_allocate {	1168	sub update {
		1169	my ($self) = @_;
		1170
		1171	$self->{need_update} = 1;
		1172	$self->SUPER::update;
736	}	1173	}
737		1174
738	sub _draw {	1175	sub _draw {
739	my ($self) = @_;	1176	my ($self) = @_;
740		1177
		1178	if (delete $self->{need_update}) {
		1179	glNewList $self->{list}, GL_COMPILE;
		1180
741	my $mx = $::CONN->{mapx};	1181	my $mx = $::CONN->{mapx};
742	my $my = $::CONN->{mapy};	1182	my $my = $::CONN->{mapy};
743		1183
744	my $map = $::CONN->{map};	1184	my $map = $::CONN->{map};
745		1185
746	my ($xofs, $yofs);	1186	my ($xofs, $yofs);
747		1187
748	my $sw = 1 + int $::WIDTH / 32;	1188	my $sw = 1 + int $::WIDTH / 32;
749	my $sh = 1 + int $::HEIGHT / 32;	1189	my $sh = 1 + int $::HEIGHT / 32;
750		1190
751	if ($::CONN->{mapw} > $sw) {	1191	if ($::CONN->{mapw} > $sw) {
752	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1192	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
753	} else {	1193	} else {
754	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1194	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
755	}	1195	}
756		1196
757	if ($::CONN->{maph} > $sh) {	1197	if ($::CONN->{maph} > $sh) {
758	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1198	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
759	} else {	1199	} else {
760	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1200	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
761	}	1201	}
762		1202
763	glEnable GL_TEXTURE_2D;	1203	glEnable GL_TEXTURE_2D;
764	glEnable GL_BLEND;	1204	glEnable GL_BLEND;
		1205	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
766		1207
767	my $sw4 = ($sw + 3) & ~3;	1208	my $sw4 = ($sw + 3) & ~3;
768	my $lighting = "\x00" x ($sw4 * $sh);	1209	my $darkness = "\x00" x ($sw4 * $sh);
769		1210
770	for my $x (0 .. $sw - 1) {	1211	for my $x (0 .. $sw - 1) {
		1212	my $row = $map->[$x + $xofs];
771	for my $y (0 .. $sh - 1) {	1213	for my $y (0 .. $sh - 1) {
772		1214
773	my $cell = $map->[$x + $xofs][$y + $yofs]	1215	my $cell = $row->[$y + $yofs]
774	or next;	1216	or next;
775		1217
776	my $darkness = $cell->[0] * (1 / 255);	1218	my $dark = $cell->[0];
777	if ($darkness < 0) {	1219	if ($dark < 0) {
778	$darkness = 0.15;	1220	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		1221	} else {
		1222	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
779	}	1223	}
780	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
781		1224
782	for my $num (grep $_, @$cell[1,2,3]) {	1225	for my $num (grep $_, @$cell[1,2,3]) {
783	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1226	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
		1227
		1228	my ($w, $h) = @$tex{qw(w h)};
784		1229
785	glBindTexture GL_TEXTURE_2D, $tex->{name};	1230	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
786
787	my $w = $tex->{width};
788	my $h = $tex->{height};
789
790	my $px = ($x + 1) * 32 - $w;
791	my $py = ($y + 1) * 32 - $h;
792
793	glBegin GL_QUADS;
794	glTexCoord 0, 0; glVertex $px , $py;
795	glTexCoord 0, 1; glVertex $px , $py + $h;
796	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
797	glTexCoord 1, 0; glVertex $px + $w, $py;
798	glEnd;	1231	}
799	}	1232	}
800	}	1233	}
801	}
802		1234
803	# if (1) { # higher quality darkness	1235	# if (1) { # higher quality darkness
804	# $lighting =~ s/(.)/$1$1$1/gs;	1236	# $lighting =~ s/(.)/$1$1$1/gs;
805	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;	1237	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
806	#	1238	#
…		…
808	#	1240	#
809	# $lighting = $pb->get_pixels;	1241	# $lighting = $pb->get_pixels;
810	# $lighting =~ s/(.)../$1/gs;	1242	# $lighting =~ s/(.)../$1/gs;
811	# }	1243	# }
812		1244
813	$lighting = new Crossfire::Client::Texture
814	width => $sw4,
815	height => $sh,
816	data => $lighting,
817	internalformat => GL_ALPHA4,
818	format => GL_ALPHA;
819
820	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821	glColor 0, 0, 0, 0.75;
822	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1245	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823	glBindTexture GL_TEXTURE_2D, $lighting->{name};
824	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825	glBegin GL_QUADS;
826	glTexCoord 0, 0; glVertex 0 , 0;
827	glTexCoord 0, 1; glVertex 0 , $sh * 32;
828	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830	glEnd;
831		1246
		1247	$darkness = new CFClient::Texture
		1248	w => $sw4,
		1249	h => $sh,
		1250	data => $darkness,
		1251	internalformat => GL_ALPHA,
		1252	format => GL_ALPHA;
		1253
		1254	glColor 0.45, 0.45, 0.45, 1;
		1255	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
		1256
832	glDisable GL_TEXTURE_2D;	1257	glDisable GL_TEXTURE_2D;
833	glDisable GL_BLEND;	1258	glDisable GL_BLEND;
		1259
		1260	glEndList;
		1261	}
		1262
		1263	glCallList $self->{list};
834	}	1264	}
835		1265
836	my %DIR = (	1266	my %DIR = (
837	SDLK_KP8, [1, "north"],	1267	SDLK_KP8, [1, "north"],
838	SDLK_KP9, [2, "northeast"],	1268	SDLK_KP9, [2, "northeast"],
…		…
884	}	1314	}
885	}	1315	}
886		1316
887	#############################################################################	1317	#############################################################################
888		1318
889	package Crossfire::Client::Widget::Animator;	1319	package CFClient::UI::Animator;
890		1320
891	use SDL::OpenGL;	1321	use SDL::OpenGL;
892		1322
893	our @ISA = Crossfire::Client::Widget::Bin::;	1323	our @ISA = CFClient::UI::Bin::;
894		1324
895	sub moveto {	1325	sub moveto {
896	my ($self, $x, $y) = @_;	1326	my ($self, $x, $y) = @_;
897		1327
898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1328	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899	$self->{speed} = 0.2;	1329	$self->{speed} = 0.001;
900	$self->{time} = 1;	1330	$self->{time} = 1;
901		1331
902	::animation_start $self;	1332	::animation_start $self;
903	}	1333	}
904		1334
…		…
919		1349
920	sub _draw {	1350	sub _draw {
921	my ($self) = @_;	1351	my ($self) = @_;
922		1352
923	glPushMatrix;	1353	glPushMatrix;
924	glRotate $self->{time} * 10000, 0, 1, 0;	1354	glRotate $self->{time} * 1000, 0, 1, 0;
925	$self->{children}[0]->draw;	1355	$self->{children}[0]->draw;
926	glPopMatrix;	1356	glPopMatrix;
927	}	1357	}
928		1358
929	1;	1359	#############################################################################
930		1360
		1361	package CFClient::UI::Toplevel;
		1362
		1363	our @ISA = CFClient::UI::Container::;
		1364
		1365	sub size_request {
		1366	($::WIDTH, $::HEIGHT)
		1367	}
		1368
		1369	sub size_allocate {
		1370	my ($self, $w, $h) = @_;
		1371
		1372	$self->SUPER::size_allocate ($w, $h);
		1373
		1374	$_->size_allocate ($_->size_request)
		1375	for @{$self->{children}};
		1376	}
		1377
		1378	sub translate {
		1379	my ($self, $x, $y) = @_;
		1380
		1381	($x, $y)
		1382	}
		1383
		1384	sub update {
		1385	my ($self) = @_;
		1386
		1387	$self->size_allocate ($self->size_request);
		1388	::refresh ();
		1389	}
		1390
		1391	sub add {
		1392	my ($self, $widget) = @_;
		1393
		1394	$self->SUPER::add ($widget);
		1395
		1396	$widget->size_allocate ($widget->size_request);
		1397	}
		1398
		1399	sub draw {
		1400	my ($self) = @_;
		1401
		1402	$self->_draw;
		1403	}
		1404
		1405	#############################################################################
		1406
		1407	package CFClient::UI;
		1408
		1409	$TOPLEVEL = new CFClient::UI::Toplevel;
		1410
		1411	1
		1412

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs. Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 19:31:18 2006 UTC