ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 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_up ($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	our $FOCUS; # the widget with current focus
11
12	# class methods for events
13	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
14	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
15	sub feed_sdl_button_down_event { }
16	sub feed_sdl_button_up_event { }
17		80
18	sub new {	81	sub new {
19	my $class = shift;	82	my $class = shift;
20		83
21	bless { @_ }, $class	84	my $self = bless {
		85	x => 0,
		86	y => 0,
		87	z => 0,
		88	w => -1,
		89	h => -1,
		90	@_
		91	}, $class;
		92
		93	for (keys %$self) {
		94	if (/^connect_(.*)$/) {
		95	$self->connect ($1 => delete $self->{$_});
		96	}
		97	}
		98
		99	$self
22	}	100	}
23		101
24	sub move {	102	sub move {
25	my ($self, $x, $y, $z) = @_;	103	my ($self, $x, $y, $z) = @_;
26	$self->{x} = $x;	104	$self->{x} = $x;
…		…
35	sub size_request {	113	sub size_request {
36	require Carp;	114	require Carp;
37	Carp::confess "size_request is abtract";	115	Carp::confess "size_request is abtract";
38	}	116	}
39		117
40	sub size_allocate {	118	sub _size_allocate {
41	my ($self, $w, $h) = @_;	119	my ($self, $x, $y, $w, $h) = @_;
		120
		121	$self->{x} = $x;
		122	$self->{y} = $y;
		123
		124	return unless $self->{w} != $w || $self->{h} != $h;
42		125
43	$self->{w} = $w;	126	$self->{w} = $w;
44	$self->{h} = $h;	127	$self->{h} = $h;
		128
		129	1
		130	}
		131
		132	sub size_allocate {
		133	my ($self, $x, $y, $w, $h) = @_;
		134
		135	$self->_size_allocate ($x, $y, $w, $h);
		136	}
		137
		138	# translate global coordinates to local coordinate system
		139	sub translate {
		140	my ($self, $x, $y) = @_;
		141
		142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
45	}	143	}
46		144
47	sub focus_in {	145	sub focus_in {
48	my ($widget) = @_;	146	my ($self) = @_;
49	$FOCUS = $widget;	147
		148	return if $FOCUS == $self;
		149
		150	my $focus = $FOCUS; $FOCUS = $self;
		151	$focus->update if $focus;
		152	$FOCUS->update;
50	}	153	}
51		154
52	sub focus_out {	155	sub focus_out {
53	my ($widget) = @_;	156	my ($self) = @_;
54	}
55		157
		158	return unless $FOCUS == $self;
		159
		160	my $focus = $FOCUS; undef $FOCUS;
		161	$focus->update if $focus; #?
		162	}
		163
		164	sub mouse_motion { }
		165	sub button_up { }
56	sub key_down {	166	sub key_down { }
57	my ($widget, $sdlev) = @_;
58	}
59
60	sub key_up {	167	sub key_up { }
61	my ($widget, $sdlev) = @_;
62	}
63		168
64	sub button_down {	169	sub button_down {
65	my ($widget, $sdlev) = @_;	170	my ($self, $ev, $x, $y) = @_;
66	}
67		171
68	sub button_up {	172	$self->focus_in;
69	my ($widget, $sdlev) = @_;
70	}	173	}
71		174
72	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }	175	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }	176	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	177	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	178	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	179	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77		180
78	sub draw {	181	sub draw {
79	my ($self) = @_;	182	my ($self) = @_;
		183
		184	return unless $self->{h} && $self->{w};
80		185
81	glPushMatrix;	186	glPushMatrix;
82	glTranslate $self->{x}, $self->{y}, 0;	187	glTranslate $self->{x}, $self->{y}, 0;
83	$self->_draw;	188	$self->_draw;
84	glPopMatrix;	189	glPopMatrix;
		190
		191	if ($self == $HOVER) {
		192	my ($x, $y) = @$self{qw(x y)};
		193
		194	glColor 0, 0, 1, 0.2;
		195	glEnable GL_BLEND;
		196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		197	glBegin GL_QUADS;
		198	glVertex $x , $y;
		199	glVertex $x + $self->{w}, $y;
		200	glVertex $x + $self->{w}, $y + $self->{h};
		201	glVertex $x , $y + $self->{h};
		202	glEnd;
		203	glDisable GL_BLEND;
		204	}
85	}	205	}
86		206
87	sub _draw {	207	sub _draw {
88	my ($self) = @_;	208	my ($self) = @_;
89		209
90	warn "no draw defined for $self\n";	210	warn "no draw defined for $self\n";
91	}
92
93	sub bbox {
94	my ($self) = @_;
95	my ($w, $h) = $self->size_request;
96	(
97	$self->{x},
98	$self->{y},
99	$self->{x} = $w,
100	$self->{y} = $h
101	)
102	}	211	}
103		212
104	sub find_widget {	213	sub find_widget {
105	my ($self, $x, $y) = @_;	214	my ($self, $x, $y) = @_;
106		215
…		…
109	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	218	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
110		219
111	()	220	()
112	}	221	}
113		222
114	sub del_parent { $_[0]->{parent} = undef }
115
116	sub set_parent {	223	sub set_parent {
117	my ($self, $par) = @_;	224	my ($self, $par) = @_;
118		225
119	$self->{parent} = $par;	226	$self->{parent} = $par;
120	Scalar::Util::weaken $self->{parent};	227	Scalar::Util::weaken $self->{parent};
…		…
129		236
130	$self->{parent}->update	237	$self->{parent}->update
131	if $self->{parent};	238	if $self->{parent};
132	}	239	}
133		240
		241	sub connect {
		242	my ($self, $signal, $cb) = @_;
		243
		244	push @{ $self->{cb}{$signal} }, $cb;
		245	}
		246
		247	sub emit {
		248	my ($self, $signal, @args) = @_;
		249
		250	$_->($self, @args)
		251	for @{$self->{cb}{$signal} || []};
		252	}
		253
134	sub DESTROY {	254	sub DESTROY {
135	my ($self) = @_;	255	my ($self) = @_;
136		256
137	#$self->deactivate;	257	#$self->deactivate;
138	}	258	}
139		259
140	#############################################################################	260	#############################################################################
141		261
142	package Crossfire::Client::Widget::Container;	262	package CFClient::UI::DrawBG;
143		263
144	our @ISA = Crossfire::Client::Widget::;	264	our @ISA = CFClient::UI::Base::;
		265
		266	use strict;
		267	use SDL::OpenGL;
145		268
146	sub new {	269	sub new {
		270	my $class = shift;
		271
		272	# range [value, low, high, page]
		273
		274	$class->SUPER::new (
		275	bg => [0, 0, 0, 0.2],
		276	active_bg => [1, 1, 1, 0.5],
		277	@_
		278	)
		279	}
		280
		281	sub _draw {
		282	my ($self) = @_;
		283
		284	my ($w, $h) = @$self{qw(w h)};
		285
		286	glEnable GL_BLEND;
		287	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		288	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		289
		290	glBegin GL_QUADS;
		291	glVertex 0 , 0;
		292	glVertex 0 , $h;
		293	glVertex $w, $h;
		294	glVertex $w, 0;
		295	glEnd;
		296
		297	glDisable GL_BLEND;
		298	}
		299
		300	#############################################################################
		301
		302	package CFClient::UI::Empty;
		303
		304	our @ISA = CFClient::UI::Base::;
		305
		306	sub size_request {
		307	(0, 0)
		308	}
		309
		310	sub draw { }
		311
		312	#############################################################################
		313
		314	package CFClient::UI::Container;
		315
		316	our @ISA = CFClient::UI::Base::;
		317
		318	sub new {
147	my ($class, @widgets) = @_;	319	my ($class, %arg) = @_;
148		320
		321	my $children = delete $arg{children} || [];
		322
149	my $self = $class->SUPER::new (children => []);	323	my $self = $class->SUPER::new (children => [], %arg);
150	$self->add ($_) for @widgets;	324	$self->add ($_) for @$children;
151		325
152	$self	326	$self
153	}	327	}
154		328
155	sub add {	329	sub add {
156	my ($self, $chld, $expand) = @_;	330	my ($self, $chld) = @_;
157		331
158	$chld->{expand} = $expand;
159	$chld->set_parent ($self);	332	$chld->set_parent ($self);
160		333
161	@{$self->{children}} =	334	$self->{children} = [
162	sort { $a->{z} <=> $b->{z} }	335	sort { $a->{z} <=> $b->{z} }
163	@{$self->{children}}, $chld;	336	@{$self->{children}}, $chld
		337	];
164		338
165	$self->size_allocate ($self->{w}, $self->{h});	339	$self->{w} = $self->{h} = -1;
		340	$self->update;
166	}	341	}
167		342
168	sub remove {	343	sub remove {
169	my ($self, $widget) = @_;	344	my ($self, $widget) = @_;
170		345
171	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
172		347
173	$self->size_allocate ($self->{w}, $self->{h});	348	$self->size_allocate (0, 0, $self->{w}, $self->{h});
174	}	349	}
175		350
176	sub find_widget {	351	sub find_widget {
177	my ($self, $x, $y) = @_;	352	my ($self, $x, $y) = @_;
178		353
		354	$x -= $self->{x};
		355	$y -= $self->{y};
		356
179	my $res;	357	my $res;
180		358
181	for (@{ $self->{children} }) {	359	for (reverse @{ $self->{children} }) {
182	$res = $_->find_widget ($x, $y)	360	$res = $_->find_widget ($x, $y)
183	and return $res;	361	and return $res;
184	}	362	}
185		363
		364	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		365	}
		366
		367	sub _draw {
		368	my ($self) = @_;
		369
		370	$_->draw for @{$self->{children}};
		371	}
		372
		373	#############################################################################
		374
		375	package CFClient::UI::Bin;
		376
		377	our @ISA = CFClient::UI::Container::;
		378
		379	sub new {
		380	my ($class, %arg) = @_;
		381
		382	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
		383
		384	$class->SUPER::new (children => [$child], %arg)
		385	}
		386
		387	sub add {
		388	my ($self, $widget) = @_;
		389
		390	$self->{children} = [];
186	()	391
		392	$self->SUPER::add ($widget);
187	}	393	}
		394
		395	sub remove {
		396	my ($self, $widget) = @_;
		397
		398	$self->SUPER::remove ($widget);
		399
		400	$self->{children} = [new CFClient::UI::Empty]
		401	unless @{$self->{children}};
		402	}
		403
		404	sub child { $_[0]->{children}[0] }
188		405
189	sub size_request {	406	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];	407	$_[0]{children}[0]->size_request
218	}	408	}
219		409
220	sub size_allocate {	410	sub size_allocate {
221	my ($self, $w, $h) = @_;	411	my ($self, $x, $y, $w, $h) = @_;
222	$self->SUPER::size_allocate ($w, $h);	412
		413	$self->_size_allocate ($x, $y, $w, $h) or return;
		414
223	$self->{children}[0]->size_allocate ($w, $h)	415	$self->{children}[0]->size_allocate (0, 0, $w, $h);
224	if $self->{children}[0]
225	}	416	}
226		417
227	#############################################################################	418	#############################################################################
228		419
229	package Crossfire::Client::Widget::Toplevel;	420	package CFClient::UI::Window;
230		421
231	our @ISA = Crossfire::Client::Widget::Container::;	422	our @ISA = CFClient::UI::Bin::;
		423
		424	use SDL::OpenGL;
		425
		426	sub new {
		427	my ($class, %arg) = @_;
		428
		429	my $self = $class->SUPER::new (%arg);
		430	}
232		431
233	sub update {	432	sub update {
234	my ($self) = @_;	433	my ($self) = @_;
235		434
236	::refresh ();	435	# we want to do this delayed...
237	}
238
239	#############################################################################
240
241	package Crossfire::Client::Widget::Window;
242
243	our @ISA = Crossfire::Client::Widget::Bin::;
244
245	use SDL::OpenGL;
246
247	sub add {
248	my ($self, $chld) = @_;
249	warn "ADD $chld\n";
250	$self->SUPER::add ($chld);
251	$chld->set_parent ($self);
252	}
253
254	sub remove {
255	my ($self) = @_;
256	# TODO FIXME: removing a child from a window will crash, see render_chld
257	# $self->update;
258	}
259
260	sub update {
261	my ($self) = @_;
262	$self->render_chld;	436	$self->render_chld;
		437	$self->SUPER::update;
263	}	438	}
264		439
265	sub render_chld {	440	sub render_chld {
266	my ($self) = @_;	441	my ($self) = @_;
267	my $chld = $self->get;
268	my ($w, $h) = $self->size_request;
269		442
270	require Carp;
271	Carp::cluck "RENDERCHI $w $h";
272	warn "RENDERCHI $w $h\n";
273	$self->{texture} =	443	$self->{texture} =
274	Crossfire::Client::Texture->new_from_opengl (	444	CFClient::Texture->new_from_opengl (
275	$w, $h, sub { $chld->draw }	445	$self->{w}, $self->{h}, sub { $self->child->draw }
276	);	446	);
277	$self->{texture}->upload;
278	}
279
280	sub size_request {
281	my ($self) = @_;
282	($self->w, $self->h)
283	}	447	}
284		448
285	sub size_allocate {	449	sub size_allocate {
286	my ($self, $w, $h) = @_;	450	my ($self, $x, $y, $w, $h) = @_;
287		451
288	$self->w ($w);	452	$self->_size_allocate ($x, $y, $w, $h) or return;
289	$self->h ($h);	453
290	$self->get->size_allocate ($w, $h);	454	$self->child->size_allocate (0, 0, $w, $h);
291		455
292	$self->update; #TODO: Move this to the size_request event propably?	456	$self->render_chld;
293	}	457	}
294		458
295	sub _draw {	459	sub _draw {
296	my ($self) = @_;	460	my ($self) = @_;
297		461
…		…
299		463
300	my $tex = $self->{texture}	464	my $tex = $self->{texture}
301	or return;	465	or return;
302		466
303	glEnable GL_BLEND;	467	glEnable GL_BLEND;
		468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
304	glEnable GL_TEXTURE_2D;	469	glEnable GL_TEXTURE_2D;
305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
306	glBindTexture GL_TEXTURE_2D, $tex->{name};
307		471
308	glBegin GL_QUADS;	472	$tex->draw_quad (0, 0, $w, $h);
309	glTexCoord 0, 0; glVertex 0, 0;
310	glTexCoord 0, 1; glVertex 0, $h;
311	glTexCoord 1, 1; glVertex $w, $h;
312	glTexCoord 1, 0; glVertex $w, 0;
313	glEnd;
314		473
315	glDisable GL_BLEND;	474	glDisable GL_BLEND;
316	glDisable GL_TEXTURE_2D;	475	glDisable GL_TEXTURE_2D;
317	}	476	}
318		477
319	#############################################################################	478	#############################################################################
320		479
321	package Crossfire::Client::Widget::Frame;	480	package CFClient::UI::Frame;
322		481
323	our @ISA = Crossfire::Client::Widget::Bin::;	482	our @ISA = CFClient::UI::Bin::;
324		483
325	use SDL::OpenGL;	484	use SDL::OpenGL;
326		485
327	sub size_request {	486	sub size_request {
328	my ($self) = @_;	487	my ($self) = @_;
…		…
333		492
334	map { $_ + 4 } $chld->size_request;	493	map { $_ + 4 } $chld->size_request;
335	}	494	}
336		495
337	sub size_allocate {	496	sub size_allocate {
338	my ($self, $w, $h) = @_;	497	my ($self, $x, $y, $w, $h) = @_;
		498
		499	$self->_size_allocate ($x, $y, $w, $h) or return;
339		500
340	$self->w ($w);
341	$self->h ($h);
342
343	$self->child->size_allocate ($w - 4, $h - 4);	501	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
344	$self->child->move (2, 2);
345	}	502	}
346		503
347	sub _draw {	504	sub _draw {
348	my ($self) = @_;	505	my ($self) = @_;
349		506
…		…
351		508
352	my ($w, $h) = $chld->size_request;	509	my ($w, $h) = $chld->size_request;
353		510
354	glBegin GL_QUADS;	511	glBegin GL_QUADS;
355	glColor 0, 0, 0;	512	glColor 0, 0, 0;
356	glTexCoord 0, 0; glVertex 0 , 0;	513	glVertex 0 , 0;
357	glTexCoord 0, 1; glVertex 0 , $h + 4;	514	glVertex 0 , $h + 4;
358	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	515	glVertex $w + 4 , $h + 4;
359	glTexCoord 1, 0; glVertex $w + 4 , 0;	516	glVertex $w + 4 , 0;
360	glEnd;	517	glEnd;
361		518
362	$chld->draw;	519	$chld->draw;
363	}	520	}
364		521
365	#############################################################################	522	#############################################################################
366		523
367	package Crossfire::Client::Widget::FancyFrame;	524	package CFClient::UI::FancyFrame;
368		525
369	our @ISA = Crossfire::Client::Widget::Frame::;	526	our @ISA = CFClient::UI::Bin::;
370		527
371	use SDL::OpenGL;	528	use SDL::OpenGL;
372		529
373	sub new {	530	my @tex =
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 $_ }	531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
379	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png)	532	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		533
384	sub size_request {	534	sub size_request {
385	my ($self) = @_;	535	my ($self) = @_;
386		536
		537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		538
387	my ($w, $h) = $self->SUPER::size_request;	539	my ($w, $h) = $self->SUPER::size_request;
388		540
389	$h += $self->{txts}->[1]->{height};	541	$h += $tex[1]->{h};
390	$h += $self->{txts}->[4]->{height};	542	$h += $tex[4]->{h};
391	$w += $self->{txts}->[2]->{width};	543	$w += $tex[2]->{w};
392	$w += $self->{txts}->[3]->{width};	544	$w += $tex[3]->{w};
393		545
394	($w, $h)	546	($w, $h)
395	}	547	}
396		548
397	sub size_allocate {	549	sub size_allocate {
398	my ($self, $w, $h) = @_;	550	my ($self, $x, $y, $w, $h) = @_;
399		551
400	$self->SUPER::size_allocate ($w, $h);	552	$self->_size_allocate ($x, $y, $w, $h) or return;
401		553
402	$h -= $self->{txts}->[1]->{height};	554	$h -= $tex[1]{h};
403	$h -= $self->{txts}->[4]->{height};	555	$h -= $tex[4]{h};
404	$w -= $self->{txts}->[2]->{width};	556	$w -= $tex[2]{w};
405	$w -= $self->{txts}->[3]->{width};	557	$w -= $tex[3]{w};
406		558
407	$h = $h < 0 ? 0 : $h;	559	$h = $h < 0 ? 0 : $h;
408	$w = $w < 0 ? 0 : $w;	560	$w = $w < 0 ? 0 : $w;
409	warn "CHILD:$w $h\n";	561
410	$self->child->size_allocate ($w, $h);	562	my $child = $self->child;
411	$self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});	563
		564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
		565	}
		566
		567	sub button_down {
		568	my ($self, $ev, $x, $y) = @_;
		569
		570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
		571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
		572
		573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		574	my ($bw, $bh) = ($self->{w}, $self->{h});
		575
		576	$self->{motion} = sub {
		577	my ($ev, $x, $y) = @_;
		578
		579	($x, $y) = ($ev->motion_x, $ev->motion_y);
		580
		581	$self->{user_w} = $bw + $x - $ox;
		582	$self->{user_h} = $bh + $y - $oy;
		583	$self->update;
		584	};
		585
		586	} elsif ($x >= 0 && $x < $self->{w}
		587	&& $y >= 0 && $y < $tex[1]{h}) {
		588
		589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		590	my ($bx, $by) = ($self->{x}, $self->{y});
		591
		592	$self->{motion} = sub {
		593	my ($ev, $x, $y) = @_;
		594
		595	($x, $y) = ($ev->motion_x, $ev->motion_y);
		596
		597	$self->move ($bx + $x - $ox, $by + $y - $oy);
		598	$self->update;
		599	};
		600	}
		601	}
		602
		603	sub button_up {
		604	my ($self, $ev, $x, $y) = @_;
		605
		606	delete $self->{motion};
		607	}
		608
		609	sub mouse_motion {
		610	my ($self, $ev, $x, $y) = @_;
		611
		612	$self->{motion}->($ev, $x, $y) if $self->{motion};
412	}	613	}
413		614
414	sub _draw {	615	sub _draw {
415	my ($self) = @_;	616	my ($self) = @_;
416		617
417	my ($w, $h) = ($self->w, $self->h);	618	my ($w, $h) = ($self->{w}, $self->{h});
418	my ($cw, $ch) = ($self->child->w, $self->child->h);	619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		620
		621	glEnable GL_BLEND;
		622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		623	glEnable GL_TEXTURE_2D;
		624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		625
		626	my $top = $tex[1];
		627	$top->draw_quad (0, 0, $w, $top->{h});
		628
		629	my $left = $tex[3];
		630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
		631
		632	my $right = $tex[2];
		633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
		634
		635	my $bottom = $tex[4];
		636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
		637
		638	my $bg = $tex[0];
		639
		640	glBindTexture GL_TEXTURE_2D, $bg->{name};
		641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		642
		643	my $rep_x = $cw / $bg->{w};
		644	my $rep_y = $ch / $bg->{h};
		645
		646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
		647
		648	glDisable GL_TEXTURE_2D;
		649	glDisable GL_BLEND;
		650
		651	$self->child->draw;
		652
		653	}
		654
		655	#############################################################################
		656
		657	package CFClient::UI::Table;
		658
		659	our @ISA = CFClient::UI::Base::;
		660
		661	use List::Util qw(max sum);
		662
		663	use SDL::OpenGL;
		664
		665	sub new {
		666	my $class = shift;
		667
		668	$class->SUPER::new (
		669	col_expand => [],
		670	@_
		671	)
		672	}
		673
		674	sub add {
		675	my ($self, $x, $y, $chld) = @_;
		676
		677	$self->{children}[$y][$x] = $chld;
		678	$chld->set_parent ($self);
		679
		680	$self->{w} = $self->{h} = -1;
		681	$self->update;
		682	}
		683
		684	sub get_wh {
		685	my ($self) = @_;
		686
		687	my (@w, @h);
		688
		689	for my $y (0 .. $#{$self->{children}}) {
		690	my $row = $self->{children}[$y]
		691	or next;
		692
		693	for my $x (0 .. $#$row) {
		694	my $widget = $row->[$x]
		695	or next;
		696	my ($w, $h) = $widget->size_request;
		697
		698	$w[$x] = max $w[$x], $w;
		699	$h[$y] = max $h[$y], $h;
		700	}
		701	}
		702
		703	(\@w, \@h)
		704	}
		705
		706	sub size_request {
		707	my ($self) = @_;
		708
		709	my ($ws, $hs) = $self->get_wh;
		710
		711	(
		712	(sum @$ws),
		713	(sum @$hs),
		714	)
		715	}
		716
		717	sub size_allocate {
		718	my ($self, $x, $y, $w, $h) = @_;
		719
		720	$self->_size_allocate ($x, $y, $w, $h) or return;
		721
		722	my ($ws, $hs) = $self->get_wh;
		723
		724	my $req_w = sum @$ws;
		725	my $req_h = sum @$hs;
		726
		727	# TODO: nicer code && do row_expand
		728	my @col_expand = @{$self->{col_expand}};
		729	@col_expand = (1) x @$ws unless @col_expand;
		730	my $col_expand = (sum @col_expand) || 1;
		731
		732	# linearly scale sizes
		733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		734	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		735
		736	my $y;
		737
		738	for my $r (0 .. $#{$self->{children}}) {
		739	my $row = $self->{children}[$r]
		740	or next;
		741
		742	my $x = 0;
		743	my $row_h = $hs->[$r];
		744
		745	for my $c (0 .. $#$row) {
		746	my $col_w = $ws->[$c];
		747
		748	if (my $widget = $row->[$c]) {
		749	$widget->size_allocate ($x, $y, $col_w, $row_h);
		750	}
		751
		752	$x += $col_w;
		753	}
		754
		755	$y += $row_h;
		756	}
		757
		758	}
		759
		760	sub find_widget {
		761	my ($self, $x, $y) = @_;
		762
		763	$x -= $self->{x};
		764	$y -= $self->{y};
		765
		766	my $res;
		767
		768	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		769	$res = $_->find_widget ($x, $y)
		770	and return $res;
		771	}
		772
		773	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		774	}
		775
		776	sub _draw {
		777	my ($self) = @_;
		778
		779	for (grep $_, @{$self->{children}}) {
		780	$_->draw for grep $_, @$_;
		781	}
		782	}
		783
		784	#############################################################################
		785
		786	package CFClient::UI::HBox;
		787
		788	# TODO: wrap into common Box base class
		789
		790	our @ISA = CFClient::UI::Container::;
		791
		792	sub size_request {
		793	my ($self) = @_;
		794
		795	my @alloc = map [$_->size_request], @{$self->{children}};
		796
		797	(
		798	(List::Util::sum map $_->[0], @alloc),
		799	(List::Util::max map $_->[1], @alloc),
		800	)
		801	}
		802
		803	sub size_allocate {
		804	my ($self, $x, $y, $w, $h) = @_;
		805
		806	$self->_size_allocate ($x, $y, $w, $h);
		807
		808	($h, $w) = ($w, $h);
		809
		810	my $children = $self->{children};
		811
		812	my @h = map +($_->size_request)[0], @$children;
		813
		814	my $req_h = List::Util::sum @h;
		815
		816	if ($req_h > $h) {
		817	# ah well, not enough space
		818	$_ *= $h / $req_h for @h;
		819	} else {
		820	my $exp = List::Util::sum map $_->{expand}, @$children;
		821	$exp ||= 1;
		822
		823	for (0 .. $#$children) {
		824	my $child = $children->[$_];
		825
		826	my $alloc_h = $h[$_];
		827	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		828	$h[$_] = $alloc_h;
		829	}
		830	}
		831
		832	my $y = 0;
		833	for (0 .. $#$children) {
		834	my $child = $children->[$_];
		835	my $h = $h[$_];
		836	$child->size_allocate ($y, 0, $h, $w);
		837
		838	$y += $h;
		839	}
		840	}
		841
		842	#############################################################################
		843
		844	package CFClient::UI::VBox;
		845
		846	# TODO: wrap into common Box base class
		847
		848	our @ISA = CFClient::UI::Container::;
		849
		850	sub size_request {
		851	my ($self) = @_;
		852
		853	my @alloc = map [$_->size_request], @{$self->{children}};
		854
		855	(
		856	(List::Util::max map $_->[0], @alloc),
		857	(List::Util::sum map $_->[1], @alloc),
		858	)
		859	}
		860
		861	sub size_allocate {
		862	my ($self, $x, $y, $w, $h) = @_;
		863
		864	$self->_size_allocate ($x, $y, $w, $h);
		865
		866	my $children = $self->{children};
		867
		868	my @h = map +($_->size_request)[1], @$children;
		869
		870	my $req_h = List::Util::sum @h;
		871
		872	if ($req_h > $h) {
		873	# ah well, not enough space
		874	$_ *= $h / $req_h for @h;
		875	} else {
		876	my $exp = List::Util::sum map $_->{expand}, @$children;
		877	$exp ||= 1;
		878
		879	for (0 .. $#$children) {
		880	my $child = $children->[$_];
		881
		882	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
		883	}
		884	}
		885
		886	my $y = 0;
		887	for (0 .. $#$children) {
		888	my $child = $children->[$_];
		889	my $h = $h[$_];
		890	$child->size_allocate (0, $y, $w, $h);
		891
		892	$y += $h;
		893	}
		894	}
		895
		896	#############################################################################
		897
		898	package CFClient::UI::Label;
		899
		900	our @ISA = CFClient::UI::Base::;
		901
		902	use SDL::OpenGL;
		903
		904	sub new {
		905	my ($class, %arg) = @_;
		906
		907	my $self = $class->SUPER::new (
		908	fg => [1, 1, 1],
		909	height => $::FONTSIZE,
		910	text => "",
		911	align => -1,
		912	padding => 2,
		913	layout => new CFClient::Layout,
		914	%arg
		915	);
		916
		917	$self->set_text ($self->{text});
		918
		919	$self
		920	}
		921
		922	sub escape_text {
		923	local $_ = $_[1];
		924
		925	s/&/&amp;/g;
		926	s/>/&gt;/g;
		927	s/</&lt;/g;
		928
		929	$_[1]
		930	}
		931
		932	sub set_text {
		933	my ($self, $text) = @_;
		934
		935	$self->{text} = $text;
		936	$self->{layout}->set_markup ($text);
		937
		938	delete $self->{texture};
		939	# $self->{w} = $self->{h} = -1;
		940	$self->update;
		941	}
		942
		943	sub get_text {
		944	my ($self, $text) = @_;
		945
		946	$self->{text}
		947	}
		948
		949	sub size_request {
		950	my ($self) = @_;
		951
		952	$self->{layout}->set_width;
		953	$self->{layout}->set_height ($self->{height});
		954	my ($w, $h) = $self->{layout}->size;
		955
		956	(
		957	$w + $self->{padding} * 2,
		958	$h + $self->{padding} * 2,
		959	)
		960	}
		961
		962	sub size_allocate {
		963	my ($self, $x, $y, $w, $h) = @_;
		964
		965	$self->_size_allocate ($x, $y, $w, $h) or return;
		966
		967	delete $self->{texture};
		968	}
		969
		970	sub update {
		971	my ($self) = @_;
		972
		973	delete $self->{texture};
		974	$self->SUPER::update;
		975	}
		976
		977	sub _draw {
		978	my ($self) = @_;
		979
		980	my $tex = $self->{texture} ||= do {
		981	$self->{layout}->set_width ($self->{w});
		982	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
		983	new_from_layout CFClient::Texture $self->{layout}
		984	};
		985
		986	glEnable GL_BLEND;
		987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		988	glEnable GL_TEXTURE_2D;
		989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		990
		991	glColor @{$self->{fg}};
		992
		993	my $x =
		994	$self->{align} < 0 ? $self->{padding}
		995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		996	: ($self->{w} - $tex->{w}) * 0.5;
		997
		998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
		999	$tex->draw_quad (0, 0);
		1000
		1001	glDisable GL_TEXTURE_2D;
		1002	glDisable GL_BLEND;
		1003	}
		1004
		1005	#############################################################################
		1006
		1007	package CFClient::UI::Entry;
		1008
		1009	our @ISA = CFClient::UI::Label::;
		1010
		1011	use SDL;
		1012	use SDL::OpenGL;
		1013
		1014	sub new {
		1015	my $class = shift;
		1016
		1017	$class->SUPER::new (
		1018	fg => [1, 1, 1],
		1019	bg => [0, 0, 0, 0.2],
		1020	active_bg => [1, 1, 1, 0.5],
		1021	active_fg => [0, 0, 0],
		1022	@_
		1023	)
		1024	}
		1025
		1026	sub _set_text {
		1027	my ($self, $text) = @_;
		1028
		1029	$self->{last_activity} = $::NOW;
		1030
		1031	$self->{text} = $text;
		1032	$self->{layout}->set_width ($self->{w});
		1033	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
		1034
		1035	$text =~ s/./*/g if $self->{hidden};
		1036
		1037	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
		1038
		1039	$text = substr $text, 0, $self->{cursor};
		1040	utf8::encode $text;
		1041
		1042	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1043	}
		1044
		1045	sub size_request {
		1046	my ($self) = @_;
		1047
		1048	my ($w, $h) = $self->SUPER::size_request;
		1049
		1050	($w + 1, $h) # add 1 for cursor
		1051	}
		1052
		1053	sub size_allocate {
		1054	my ($self, $x, $y, $w, $h) = @_;
		1055
		1056	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1057
		1058	$self->_set_text ($self->{text});
		1059	}
		1060
		1061	sub set_text {
		1062	my ($self, $text) = @_;
		1063
		1064	$self->{cursor} = length $text;
		1065	$self->_set_text ($text);
		1066	$self->update;
		1067	}
		1068
		1069	sub key_down {
		1070	my ($self, $ev) = @_;
		1071
		1072	my $mod = $ev->key_mod;
		1073	my $sym = $ev->key_sym;
		1074
		1075	my $uni = $ev->key_unicode;
		1076
		1077	my $text = $self->get_text;
		1078
		1079	if ($sym == SDLK_BACKSPACE) {
		1080	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
		1081	} elsif ($sym == SDLK_DELETE) {
		1082	substr $text, $self->{cursor}, 1, "";
		1083	} elsif ($sym == SDLK_LEFT) {
		1084	--$self->{cursor} if $self->{cursor};
		1085	} elsif ($sym == SDLK_RIGHT) {
		1086	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1087	} elsif ($sym == SDLK_HOME) {
		1088	$self->{cursor} = 0;
		1089	} elsif ($sym == SDLK_END) {
		1090	$self->{cursor} = length $text;
		1091	} elsif ($uni) {
		1092	substr $text, $self->{cursor}++, 0, chr $uni;
		1093	}
		1094
		1095	$self->_set_text ($text);
		1096	$self->update;
		1097	}
		1098
		1099	sub focus_in {
		1100	my ($self) = @_;
		1101
		1102	$self->{last_activity} = $::NOW;
		1103
		1104	$self->SUPER::focus_in;
		1105	}
		1106
		1107	sub button_down {
		1108	my ($self, $ev, $x, $y) = @_;
		1109
		1110	$self->SUPER::button_down ($ev, $x, $y);
		1111
		1112	my $idx = $self->{layout}->xy_to_index ($x, $y);
		1113
		1114	# byte-index to char-index
		1115	my $text = $self->{text};
		1116	utf8::encode $text;
		1117	$self->{cursor} = length substr $text, 0, $idx;
		1118
		1119	$self->_set_text ($self->{text});
		1120	$self->update;
		1121	}
		1122
		1123	sub mouse_motion {
		1124	my ($self, $ev, $x, $y) = @_;
		1125	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1126	}
		1127
		1128	sub _draw {
		1129	my ($self) = @_;
		1130
		1131	local $self->{fg} = $self->{fg};
		1132
		1133	if ($FOCUS == $self) {
		1134	glColor @{$self->{active_bg}};
		1135	$self->{fg} = $self->{active_fg};
		1136	} else {
		1137	glColor @{$self->{bg}};
		1138	}
		1139
		1140	glEnable GL_BLEND;
		1141	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1142	glBegin GL_QUADS;
		1143	glVertex 0 , 0;
		1144	glVertex 0 , $self->{h};
		1145	glVertex $self->{w}, $self->{h};
		1146	glVertex $self->{w}, 0;
		1147	glEnd;
		1148	glDisable GL_BLEND;
		1149
		1150	$self->SUPER::_draw;
		1151
		1152	#TODO: force update every cursor change :(
		1153	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1154	glColor @{$self->{fg}};
		1155	glBegin GL_LINES;
		1156	glVertex $self->{cur_x}, $self->{cur_y};
		1157	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
		1158	glEnd;
		1159	}
		1160	}
		1161
		1162	#############################################################################
		1163
		1164	package CFClient::UI::Button;
		1165
		1166	our @ISA = CFClient::UI::Label::;
		1167
		1168	use SDL;
		1169	use SDL::OpenGL;
		1170
		1171	my @tex =
		1172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1173	qw(b1_button_active.png);
		1174
		1175	sub new {
		1176	my $class = shift;
		1177
		1178	$class->SUPER::new (
		1179	padding => 4,
		1180	fg => [1, 1, 1],
		1181	bg => [1, 1, 1, 0.2],
		1182	active_fg => [1, 1, 0],
		1183	# active_bg => [0, 0, 0, 0.5],
		1184	# border_fg => [1, 1, 0],
		1185	@_
		1186	)
		1187	}
		1188
		1189	sub button_up {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($x >= 0 && $x < $self->{w}
		1193	&& $y >= 0 && $y < $self->{h}) {
		1194	$self->emit ("activate");
		1195	}
		1196	}
		1197
		1198	sub _draw {
		1199	my ($self) = @_;
		1200
		1201	local $self->{fg} = $self->{fg};
		1202	my $tex = $tex[0];
419		1203
420	glEnable GL_BLEND;	1204	glEnable GL_BLEND;
421	glEnable GL_TEXTURE_2D;	1205	glEnable GL_TEXTURE_2D;
422	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1206	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1207
		1208	if ($GRAB == $self) {
		1209	$self->{fg} = $self->{active_fg};
		1210	}
		1211
		1212	glBindTexture GL_TEXTURE_2D, $tex->{name};
423	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
424		1214
425	my $top = $self->{txts}->[1];	1215	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
426	glBindTexture GL_TEXTURE_2D, $top->{name};
427		1216
428	glBegin GL_QUADS;	1217	glDisable GL_TEXTURE_2D;
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;	1218	glDisable GL_BLEND;
482	glDisable GL_TEXTURE_2D;
483		1219
484	$self->child->draw;	1220	$self->SUPER::_draw;
485
486	}	1221	}
487		1222
488	#############################################################################	1223	#############################################################################
489		1224
490	package Crossfire::Client::Widget::Table;	1225	package CFClient::UI::CheckBox;
491		1226
492	our @ISA = Crossfire::Client::Widget::Bin::;	1227	our @ISA = CFClient::UI::DrawBG::;
493
494	use SDL::OpenGL;
495
496	sub add {
497	my ($self, $x, $y, $chld) = @_;
498	my $old_chld = $self->{children}[$y][$x];
499
500	$self->{children}[$y][$x] = $chld;
501	$chld->set_parent ($self);
502	$self->update;
503	}
504
505	sub max_row_height {
506	my ($self, $row) = @_;
507
508	my $hs = 0;
509	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
510	my $c = $self->{children}->[$row]->[$xi];
511	if ($c) {
512	my ($w, $h) = $c->size_request;
513	if ($hs < $h) { $hs = $h }
514	}
515	}
516	return $hs;
517	}
518
519	sub max_col_width {
520	my ($self, $col) = @_;
521
522	my $ws = 0;
523	for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
524	my $c = ($self->{children}->[$yi] || [])->[$col];
525	if ($c) {
526	my ($w, $h) = $c->size_request;
527	if ($ws < $w) { $ws = $w }
528	}
529	}
530	return $ws;
531	}
532
533	sub size_request {
534	my ($self) = @_;
535
536	my ($hs, $ws) = (0, 0);
537
538	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
539	$hs += $self->max_row_height ($yi);
540	}
541
542	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
543	my $wm = 0;
544	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
545	$wm += $self->max_col_width ($xi)
546	}
547	if ($ws < $wm) { $ws = $wm }
548	}
549
550	return ($ws, $hs);
551	}
552
553	sub _draw {
554	my ($self) = @_;
555
556	my $y = 0;
557	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
558	my $x = 0;
559
560	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
561
562	my $c = $self->{children}->[$yi]->[$xi];
563	if ($c) {
564	$c->move ($x, $y, 0); #TODO: Move to size_request
565	$c->draw if $c;
566	}
567
568	$x += $self->max_col_width ($xi);
569	}
570
571	$y += $self->max_row_height ($yi);
572	}
573	}
574
575	#############################################################################
576
577	package Crossfire::Client::Widget::VBox;
578
579	our @ISA = Crossfire::Client::Widget::Container::;
580
581	use SDL::OpenGL;
582
583	sub size_allocate {
584	my ($self, $w, $h) = @_;
585
586	$self->w ($w);
587	$self->h ($h);
588
589	my $exp;
590	my @oth;
591	# find expand widget
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) {
604	my ($w, $h) = $_->size_request;
605	$oh += $h;
606	if ($ow < $w) { $ow = $w }
607	}
608
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	}
622	}
623
624	sub _draw {
625	my ($self) = @_;
626
627	my ($x, $y);
628	for (@{$self->{children} || []}) {
629	$_->draw;
630	$y += $_->h;
631	}
632	}
633
634	#############################################################################
635
636	package Crossfire::Client::Widget::Label;
637
638	our @ISA = Crossfire::Client::Widget::;
639
640	use SDL::OpenGL;
641
642	sub new {
643	my ($class, $x, $y, $z, $height, $text) = @_;
644
645	# TODO: color, and make height, xyz etc. optional
646	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
647
648	$self->set_text ($text);
649
650	$self
651	}
652
653	sub set_text {
654	my ($self, $text) = @_;
655
656	$self->{text} = $text;
657	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
658
659	$self->update;
660	}
661
662	sub get_text {
663	my ($self, $text) = @_;
664
665	$self->{text}
666	}
667
668	sub size_request {
669	my ($self) = @_;
670
671	(
672	$self->{texture}{width},
673	$self->{texture}{height},
674	)
675	}
676
677	sub _draw {
678	my ($self) = @_;
679
680	my $tex = $self->{texture};
681
682	glEnable GL_BLEND;
683	glEnable GL_TEXTURE_2D;
684	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
686	glBindTexture GL_TEXTURE_2D, $tex->{name};
687
688	glColor 1, 0, 0, 1; # TODO color
689
690	glBegin GL_QUADS;
691	glTexCoord 0, 0; glVertex 0 , 0;
692	glTexCoord 0, 1; glVertex 0 , $tex->{height};
693	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
694	glTexCoord 1, 0; glVertex $tex->{width}, 0;
695	glEnd;
696
697	glDisable GL_BLEND;
698	glDisable GL_TEXTURE_2D;
699	}
700
701	#############################################################################
702
703	package Crossfire::Client::Widget::TextEntry;
704
705	our @ISA = Crossfire::Client::Widget::Label::;
706		1228
707	use SDL;	1229	use SDL;
708	use SDL::OpenGL;	1230	use SDL::OpenGL;
709		1231
710	sub key_down {	1232	sub new {
		1233	my $class = shift;
		1234
		1235	$class->SUPER::new (
		1236	padding => 2,
		1237	fg => [1, 1, 1],
		1238	active_fg => [1, 1, 0],
		1239	state => 0,
		1240	@_
		1241	)
		1242	}
		1243
		1244	sub size_request {
711	my ($self, $ev) = @_;	1245	my ($self) = @_;
712		1246
713	my $mod = $ev->key_mod;	1247	($self->{padding} * 2 + 6) x 2
714	my $sym = $ev->key_sym;	1248	}
715		1249
716	$ev->set_unicode (1);	1250	sub size_allocate {
717	my $uni = $ev->key_unicode;	1251	my ($self, $x, $y, $w, $h) = @_;
718		1252
719	my $text = $self->get_text;	1253	$self->_size_allocate ($x, $y, $w, $h);
		1254	}
720		1255
721	if ($sym == SDLK_BACKSPACE) {	1256	sub button_down {
722	substr $text, -1, 1, '';	1257	my ($self, $ev, $x, $y) = @_;
723		1258
724	} elsif ($uni) {	1259	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
725	$text .= chr $uni;	1260	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1261	$self->{state} = !$self->{state};
		1262	$self->emit (changed => $self->{state});
		1263	}
		1264	}
		1265
		1266	sub _draw {
		1267	my ($self) = @_;
		1268
		1269	$self->SUPER::_draw;
		1270
		1271	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1272
		1273	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
726	}	1274
727	$self->set_text ($text);	1275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
728	}
729		1276
730	#############################################################################	1277	glBegin GL_LINE_LOOP;
		1278	glVertex 0 , 0;
		1279	glVertex 0 , $s;
		1280	glVertex $s, $s;
		1281	glVertex $s, 0;
		1282	glEnd;
731		1283
		1284	if ($self->{state}) {
		1285	glBegin GL_LINES;
		1286	glVertex 0 , 0;
		1287	glVertex $s, $s;
		1288	glVertex $s, 0;
		1289	glVertex 0 , $s;
		1290	glEnd;
		1291	}
		1292	}
		1293
		1294	#############################################################################
		1295
		1296	package CFClient::UI::Slider;
		1297
		1298	use strict;
		1299
		1300	use SDL::OpenGL;
		1301
		1302	our @ISA = CFClient::UI::DrawBG::;
		1303
		1304	sub new {
		1305	my $class = shift;
		1306
		1307	# range [value, low, high, page]
		1308
		1309	my $self = $class->SUPER::new (
		1310	fg => [1, 1, 1],
		1311	active_fg => [0, 0, 0],
		1312	range => [0, 0, 100, 10],
		1313	req_w => 40,
		1314	req_h => 10,
		1315	vertical => 0,
		1316	@_
		1317	);
		1318
		1319	$self
		1320	}
		1321
		1322	sub size_request {
		1323	my ($self) = @_;
		1324
		1325	my $w = $self->{req_w};
		1326	my $h = $self->{req_h};
		1327
		1328	$self->{vertical} ? ($h, $w) : ($w, $h)
		1329	}
		1330
		1331	sub button_down {
		1332	my ($self, $ev, $x, $y) = @_;
		1333
		1334	$self->SUPER::button_down ($ev, $x, $y);
		1335	$self->mouse_motion ($ev, $x, $y);
		1336	}
		1337
		1338	sub mouse_motion {
		1339	my ($self, $ev, $x, $y) = @_;
		1340
		1341	if ($GRAB == $self) {
		1342	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1343
		1344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1345
		1346	$x = $x * ($hi - $lo) / $w + $lo;
		1347	$x = $lo if $x < $lo;
		1348	$x = $hi - $page if $x > $hi - $page;
		1349	$self->{range}[0] = $x;
		1350
		1351	$self->emit (changed => $x);
		1352	$self->update;
		1353	}
		1354	}
		1355
		1356	sub _draw {
		1357	my ($self) = @_;
		1358
		1359	$self->SUPER::_draw ();
		1360
		1361	my ($w, $h) = @$self{qw(w h)};
		1362
		1363	if ($self->{vertical}) {
		1364	# draw a vertical slider like a rotated horizontal slider
		1365
		1366	glRotate 90, 0, 0, 1;
		1367	glTranslate 0, -$self->{w}, 0;
		1368
		1369	($w, $h) = ($h, $w);
		1370	}
		1371
		1372	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
		1373	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
		1374
		1375	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1376
		1377	$page = int $page * $w / ($hi - $lo);
		1378	$value = int +($value - $lo) * $w / ($hi - $lo);
		1379
		1380	$w -= $page;
		1381	$page &= ~1;
		1382	glTranslate $page * 0.5, 0, 0;
		1383	$page ||= 2;
		1384
		1385	glColor @$fg;
		1386	glBegin GL_LINES;
		1387	glVertex 0, 0; glVertex 0, $h;
		1388	glVertex $w - 1, 0; glVertex $w - 1, $h;
		1389	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
		1390	glEnd;
		1391
		1392	my $knob_a = $value - $page * 0.5;
		1393	my $knob_b = $value + $page * 0.5;
		1394
		1395	glBegin GL_QUADS;
		1396	glColor @$fg;
		1397	glVertex $knob_a, 0;
		1398	glVertex $knob_a, $h;
		1399	glVertex $knob_b, $h;
		1400	glVertex $knob_b, 0;
		1401
		1402	if ($knob_a < $knob_b - 2) {
		1403	glColor @$bg;
		1404	glVertex $knob_a + 1, 1;
		1405	glVertex $knob_a + 1, $h - 1;
		1406	glVertex $knob_b - 1, $h - 1;
		1407	glVertex $knob_b - 1, 1;
		1408	}
		1409	glEnd;
		1410	}
		1411
		1412	#############################################################################
		1413
732	package Crossfire::Client::Widget::MapWidget;	1414	package CFClient::UI::MapWidget;
733		1415
734	use strict;	1416	use strict;
735		1417
736	use List::Util qw(min max);	1418	use List::Util qw(min max);
737		1419
738	use SDL;	1420	use SDL;
739	use SDL::OpenGL;	1421	use SDL::OpenGL;
740	use SDL::OpenGL::Constants;
741		1422
742	our @ISA = Crossfire::Client::Widget::;	1423	our @ISA = CFClient::UI::Base::;
		1424
		1425	sub new {
		1426	my $class = shift;
		1427
		1428	$class->SUPER::new (
		1429	z => -1,
		1430	list => (glGenLists 1),
		1431	@_
		1432	)
		1433	}
743		1434
744	sub key_down {	1435	sub key_down {
745	print "MAPKEYDOWN\n";	1436	print "MAPKEYDOWN\n";
746	}	1437	}
747		1438
748	sub key_up {	1439	sub key_up {
749	}	1440	}
750		1441
751	sub size_request {	1442	sub size_request {
752		1443	(
		1444	1 + 32 * int $::WIDTH / 32,
		1445	1 + 32 * int $::HEIGHT / 32,
		1446	)
753	}	1447	}
754		1448
755	sub size_allocate {	1449	sub update {
756	}	1450	my ($self) = @_;
757		1451
		1452	$self->{need_update} = 1;
		1453	$self->SUPER::update;
		1454	}
		1455
758	sub _draw {	1456	sub draw {
759	my ($self) = @_;	1457	my ($self) = @_;
760		1458
		1459	if (delete $self->{need_update}) {
		1460	glNewList $self->{list}, GL_COMPILE;
		1461
761	my $mx = $::CONN->{mapx};	1462	my $mx = $::CONN->{mapx};
762	my $my = $::CONN->{mapy};	1463	my $my = $::CONN->{mapy};
763		1464
764	my $map = $::CONN->{map};	1465	my $map = $::CONN->{map};
765		1466
766	my ($xofs, $yofs);	1467	my ($xofs, $yofs);
767		1468
768	my $sw = 1 + int $::WIDTH / 32;	1469	my $sw = 1 + int $::WIDTH / 32;
769	my $sh = 1 + int $::HEIGHT / 32;	1470	my $sh = 1 + int $::HEIGHT / 32;
770		1471
771	if ($::CONN->{mapw} > $sw) {	1472	if ($::CONN->{mapw} > $sw) {
772	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1473	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
773	} else {	1474	} else {
774	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1475	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
775	}	1476	}
776		1477
777	if ($::CONN->{maph} > $sh) {	1478	if ($::CONN->{maph} > $sh) {
778	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1479	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
779	} else {	1480	} else {
780	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1481	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
781	}	1482	}
782		1483
783	glEnable GL_TEXTURE_2D;	1484	glEnable GL_TEXTURE_2D;
784	glEnable GL_BLEND;	1485	glEnable GL_BLEND;
		1486	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
785	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1488	glColor 1, 1, 1, 1;
786		1489
787	my $sw4 = ($sw + 3) & ~3;	1490	my $sw4 = ($sw + 3) & ~3;
788	my $lighting = "\x00" x ($sw4 * $sh);	1491	my $darkness = "\x00" x ($sw4 * $sh);
789		1492
790	for my $x (0 .. $sw - 1) {	1493	for my $x (0 .. $sw - 1) {
		1494	my $row = $map->[$x + $xofs];
791	for my $y (0 .. $sh - 1) {	1495	for my $y (0 .. $sh - 1) {
792		1496
793	my $cell = $map->[$x + $xofs][$y + $yofs]	1497	my $cell = $row->[$y + $yofs]
794	or next;	1498	or next;
795		1499
796	my $darkness = $cell->[0] * (1 / 255);	1500	my $dark = $cell->[0];
797	if ($darkness < 0) {	1501	if ($dark < 0) {
798	$darkness = 0.15;	1502	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		1503	} else {
		1504	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
799	}	1505	}
800	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
801		1506
802	for my $num (grep $_, @$cell[1,2,3]) {	1507	for my $num (grep $_, @$cell[1,2,3]) {
803	my $tex = $::CONN->{face}[$num]{texture} || next;	1508	my $tex = $::CONN->{face}[$num]{texture} || next;
		1509
		1510	my ($w, $h) = @$tex{qw(w h)};
804		1511
805	glBindTexture GL_TEXTURE_2D, $tex->{name};	1512	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
806
807	my $w = $tex->{width};
808	my $h = $tex->{height};
809
810	my $px = ($x + 1) * 32 - $w;
811	my $py = ($y + 1) * 32 - $h;
812
813	glBegin GL_QUADS;
814	glTexCoord 0, 0; glVertex $px , $py;
815	glTexCoord 0, 1; glVertex $px , $py + $h;
816	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
817	glTexCoord 1, 0; glVertex $px + $w, $py;
818	glEnd;	1513	}
819	}	1514	}
820	}	1515	}
821	}
822		1516
823	# if (1) { # higher quality darkness	1517	# if (1) { # higher quality darkness
824	# $lighting =~ s/(.)/$1$1$1/gs;	1518	# $lighting =~ s/(.)/$1$1$1/gs;
825	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;	1519	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
826	#	1520	#
…		…
828	#	1522	#
829	# $lighting = $pb->get_pixels;	1523	# $lighting = $pb->get_pixels;
830	# $lighting =~ s/(.)../$1/gs;	1524	# $lighting =~ s/(.)../$1/gs;
831	# }	1525	# }
832		1526
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;	1527	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;
851		1528
		1529	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1530	my @conv = (
		1531	0.05, 0.05, 0.05,
		1532	0.05, 0.60, 0.05,
		1533	0.05, 0.05, 0.05,
		1534	);
		1535	CFClient::glConvolutionParameteri GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_REPLICATE_BORDER;
		1536	CFClient::glConvolutionFilter2D GL_CONVOLUTION_2D,
		1537	GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
		1538	pack "f*", @conv;
		1539	glEnable GL_CONVOLUTION_2D;
		1540	}
		1541
		1542	$darkness = new CFClient::Texture
		1543	w => $sw4,
		1544	h => $sh,
		1545	data => $darkness,
		1546	internalformat => GL_ALPHA,
		1547	format => GL_ALPHA;
		1548
		1549	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1550	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
		1551
		1552	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1553
852	glDisable GL_TEXTURE_2D;	1554	glDisable GL_TEXTURE_2D;
853	glDisable GL_BLEND;	1555	glDisable GL_BLEND;
		1556
		1557	glEndList;
		1558	}
		1559
		1560	glCallList $self->{list};
		1561
		1562	if ($FOCUS != $self) {
		1563	glEnable GL_BLEND;
		1564	glColor 0, 0, 1, 0.4;
		1565	glBegin GL_QUADS;
		1566	glVertex 0, 0;
		1567	glVertex 0, $::HEIGHT;
		1568	glVertex $::WIDTH, $::HEIGHT;
		1569	glVertex $::WIDTH, 0;
		1570	glEnd;
		1571	glDisable GL_BLEND;
		1572	}
854	}	1573	}
855		1574
856	my %DIR = (	1575	my %DIR = (
857	SDLK_KP8, [1, "north"],	1576	SDLK_KP8, [1, "north"],
858	SDLK_KP9, [2, "northeast"],	1577	SDLK_KP9, [2, "northeast"],
…		…
874		1593
875	my $mod = $ev->key_mod;	1594	my $mod = $ev->key_mod;
876	my $sym = $ev->key_sym;	1595	my $sym = $ev->key_sym;
877		1596
878	if ($sym == SDLK_KP5) {	1597	if ($sym == SDLK_KP5) {
879	$::CONN->send ("command stay fire");	1598	$::CONN->user_send ("command stay fire");
		1599	} elsif ($sym == SDLK_a) {
		1600	$::CONN->user_send ("command apply");
880	} elsif (exists $DIR{$sym}) {	1601	} elsif (exists $DIR{$sym}) {
881	if ($mod & KMOD_SHIFT) {	1602	if ($mod & KMOD_SHIFT) {
882	$self->{shft}++;	1603	$self->{shft}++;
883	$::CONN->send ("command fire $DIR{$sym}[0]");	1604	$::CONN->user_send ("command fire $DIR{$sym}[0]");
884	} elsif ($mod & KMOD_CTRL) {	1605	} elsif ($mod & KMOD_CTRL) {
885	$self->{ctrl}++;	1606	$self->{ctrl}++;
886	$::CONN->send ("command run $DIR{$sym}[0]");	1607	$::CONN->user_send ("command run $DIR{$sym}[0]");
887	} else {	1608	} else {
888	$::CONN->send ("command $DIR{$sym}[1]");	1609	$::CONN->user_send ("command $DIR{$sym}[1]");
889	}	1610	}
890	}	1611	}
891	}	1612	}
892		1613
893	sub key_up {	1614	sub key_up {
…		…
895		1616
896	my $mod = $ev->key_mod;	1617	my $mod = $ev->key_mod;
897	my $sym = $ev->key_sym;	1618	my $sym = $ev->key_sym;
898		1619
899	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1620	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
900	$::CONN->send ("command fire_stop");	1621	$::CONN->user_send ("command fire_stop");
901	}	1622	}
902	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1623	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
903	$::CONN->send ("command run_stop");	1624	$::CONN->user_send ("command run_stop");
904	}	1625	}
905	}	1626	}
906		1627
907	#############################################################################	1628	#############################################################################
908		1629
909	package Crossfire::Client::Widget::Animator;	1630	package CFClient::UI::Animator;
910		1631
911	use SDL::OpenGL;	1632	use SDL::OpenGL;
912		1633
913	our @ISA = Crossfire::Client::Widget::Bin::;	1634	our @ISA = CFClient::UI::Bin::;
914		1635
915	sub moveto {	1636	sub moveto {
916	my ($self, $x, $y) = @_;	1637	my ($self, $x, $y) = @_;
917		1638
918	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1639	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
919	$self->{speed} = 0.2;	1640	$self->{speed} = 0.001;
920	$self->{time} = 1;	1641	$self->{time} = 1;
921		1642
922	::animation_start $self;	1643	::animation_start $self;
923	}	1644	}
924		1645
…		…
939		1660
940	sub _draw {	1661	sub _draw {
941	my ($self) = @_;	1662	my ($self) = @_;
942		1663
943	glPushMatrix;	1664	glPushMatrix;
944	glRotate $self->{time} * 10000, 0, 1, 0;	1665	glRotate $self->{time} * 1000, 0, 1, 0;
945	$self->{children}[0]->draw;	1666	$self->{children}[0]->draw;
946	glPopMatrix;	1667	glPopMatrix;
947	}	1668	}
948		1669
949	1;	1670	#############################################################################
950		1671
		1672	package CFClient::UI::Toplevel;
		1673
		1674	our @ISA = CFClient::UI::Container::;
		1675
		1676	sub size_request {
		1677	($::WIDTH, $::HEIGHT)
		1678	}
		1679
		1680	sub size_allocate {
		1681	my ($self, $x, $y, $w, $h) = @_;
		1682
		1683	$self->_size_allocate ($x, $y, $w, $h);
		1684
		1685	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
		1686	for @{$self->{children}};
		1687	}
		1688
		1689	sub translate {
		1690	my ($self, $x, $y) = @_;
		1691
		1692	($x, $y)
		1693	}
		1694
		1695	sub update {
		1696	my ($self) = @_;
		1697
		1698	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
		1699	::refresh ();
		1700	}
		1701
		1702	sub add {
		1703	my ($self, $widget) = @_;
		1704
		1705	$self->SUPER::add ($widget);
		1706
		1707	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
		1708	}
		1709
		1710	sub draw {
		1711	my ($self) = @_;
		1712
		1713	$self->_draw;
		1714	}
		1715
		1716	#############################################################################
		1717
		1718	package CFClient::UI;
		1719
		1720	$TOPLEVEL = new CFClient::UI::Toplevel;
		1721
		1722	1
		1723

Diff Legend

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