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.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

1	package CFClient::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
6		6	use List::Util ();
7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;
9		7
10	use CFClient;	8	use CFClient;
11		9
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		11
14	our $TOPLEVEL;	12	our $ROOT;
15	our $BUTTON_STATE;	13	our $BUTTON_STATE;
16		14
17	# class methods for events	15	# class methods for events
18	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
19	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
26	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
27	my ($ev) = @_;	25	my ($ev) = @_;
28	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29		27
30	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
31	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
32		30
33	$GRAB = $widget;	31	$GRAB = $widget;
34	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
35	}	33	}
36		34
37	$BUTTON_STATE |= 1 << ($ev->button - 1);	35	$BUTTON_STATE |= 1 << ($ev->button - 1);
38		36
39	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40	}	38	}
41		39
42	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
43	my ($ev) = @_;	41	my ($ev) = @_;
44	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45		43
46	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47		45
48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
49		47
50	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
51		49
52	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
53	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
54	$grab->update if $grab;	52	$grab->update if $grab;
55	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
58		56
59	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
60	my ($ev) = @_;	58	my ($ev) = @_;
61	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62		60
63	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
64		62
65	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
66	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
67		65
68	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
69	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
70	}	68	}
71		69
72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
73	}	71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for ($vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
		84	}
		85
		86	#############################################################################
		87
		88	package CFClient::UI::Base;
		89
		90	use strict;
		91
		92	use SDL::OpenGL;
74		93
75	sub new {	94	sub new {
76	my $class = shift;	95	my $class = shift;
77		96
78	bless {	97	my $self = bless {
79	x => 0,	98	x => 0,
80	y => 0,	99	y => 0,
81	z => 0,	100	z => 0,
		101	w => -1,
		102	h => -1,
82	@_	103	@_
83	}, $class	104	}, $class;
		105
		106	for (keys %$self) {
		107	if (/^connect_(.*)$/) {
		108	$self->connect ($1 => delete $self->{$_});
		109	}
		110	}
		111
		112	$self
84	}	113	}
85		114
86	sub move {	115	sub move {
87	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
88	$self->{x} = $x;	117	$self->{x} = $x;
…		…
97	sub size_request {	126	sub size_request {
98	require Carp;	127	require Carp;
99	Carp::confess "size_request is abtract";	128	Carp::confess "size_request is abtract";
100	}	129	}
101		130
102	sub size_allocate {	131	sub _size_allocate {
103	my ($self, $w, $h) = @_;	132	my ($self, $x, $y, $w, $h) = @_;
		133
		134	$self->{x} = $x;
		135	$self->{y} = $y;
		136
		137	return unless $self->{w} != $w || $self->{h} != $h;
104		138
105	$self->{w} = $w;	139	$self->{w} = $w;
106	$self->{h} = $h;	140	$self->{h} = $h;
107	}
108		141
109	# translate global koordinates to local coordinate system	142	1
110	sub translate {	143	}
		144
		145	sub size_allocate {
		146	my ($self, $x, $y, $w, $h) = @_;
		147
		148	$self->_size_allocate ($x, $y, $w, $h);
		149	}
		150
		151	# return top left coordinates
		152	sub _topleft {
111	my ($self, $x, $y) = @_;	153	my ($self, $x, $y) = @_;
112		154
113	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
		158	# translate global coordinates to local coordinate system
		159	sub coord2local {
		160	my ($self, $x, $y) = @_;
		161
		162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
114	}	172	}
115		173
116	sub focus_in {	174	sub focus_in {
117	my ($self) = @_;	175	my ($self) = @_;
118		176
119	return if $FOCUS == $self;	177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
120		179
121	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
122	$focus->update if $focus;	181	$focus->update if $focus;
123	$FOCUS->update;	182	$FOCUS->update;
124	}	183	}
…		…
155	return unless $self->{h} && $self->{w};	214	return unless $self->{h} && $self->{w};
156		215
157	glPushMatrix;	216	glPushMatrix;
158	glTranslate $self->{x}, $self->{y}, 0;	217	glTranslate $self->{x}, $self->{y}, 0;
159	$self->_draw;	218	$self->_draw;
160	if ($self == $HOVER) {	219	glPopMatrix;
161	glColor 1, 1, 1, 0.4;	220
		221	if ($self == $HOVER && $self->{can_hover}) {
		222	my ($x, $y) = @$self{qw(x y)};
		223
		224	glColor 0, 0, 1, 0.2;
162	glEnable GL_BLEND;	225	glEnable GL_BLEND;
		226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
163	glBegin GL_QUADS;	227	glBegin GL_QUADS;
164	glVertex 0 , 0;	228	glVertex $x , $y;
165	glVertex $self->{w}, 0;	229	glVertex $x + $self->{w}, $y;
166	glVertex $self->{w}, $self->{h};	230	glVertex $x + $self->{w}, $y + $self->{h};
167	glVertex 0 , $self->{h};	231	glVertex $x , $y + $self->{h};
168	glEnd;	232	glEnd;
169	glDisable GL_BLEND;	233	glDisable GL_BLEND;
170	}	234	}
171	glPopMatrix;
172	}	235	}
173		236
174	sub _draw {	237	sub _draw {
175	my ($self) = @_;	238	my ($self) = @_;
176		239
177	warn "no draw defined for $self\n";	240	warn "no draw defined for $self\n";
178	}
179
180	sub bbox {
181	my ($self) = @_;
182	my ($w, $h) = $self->size_request;
183	(
184	$self->{x},
185	$self->{y},
186	$self->{x} = $w,
187	$self->{y} = $h
188	)
189	}	241	}
190		242
191	sub find_widget {	243	sub find_widget {
192	my ($self, $x, $y) = @_;	244	my ($self, $x, $y) = @_;
193		245
…		…
196	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	248	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
197		249
198	()	250	()
199	}	251	}
200		252
201	sub del_parent { $_[0]->{parent} = undef }
202
203	sub set_parent {	253	sub set_parent {
204	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
205		255
206	$self->{parent} = $par;
207	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
208	}
209
210	sub get_parent {
211	$_[0]->{parent}
212	}	257	}
213		258
214	sub update {	259	sub update {
215	my ($self) = @_;	260	my ($self) = @_;
216		261
217	$self->{parent}->update	262	$self->{parent}->update
218	if $self->{parent};	263	if $self->{parent};
219	}	264	}
220		265
		266	sub connect {
		267	my ($self, $signal, $cb) = @_;
		268
		269	push @{ $self->{cb}{$signal} }, $cb;
		270	}
		271
		272	sub emit {
		273	my ($self, $signal, @args) = @_;
		274
		275	$_->($self, @args)
		276	for @{$self->{cb}{$signal} || []};
		277	}
		278
221	sub DESTROY {	279	sub DESTROY {
222	my ($self) = @_;	280	my ($self) = @_;
223		281
224	#$self->deactivate;	282	#$self->deactivate;
225	}	283	}
226		284
227	#############################################################################	285	#############################################################################
228		286
229	package CFClient::Widget::DrawBG;	287	package CFClient::UI::DrawBG;
230		288
231	our @ISA = CFClient::Widget::;	289	our @ISA = CFClient::UI::Base::;
232		290
233	use strict;	291	use strict;
234	use SDL::OpenGL;	292	use SDL::OpenGL;
235		293
236	sub new {	294	sub new {
237	my $class = shift;	295	my $class = shift;
238		296
239	# range [value, low, high, page]	297	# range [value, low, high, page]
240		298
241	$class->SUPER::new (	299	$class->SUPER::new (
242	bg => [0, 0, 0, 0.4],	300	bg => [0, 0, 0, 0.2],
243	active_bg => [1, 1, 1],	301	active_bg => [1, 1, 1, 0.5],
244	@_	302	@_
245	)	303	)
246	}	304	}
247		305
248	sub _draw {	306	sub _draw {
249	my ($self) = @_;	307	my ($self) = @_;
250		308
251	my ($w, $h) = @$self{qw(w h)};	309	my ($w, $h) = @$self{qw(w h)};
252		310
		311	glEnable GL_BLEND;
		312	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	313	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		314
254	glBegin GL_QUADS;	315	glBegin GL_QUADS;
255	glVertex 0 , 0;	316	glVertex 0 , 0;
256	glVertex 0 , $h;	317	glVertex 0 , $h;
257	glVertex $w, $h;	318	glVertex $w, $h;
258	glVertex $w, 0;	319	glVertex $w, 0;
259	glEnd;	320	glEnd;
260	}
261		321
262	#############################################################################	322	glDisable GL_BLEND;
		323	}
263		324
		325	#############################################################################
		326
264	package CFClient::Widget::Empty;	327	package CFClient::UI::Empty;
265		328
266	our @ISA = CFClient::Widget::;	329	our @ISA = CFClient::UI::Base::;
267		330
268	sub size_request {	331	sub size_request {
269	(0, 0)	332	(0, 0)
270	}	333	}
271		334
272	sub draw { }	335	sub draw { }
273		336
274	#############################################################################	337	#############################################################################
275		338
276	package CFClient::Widget::Container;	339	package CFClient::UI::Container;
277		340
278	our @ISA = CFClient::Widget::;	341	our @ISA = CFClient::UI::Base::;
279		342
280	sub new {	343	sub new {
281	my ($class, %arg) = @_;	344	my ($class, %arg) = @_;
282		345
283	my $children = delete $arg{children} || [];	346	my $children = delete $arg{children} || [];
…		…
287		350
288	$self	351	$self
289	}	352	}
290		353
291	sub add {	354	sub add {
292	my ($self, $chld, $expand) = @_;	355	my ($self, $child) = @_;
293		356
294	$chld->{expand} = $expand;
295	$chld->set_parent ($self);	357	$child->set_parent ($self);
		358
		359	use sort 'stable';
296		360
297	$self->{children} = [	361	$self->{children} = [
298	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
299	@{$self->{children}}, $chld	363	@{$self->{children}}, $child
300	];	364	];
301		365
302	$self->size_allocate ($self->{w}, $self->{h})	366	$self->{w} = $self->{h} = -1;
303	if $self->{w}; #TODO: check for "realised state"	367	$self->update;
304	}	368	}
305		369
306	sub remove {	370	sub remove {
307	my ($self, $widget) = @_;	371	my ($self, $widget) = @_;
308		372
309	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	373	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
310		374
311	$self->size_allocate ($self->{w}, $self->{h});	375	$self->size_allocate (0, 0, $self->{w}, $self->{h});
312	}	376	}
313		377
314	sub find_widget {	378	sub find_widget {
315	my ($self, $x, $y) = @_;	379	my ($self, $x, $y) = @_;
316		380
…		…
333	$_->draw for @{$self->{children}};	397	$_->draw for @{$self->{children}};
334	}	398	}
335		399
336	#############################################################################	400	#############################################################################
337		401
338	package CFClient::Widget::Bin;	402	package CFClient::UI::Bin;
339		403
340	our @ISA = CFClient::Widget::Container::;	404	our @ISA = CFClient::UI::Container::;
341		405
342	sub new {	406	sub new {
343	my ($class, %arg) = @_;	407	my ($class, %arg) = @_;
344		408
345	my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;	409	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
346		410
347	$class->SUPER::new (children => [$child], %arg)	411	$class->SUPER::new (children => [$child], %arg)
348	}	412	}
349		413
350	sub add {	414	sub add {
…		…
358	sub remove {	422	sub remove {
359	my ($self, $widget) = @_;	423	my ($self, $widget) = @_;
360		424
361	$self->SUPER::remove ($widget);	425	$self->SUPER::remove ($widget);
362		426
363	$self->{children} = [new CFClient::Widget::Empty]	427	$self->{children} = [new CFClient::UI::Empty]
364	unless @{$self->{children}};	428	unless @{$self->{children}};
365	}	429	}
366		430
367	sub child { $_[0]->{children}[0] }	431	sub child { $_[0]->{children}[0] }
368		432
369	sub size_request {	433	sub size_request {
370	$_[0]{children}[0]->size_request	434	$_[0]{children}[0]->size_request
371	}	435	}
372		436
373	sub size_allocate {	437	sub size_allocate {
374	my ($self, $w, $h) = @_;	438	my ($self, $x, $y, $w, $h) = @_;
375		439
376	return unless $self->{w} != $w || $self->{h} != $h;	440	$self->_size_allocate ($x, $y, $w, $h) or return;
377		441
378	$self->SUPER::size_allocate ($w, $h);
379	$self->{children}[0]->size_allocate ($w, $h);	442	$self->{children}[0]->size_allocate (0, 0, $w, $h);
380	}	443	}
381		444
382	#############################################################################	445	#############################################################################
383		446
384	package CFClient::Widget::Window;	447	package CFClient::UI::Window;
385		448
386	our @ISA = CFClient::Widget::Bin::;	449	our @ISA = CFClient::UI::Bin::;
387		450
388	use SDL::OpenGL;	451	use SDL::OpenGL;
389		452
390	sub new {	453	sub new {
391	my ($class, %arg) = @_;	454	my ($class, %arg) = @_;
…		…
402	}	465	}
403		466
404	sub render_chld {	467	sub render_chld {
405	my ($self) = @_;	468	my ($self) = @_;
406		469
407	$self->{texture} =	470	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
408	CFClient::Texture->new_from_opengl (	471	glClearColor 0, 0, 0, 1;
409	$self->{w}, $self->{h}, sub { $self->child->draw }	472	glClear GL_COLOR_BUFFER_BIT;
410	);	473	$self->child->draw;
		474	};
411	}	475	}
412		476
413	sub size_allocate {	477	sub size_allocate {
414	my ($self, $w, $h) = @_;	478	my ($self, $x, $y, $w, $h) = @_;
415		479
416	return unless $self->{w} != $w || $self->{h} != $h;	480	$self->_size_allocate ($x, $y, $w, $h) or return;
417		481
418	$self->{w} = $w;
419	$self->{h} = $h;
420
421	$self->child->size_allocate ($w, $h);	482	$self->child->size_allocate (0, 0, $w, $h);
422		483
423	$self->render_chld;	484	$self->render_chld;
424	}	485	}
425		486
426	sub _draw {	487	sub _draw {
…		…
430		491
431	my $tex = $self->{texture}	492	my $tex = $self->{texture}
432	or return;	493	or return;
433		494
434	glEnable GL_BLEND;	495	glEnable GL_BLEND;
		496	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
435	glEnable GL_TEXTURE_2D;	497	glEnable GL_TEXTURE_2D;
436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	498	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
437		499
438	$tex->draw_quad (0, 0, $w, $h);	500	$tex->draw_quad (0, 0, $w, $h);
439		501
…		…
441	glDisable GL_TEXTURE_2D;	503	glDisable GL_TEXTURE_2D;
442	}	504	}
443		505
444	#############################################################################	506	#############################################################################
445		507
446	package CFClient::Widget::Frame;	508	package CFClient::UI::Frame;
447		509
448	our @ISA = CFClient::Widget::Bin::;	510	our @ISA = CFClient::UI::Bin::;
449		511
450	use SDL::OpenGL;	512	use SDL::OpenGL;
451		513
452	sub size_request {	514	sub size_request {
453	my ($self) = @_;	515	my ($self) = @_;
…		…
458		520
459	map { $_ + 4 } $chld->size_request;	521	map { $_ + 4 } $chld->size_request;
460	}	522	}
461		523
462	sub size_allocate {	524	sub size_allocate {
463	my ($self, $w, $h) = @_;	525	my ($self, $x, $y, $w, $h) = @_;
464		526
465	return unless $self->{w} != $w || $self->{h} != $h;	527	$self->_size_allocate ($x, $y, $w, $h) or return;
466		528
467	$self->{w} = $w;
468	$self->{h} = $h;
469
470	$self->child->size_allocate ($w - 4, $h - 4);	529	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
471	$self->child->move (2, 2);
472	}	530	}
473		531
474	sub _draw {	532	sub _draw {
475	my ($self) = @_;	533	my ($self) = @_;
476		534
…		…
489	$chld->draw;	547	$chld->draw;
490	}	548	}
491		549
492	#############################################################################	550	#############################################################################
493		551
494	package CFClient::Widget::FancyFrame;	552	package CFClient::UI::FancyFrame;
495		553
496	our @ISA = CFClient::Widget::Bin::;	554	our @ISA = CFClient::UI::Bin::;
497		555
498	use SDL::OpenGL;	556	use SDL::OpenGL;
499		557
500	my @tex =	558	my @tex =
501	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	559	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
502	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	560	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
503		561
		562	sub new {
		563	my $class = shift;
		564
		565	# TODO: user_x, user_y, overwrite moveto?
		566
		567	$class->SUPER::new (
		568	bg => [1, 1, 1, 1],
		569	border_bg => [1, 1, 1, 1],
		570	border => $::FONTSIZE * 0.8,
		571	@_
		572	)
		573	}
		574
504	sub size_request {	575	sub size_request {
505	my ($self) = @_;	576	my ($self) = @_;
506		577
		578	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		579
507	my ($w, $h) = $self->SUPER::size_request;	580	my ($w, $h) = $self->SUPER::size_request;
508		581
509	$h += $tex[1]->{height};	582	(
510	$h += $tex[4]->{height};	583	$w + $self->{border} * 2,
511	$w += $tex[2]->{width};	584	$h + $self->{border} * 2,
512	$w += $tex[3]->{width};	585	)
513
514	($w, $h)
515	}	586	}
516		587
517	sub size_allocate {	588	sub size_allocate {
518	my ($self, $w, $h) = @_;	589	my ($self, $x, $y, $w, $h) = @_;
519		590
520	return unless $self->{w} != $w || $self->{h} != $h;	591	$self->_size_allocate ($x, $y, $w, $h) or return;
521		592
522	$self->SUPER::size_allocate ($w, $h);	593	$h -= List::Util::max 0, $self->{border} * 2;
		594	$w -= List::Util::max 0, $self->{border} * 2;
523		595
524	$h -= $tex[1]->{height};	596	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
525	$h -= $tex[4]->{height};	597	}
526	$w -= $tex[2]->{width};
527	$w -= $tex[3]->{width};
528		598
529	$h = $h < 0 ? 0 : $h;	599	sub button_down {
530	$w = $w < 0 ? 0 : $w;	600	my ($self, $ev, $x, $y) = @_;
531		601
532	my $child = $self->child;	602	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		603	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
533		604
534	$child->size_allocate ($w, $h);	605	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
535	$child->move ($tex[3]->{width}, $tex[1]->{height});	606	my ($bw, $bh) = ($self->{w}, $self->{h});
		607
		608	$self->{motion} = sub {
		609	my ($ev, $x, $y) = @_;
		610
		611	($x, $y) = ($ev->motion_x, $ev->motion_y);
		612
		613	$self->{user_w} = $bw + $x - $ox;
		614	$self->{user_h} = $bh + $y - $oy;
		615	$self->update;
		616	};
		617
		618	} elsif ($x >= 0 && $x < $self->{w}
		619	&& $y >= 0 && $y < $self->{border}) {
		620
		621	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		622	my ($bx, $by) = ($self->{x}, $self->{y});
		623
		624	$self->{motion} = sub {
		625	my ($ev, $x, $y) = @_;
		626
		627	($x, $y) = ($ev->motion_x, $ev->motion_y);
		628
		629	$self->move ($bx + $x - $ox, $by + $y - $oy);
		630	$self->update;
		631	};
		632	}
		633	}
		634
		635	sub button_up {
		636	my ($self, $ev, $x, $y) = @_;
		637
		638	delete $self->{motion};
		639	}
		640
		641	sub mouse_motion {
		642	my ($self, $ev, $x, $y) = @_;
		643
		644	$self->{motion}->($ev, $x, $y) if $self->{motion};
536	}	645	}
537		646
538	sub _draw {	647	sub _draw {
539	my ($self) = @_;	648	my ($self) = @_;
540		649
541	my ($w, $h) = ($self->{w}, $self->{h});	650	my ($w, $h ) = ($self->{w}, $self->{h});
542	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	651	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
543		652
544	glEnable GL_BLEND;	653	glEnable GL_BLEND;
		654	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
545	glEnable GL_TEXTURE_2D;	655	glEnable GL_TEXTURE_2D;
546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
548		657
549	my $top = $tex[1];	658	glColor @{ $self->{border_bg} };
550	$top->draw_quad (0, 0, $w, $top->{height});	659	$tex[1]->draw_quad (0, 0, $w, $self->{border});
551		660	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
552	my $left = $tex[3];	661	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
553	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);	662	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
554
555	my $right = $tex[2];
556	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
557
558	my $bottom = $tex[4];
559	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
560		663
561	my $bg = $tex[0];	664	my $bg = $tex[0];
562	glBindTexture GL_TEXTURE_2D, $bg->{name};
563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
565	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
566		665
		666	# TODO: repeat texture not scale
567	my $rep_x = $cw / $bg->{width};	667	my $rep_x = $cw / $bg->{w};
568	my $rep_y = $ch / $bg->{height};	668	my $rep_y = $ch / $bg->{h};
569		669
		670	glColor @{ $self->{bg} };
		671
		672	$bg->{s} = $rep_x;
		673	$bg->{t} = $rep_y;
		674	$bg->{wrap_mode} = 1;
570	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);	675	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
571		676
		677	glDisable GL_TEXTURE_2D;
572	glDisable GL_BLEND;	678	glDisable GL_BLEND;
573	glDisable GL_TEXTURE_2D;
574		679
575	$self->child->draw;	680	$self->child->draw;
576
577	}	681	}
578		682
579	#############################################################################	683	#############################################################################
580		684
581	package CFClient::Widget::Table;	685	package CFClient::UI::Table;
582		686
583	our @ISA = CFClient::Widget::Bin::;	687	our @ISA = CFClient::UI::Base::;
		688
		689	use List::Util qw(max sum);
584		690
585	use SDL::OpenGL;	691	use SDL::OpenGL;
586		692
		693	sub new {
		694	my $class = shift;
		695
		696	$class->SUPER::new (
		697	col_expand => [],
		698	@_
		699	)
		700	}
		701
587	sub add {	702	sub add {
588	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
589	my $old_chld = $self->{children}[$y][$x];
590		704
		705	$child->set_parent ($self);
591	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
592	$chld->set_parent ($self);	707
		708	$self->{w} = $self->{h} = -1;
593	$self->update;	709	$self->update;
594	}	710	}
595		711
596	sub max_row_height {	712	# TODO: move to container class maybe? send childs a signal on removal?
		713	sub clear {
597	my ($self, $row) = @_;	714	my ($self) = @_;
598		715
599	my $hs = 0;	716	delete $self->{children};
600	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {	717	$self->update;
		718	}
		719
		720	sub get_wh {
		721	my ($self) = @_;
		722
		723	my (@w, @h);
		724
		725	for my $y (0 .. $#{$self->{children}}) {
601	my $c = $self->{children}->[$row]->[$xi];	726	my $row = $self->{children}[$y]
602	if ($c) {	727	or next;
		728
		729	for my $x (0 .. $#$row) {
		730	my $widget = $row->[$x]
		731	or next;
603	my ($w, $h) = $c->size_request;	732	my ($w, $h) = $widget->size_request;
604	if ($hs < $h) { $hs = $h }	733
		734	$w[$x] = max $w[$x], $w;
		735	$h[$y] = max $h[$y], $h;
605	}	736	}
606	}	737	}
607	return $hs;
608	}
609		738
610	sub max_col_width {	739	(\@w, \@h)
		740	}
		741
		742	sub size_request {
611	my ($self, $col) = @_;	743	my ($self) = @_;
612		744
		745	my ($ws, $hs) = $self->get_wh;
		746
		747	(
		748	(sum @$ws),
		749	(sum @$hs),
		750	)
		751	}
		752
		753	sub size_allocate {
		754	my ($self, $x, $y, $w, $h) = @_;
		755
		756	$self->_size_allocate ($x, $y, $w, $h) or return;
		757
		758	my ($ws, $hs) = $self->get_wh;
		759
		760	my $req_w = sum @$ws;
		761	my $req_h = sum @$hs;
		762
		763	# TODO: nicer code && do row_expand
		764	my @col_expand = @{$self->{col_expand}};
		765	@col_expand = (1) x @$ws unless @col_expand;
		766	my $col_expand = (sum @col_expand) || 1;
		767
		768	# linearly scale sizes
		769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		770	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		771
		772	CFClient::UI::harmonize $ws;
		773	CFClient::UI::harmonize $hs;
		774
		775	my $y;
		776
		777	for my $r (0 .. $#{$self->{children}}) {
		778	my $row = $self->{children}[$r]
		779	or next;
		780
613	my $ws = 0;	781	my $x = 0;
614	for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {	782	my $row_h = $hs->[$r];
615	my $c = ($self->{children}->[$yi] || [])->[$col];	783
616	if ($c) {	784	for my $c (0 .. $#$row) {
617	my ($w, $h) = $c->size_request;	785	my $col_w = $ws->[$c];
618	if ($ws < $w) { $ws = $w }	786
		787	if (my $widget = $row->[$c]) {
		788	$widget->size_allocate ($x, $y, $col_w, $row_h);
		789	}
		790
		791	$x += $col_w;
619	}	792	}
		793
		794	$y += $row_h;
620	}	795	}
621	return $ws;	796
622	}	797	}
		798
		799	sub find_widget {
		800	my ($self, $x, $y) = @_;
		801
		802	$x -= $self->{x};
		803	$y -= $self->{y};
		804
		805	my $res;
		806
		807	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		808	$res = $_->find_widget ($x, $y)
		809	and return $res;
		810	}
		811
		812	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		813	}
		814
		815	sub _draw {
		816	my ($self) = @_;
		817
		818	for (grep $_, @{$self->{children}}) {
		819	$_->draw for grep $_, @$_;
		820	}
		821	}
		822
		823	#############################################################################
		824
		825	package CFClient::UI::HBox;
		826
		827	# TODO: wrap into common Box base class
		828
		829	our @ISA = CFClient::UI::Container::;
623		830
624	sub size_request {	831	sub size_request {
625	my ($self) = @_;	832	my ($self) = @_;
626		833
		834	my @alloc = map [$_->size_request], @{$self->{children}};
		835
		836	(
		837	(List::Util::sum map $_->[0], @alloc),
		838	(List::Util::max map $_->[1], @alloc),
		839	)
		840	}
		841
		842	sub size_allocate {
		843	my ($self, $x, $y, $w, $h) = @_;
		844
		845	$self->_size_allocate ($x, $y, $w, $h);
		846
627	my ($hs, $ws) = (0, 0);	847	($h, $w) = ($w, $h);
628		848
629	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	849	my $children = $self->{children};
630	$hs += $self->max_row_height ($yi);
631	}
632		850
633	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	851	my @h = map +($_->size_request)[0], @$children;
634	my $wm = 0;	852
635	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	853	my $req_h = List::Util::sum @h;
636	$wm += $self->max_col_width ($xi)	854
		855	if ($req_h > $h) {
		856	# ah well, not enough space
		857	$_ *= $h / $req_h for @h;
		858	} else {
		859	my $exp = List::Util::sum map $_->{expand}, @$children;
		860	$exp ||= 1;
		861
		862	for (0 .. $#$children) {
		863	my $child = $children->[$_];
		864
		865	my $alloc_h = $h[$_];
		866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		867	$h[$_] = $alloc_h;
637	}	868	}
638	if ($ws < $wm) { $ws = $wm }
639	}	869	}
640		870
641	return ($ws, $hs);	871	CFClient::UI::harmonize \@h;
642	}
643
644	sub _draw {
645	my ($self) = @_;
646		872
647	my $y = 0;	873	my $y = 0;
648	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	874	for (0 .. $#$children) {
		875	my $child = $children->[$_];
649	my $x = 0;	876	my $h = $h[$_];
		877	$child->size_allocate ($y, 0, $h, $w);
650		878
651	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	879	$y += $h;
652
653	my $c = $self->{children}->[$yi]->[$xi];
654	if ($c) {
655	$c->move ($x, $y, 0); #TODO: Move to size_request
656	$c->draw if $c;
657	}
658
659	$x += $self->max_col_width ($xi);
660	}
661
662	$y += $self->max_row_height ($yi);
663	}	880	}
664	}	881	}
665		882
666	#############################################################################	883	#############################################################################
667		884
668	package CFClient::Widget::VBox;	885	package CFClient::UI::VBox;
669		886
		887	# TODO: wrap into common Box base class
		888
670	our @ISA = CFClient::Widget::Container::;	889	our @ISA = CFClient::UI::Container::;
671
672	use SDL::OpenGL;
673		890
674	sub size_request {	891	sub size_request {
675	my ($self) = @_;	892	my ($self) = @_;
676		893
677	my @alloc = map [$_->size_request], @{$self->{children}};	894	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
681	(List::Util::sum map $_->[1], @alloc),	898	(List::Util::sum map $_->[1], @alloc),
682	)	899	)
683	}	900	}
684		901
685	sub size_allocate {	902	sub size_allocate {
686	my ($self, $w, $h) = @_;	903	my ($self, $x, $y, $w, $h) = @_;
687		904
688	return unless $self->{w} != $w || $self->{h} != $h;	905	$self->_size_allocate ($x, $y, $w, $h);
689
690	$self->{w} = $w;
691	$self->{h} = $h;
692
693	return unless $self->{h};
694		906
695	my $children = $self->{children};	907	my $children = $self->{children};
696		908
697	my @h = map +($_->size_request)[1], @$children;	909	my @h = map +($_->size_request)[1], @$children;
698		910
699	my $req_h = List::Util::sum @h;	911	my $req_h = List::Util::sum @h;
700		912
701	if ($req_h > $h) {	913	if ($req_h > $h) {
702	# ah well, not enough space	914	# ah well, not enough space
703	$_ = $h[$_] * $h / $req_h for @h;	915	$_ *= $h / $req_h for @h;
704	} else {	916	} else {
705	my @exp = grep $_->{expand}, @$children;	917	my $exp = List::Util::sum map $_->{expand}, @$children;
706	@exp = @$children unless @exp;	918	$exp ||= 1;
707		919
708	my %exp = map +($_ => 1), @exp;
709
710	for (0 .. $#$children) {	920	for (0 .. $#$children) {
711	my $child = $children->[$_];	921	my $child = $children->[$_];
712		922
713	my $alloc_h = $h[$_];	923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
714	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
715	$h[$_] = $alloc_h;
716	}	924	}
717	}	925	}
		926
		927	CFClient::UI::harmonize \@h;
718		928
719	my $y = 0;	929	my $y = 0;
720	for (0 .. $#$children) {	930	for (0 .. $#$children) {
721	my $child = $children->[$_];	931	my $child = $children->[$_];
722	my $h = $h[$_];	932	my $h = $h[$_];
723	$child->move (0, $y);
724	$child->size_allocate ($w, $h);	933	$child->size_allocate (0, $y, $w, $h);
725		934
726	$y += $h;	935	$y += $h;
727	}	936	}
728	}	937	}
729		938
730	#############################################################################	939	#############################################################################
731		940
732	package CFClient::Widget::Label;	941	package CFClient::UI::Label;
733		942
734	our @ISA = CFClient::Widget::;	943	our @ISA = CFClient::UI::Base::;
735		944
736	use SDL::OpenGL;	945	use SDL::OpenGL;
737		946
738	sub new {	947	sub new {
739	my ($class, %arg) = @_;	948	my ($class, %arg) = @_;
740		949
741	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
742	fg => [1, 1, 1],	951	fg => [1, 1, 1],
743	height => $::FONTSIZE,	952	fontsize => $::FONTSIZE,
744	text => "",	953	text => "",
		954	align => -1,
		955	padding => 2,
745	layout => new CFClient::Layout,	956	layout => new CFClient::Layout,
746	%arg	957	%arg
747	);	958	);
748		959
749	$self->set_text ($self->{text});	960	$self->set_text ($self->{text});
750		961
…		…
766		977
767	$self->{text} = $text;	978	$self->{text} = $text;
768	$self->{layout}->set_markup ($text);	979	$self->{layout}->set_markup ($text);
769		980
770	delete $self->{texture};	981	delete $self->{texture};
		982	# $self->{w} = $self->{h} = -1;
771	$self->update;	983	$self->update;
772	}	984	}
773		985
774	sub get_text {	986	sub get_text {
775	my ($self, $text) = @_;	987	my ($self, $text) = @_;
…		…
779		991
780	sub size_request {	992	sub size_request {
781	my ($self) = @_;	993	my ($self) = @_;
782		994
783	$self->{layout}->set_width;	995	$self->{layout}->set_width;
784	$self->{layout}->set_height ($self->{height});	996	$self->{layout}->set_height ($self->{fontsize});
785	$self->{layout}->size	997	my ($w, $h) = $self->{layout}->size;
786	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack	998
787	# (	999	(
788	# $self->{texture}{width},	1000	$w + $self->{padding} * 2,
789	# $self->{texture}{height},	1001	$h + $self->{padding} * 2,
790	# )	1002	)
791	# } else {
792	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793	#
794	# ($w, $h)
795	# }
796	}	1003	}
797		1004
798	sub size_allocate {	1005	sub size_allocate {
799	my ($self, $w, $h) = @_;	1006	my ($self, $x, $y, $w, $h) = @_;
800		1007
801	return unless $self->{w} != $w || $self->{h} != $h;	1008	$self->_size_allocate ($x, $y, $w, $h) or return;
802		1009
803	$self->SUPER::size_allocate ($w, $h);
804	delete $self->{texture};	1010	delete $self->{texture};
805	}	1011	}
806		1012
807	sub update {	1013	sub update {
808	my ($self) = @_;	1014	my ($self) = @_;
…		…
814	sub _draw {	1020	sub _draw {
815	my ($self) = @_;	1021	my ($self) = @_;
816		1022
817	my $tex = $self->{texture} ||= do {	1023	my $tex = $self->{texture} ||= do {
818	$self->{layout}->set_width ($self->{w});	1024	$self->{layout}->set_width ($self->{w});
		1025	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
819	new_from_layout CFClient::Texture $self->{layout};	1026	new_from_layout CFClient::Texture $self->{layout}
820	};	1027	};
821		1028
822	glEnable GL_BLEND;	1029	glEnable GL_BLEND;
		1030	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
823	glEnable GL_TEXTURE_2D;	1031	glEnable GL_TEXTURE_2D;
824	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
826		1033
827	glColor @{$self->{fg}};	1034	glColor @{$self->{fg}};
828		1035
829	$tex->draw_quad (0, 0);	1036	my $x =
		1037	$self->{align} < 0 ? $self->{padding}
		1038	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1039	: ($self->{w} - $tex->{w}) * 0.5;
830		1040
		1041	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
		1042
		1043	glDisable GL_TEXTURE_2D;
831	glDisable GL_BLEND;	1044	glDisable GL_BLEND;
832	glDisable GL_TEXTURE_2D;
833	}	1045	}
834		1046
835	#############################################################################	1047	#############################################################################
836		1048
837	package CFClient::Widget::Entry;	1049	package CFClient::UI::Entry;
838		1050
839	our @ISA = CFClient::Widget::Label::;	1051	our @ISA = CFClient::UI::Label::;
840		1052
841	use SDL;	1053	use SDL;
842	use SDL::OpenGL;	1054	use SDL::OpenGL;
843		1055
844	sub new {	1056	sub new {
845	my $class = shift;	1057	my $class = shift;
846		1058
847	$class->SUPER::new (	1059	$class->SUPER::new (
848	fg => [1, 1, 1],	1060	fg => [1, 1, 1],
849	bg => [0, 0, 0, 0.4],	1061	bg => [0, 0, 0, 0.2],
850	active_bg => [1, 1, 1],	1062	active_bg => [1, 1, 1, 0.5],
851	active_fg => [0, 0, 0],	1063	active_fg => [0, 0, 0],
		1064	can_hover => 1,
		1065	can_focus => 1,
852	@_	1066	@_
853	)	1067	)
854	}	1068	}
855		1069
856	sub _set_text {	1070	sub _set_text {
857	my ($self, $text) = @_;	1071	my ($self, $text) = @_;
858		1072
		1073	my $old_text = $self->{text};
		1074
859	$self->{last_activity} = $::NOW;	1075	$self->{last_activity} = $::NOW;
860		1076
861	$self->{text} = $text;	1077	$self->{text} = $text;
862	$self->{layout}->set_width ($self->{w});	1078	$self->{layout}->set_width ($self->{w});
		1079	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
		1080
		1081	$text =~ s/./*/g if $self->{hidden};
		1082
863	$self->{layout}->set_markup ($self->escape_text ($text));	1083	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
864		1084
865	$text = substr $text, 0, $self->{cursor};	1085	$text = substr $text, 0, $self->{cursor};
866	utf8::encode $text;	1086	utf8::encode $text;
867		1087
868	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1088	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1089
		1090	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1091	if $old_text ne $self->{text};
869	}	1092	}
870		1093
871	sub size_request {	1094	sub size_request {
872	my ($self) = @_;	1095	my ($self) = @_;
873		1096
…		…
875		1098
876	($w + 1, $h) # add 1 for cursor	1099	($w + 1, $h) # add 1 for cursor
877	}	1100	}
878		1101
879	sub size_allocate {	1102	sub size_allocate {
880	my ($self, $w, $h) = @_;	1103	my ($self, $x, $y, $w, $h) = @_;
881		1104
882	return unless $self->{w} != $w || $self->{h} != $h;
883
884	$self->SUPER::size_allocate ($w, $h);	1105	$self->SUPER::size_allocate ($x, $y, $w, $h);
885		1106
886	$self->_set_text ($self->{text});	1107	$self->_set_text ($self->{text});
887	}	1108	}
888		1109
889	sub set_text {	1110	sub set_text {
…		…
910	substr $text, $self->{cursor}, 1, "";	1131	substr $text, $self->{cursor}, 1, "";
911	} elsif ($sym == SDLK_LEFT) {	1132	} elsif ($sym == SDLK_LEFT) {
912	--$self->{cursor} if $self->{cursor};	1133	--$self->{cursor} if $self->{cursor};
913	} elsif ($sym == SDLK_RIGHT) {	1134	} elsif ($sym == SDLK_RIGHT) {
914	++$self->{cursor} if $self->{cursor} < length $self->{text};	1135	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1136	} elsif ($sym == SDLK_HOME) {
		1137	$self->{cursor} = 0;
		1138	} elsif ($sym == SDLK_END) {
		1139	$self->{cursor} = length $text;
		1140	} elsif ($sym == SDLK_ESCAPE) {
		1141	$self->emit ('escape');
915	} elsif ($uni) {	1142	} elsif ($uni) {
916	substr $text, $self->{cursor}++, 0, chr $uni;	1143	substr $text, $self->{cursor}++, 0, chr $uni;
917	}	1144	}
918		1145
919	$self->_set_text ($text);	1146	$self->_set_text ($text);
…		…
934	$self->SUPER::button_down ($ev, $x, $y);	1161	$self->SUPER::button_down ($ev, $x, $y);
935		1162
936	my $idx = $self->{layout}->xy_to_index ($x, $y);	1163	my $idx = $self->{layout}->xy_to_index ($x, $y);
937		1164
938	# byte-index to char-index	1165	# byte-index to char-index
939	my $text = $self->{layout};	1166	my $text = $self->{text};
940	utf8::encode $text;	1167	utf8::encode $text;
941	$self->{cursor} = length substr $text, 0, $idx;	1168	$self->{cursor} = length substr $text, 0, $idx;
942		1169
943	$self->_set_text ($self->{text});	1170	$self->_set_text ($self->{text});
944	$self->update;	1171	$self->update;
…		…
959	$self->{fg} = $self->{active_fg};	1186	$self->{fg} = $self->{active_fg};
960	} else {	1187	} else {
961	glColor @{$self->{bg}};	1188	glColor @{$self->{bg}};
962	}	1189	}
963		1190
		1191	glEnable GL_BLEND;
		1192	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
964	glBegin GL_QUADS;	1193	glBegin GL_QUADS;
965	glVertex 0 , 0;	1194	glVertex 0 , 0;
966	glVertex 0 , $self->{h};	1195	glVertex 0 , $self->{h};
967	glVertex $self->{w}, $self->{h};	1196	glVertex $self->{w}, $self->{h};
968	glVertex $self->{w}, 0;	1197	glVertex $self->{w}, 0;
969	glEnd;	1198	glEnd;
		1199	glDisable GL_BLEND;
970		1200
971	$self->SUPER::_draw;	1201	$self->SUPER::_draw;
972		1202
973	#TODO: force update every cursor change :(	1203	#TODO: force update every cursor change :(
974	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1204	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
…		…
978	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1208	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979	glEnd;	1209	glEnd;
980	}	1210	}
981	}	1211	}
982		1212
983	#############################################################################	1213	package CFClient::UI::LineEntry;
984		1214
985	package CFClient::Widget::Slider;	1215	our @ISA = CFClient::UI::Entry::;
986		1216
987	use strict;	1217	use SDL;
988
989	use SDL::OpenGL;	1218	use SDL::OpenGL;
990	use SDL::OpenGL::Constants;
991		1219
992	our @ISA = CFClient::Widget::DrawBG::;	1220	sub key_down {
993
994	sub size_request {
995	my ($self) = @_;	1221	my ($self, $ev) = @_;
996		1222
997	my $w = 20;	1223	my $sym = $ev->key_sym;
998	my $h = 10;
999		1224
1000	$self->{vertical} ? ($h, $w) : ($w, $h)	1225	if ($sym == SDLK_RETURN) {
		1226	$self->emit (activate => $self->get_text);
		1227	$self->update;
		1228
		1229	} else {
		1230	$self->SUPER::key_down ($ev);
		1231	}
		1232
1001	}	1233	}
		1234
		1235	#############################################################################
		1236
		1237	package CFClient::UI::Button;
		1238
		1239	our @ISA = CFClient::UI::Label::;
		1240
		1241	use SDL;
		1242	use SDL::OpenGL;
		1243
		1244	my @tex =
		1245	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1246	qw(b1_button_active.png);
1002		1247
1003	sub new {	1248	sub new {
1004	my $class = shift;	1249	my $class = shift;
1005		1250
		1251	$class->SUPER::new (
		1252	padding => 4,
		1253	fg => [1, 1, 1],
		1254	bg => [1, 1, 1, 0.2],
		1255	active_fg => [1, 1, 0],
		1256	can_hover => 1,
		1257	@_
		1258	)
		1259	}
		1260
		1261	sub button_up {
		1262	my ($self, $ev, $x, $y) = @_;
		1263
		1264	if ($x >= 0 && $x < $self->{w}
		1265	&& $y >= 0 && $y < $self->{h}) {
		1266	$self->emit ("activate");
		1267	}
		1268	}
		1269
		1270	sub _draw {
		1271	my ($self) = @_;
		1272
		1273	local $self->{fg} = $self->{fg};
		1274	my $tex = $tex[0];
		1275
		1276	glEnable GL_BLEND;
		1277	glEnable GL_TEXTURE_2D;
		1278	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1279
		1280	if ($GRAB == $self) {
		1281	$self->{fg} = $self->{active_fg};
		1282	}
		1283
		1284	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1285	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1286
		1287	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		1288
		1289	glDisable GL_TEXTURE_2D;
		1290	glDisable GL_BLEND;
		1291
		1292	$self->SUPER::_draw;
		1293	}
		1294
		1295	#############################################################################
		1296
		1297	package CFClient::UI::CheckBox;
		1298
		1299	our @ISA = CFClient::UI::DrawBG::;
		1300
		1301	my @tex =
		1302	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1303	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1304
		1305	use SDL;
		1306	use SDL::OpenGL;
		1307
		1308	sub new {
		1309	my $class = shift;
		1310
		1311	$class->SUPER::new (
		1312	padding => 2,
		1313	fg => [1, 1, 1],
		1314	active_fg => [1, 1, 0],
		1315	state => 0,
		1316	can_hover => 1,
		1317	@_
		1318	)
		1319	}
		1320
		1321	sub size_request {
		1322	my ($self) = @_;
		1323
		1324	($self->{padding} * 2 + 6) x 2
		1325	}
		1326
		1327	sub size_allocate {
		1328	my ($self, $x, $y, $w, $h) = @_;
		1329
		1330	$self->_size_allocate ($x, $y, $w, $h);
		1331	}
		1332
		1333	sub button_down {
		1334	my ($self, $ev, $x, $y) = @_;
		1335
		1336	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1337	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1338	$self->{state} = !$self->{state};
		1339	$self->emit (changed => $self->{state});
		1340	}
		1341	}
		1342
		1343	sub _draw {
		1344	my ($self) = @_;
		1345
		1346	$self->SUPER::_draw;
		1347
		1348	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1349
		1350	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1351
		1352	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1353
		1354	glEnable GL_BLEND;
		1355	glEnable GL_TEXTURE_2D;
		1356	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1357
		1358	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1359
		1360	$tex->draw_quad (0, 0, $s, $s);
		1361
		1362	glDisable GL_TEXTURE_2D;
		1363	glDisable GL_BLEND;
		1364	}
		1365
		1366	#############################################################################
		1367
		1368	package CFClient::UI::Slider;
		1369
		1370	use strict;
		1371
		1372	use SDL::OpenGL;
		1373
		1374	our @ISA = CFClient::UI::DrawBG::;
		1375
		1376	my @tex =
		1377	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1378	qw(s1_slider.png s1_slider_bg.png);
		1379
		1380	sub new {
		1381	my $class = shift;
		1382
1006	# range [value, low, high, page]	1383	# range [value, low, high, page]
1007		1384
		1385	# TODO: 0-width page
		1386	# TODO: req_w/h are wrong with vertical
		1387	# TODO: calculations are off
1008	$class->SUPER::new (	1388	my $self = $class->SUPER::new (
1009	fg => [1, 1, 1],	1389	fg => [1, 1, 1],
1010	active_fg => [0, 0, 0],	1390	active_fg => [0, 0, 0],
1011	range => [0, 0, 100, 10],	1391	range => [0, 0, 100, 10],
		1392	req_w => 40,
		1393	req_h => 13,
1012	vertical => 0,	1394	vertical => 0,
		1395	can_hover => 1,
		1396	inner_pad => 5,
1013	@_	1397	@_
1014	)	1398	);
		1399
		1400	$self
		1401	}
		1402
		1403	sub size_request {
		1404	my ($self) = @_;
		1405
		1406	my $w = $self->{req_w};
		1407	my $h = $self->{req_h};
		1408
		1409	$self->{vertical} ? ($h, $w) : ($w, $h)
1015	}	1410	}
1016		1411
1017	sub button_down {	1412	sub button_down {
1018	my ($self, $ev, $x, $y) = @_;	1413	my ($self, $ev, $x, $y) = @_;
1019		1414
…		…
1025	my ($self, $ev, $x, $y) = @_;	1420	my ($self, $ev, $x, $y) = @_;
1026		1421
1027	if ($GRAB == $self) {	1422	if ($GRAB == $self) {
1028	my ($value, $lo, $hi, $page) = @{$self->{range}};	1423	my ($value, $lo, $hi, $page) = @{$self->{range}};
1029		1424
		1425	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1426
		1427	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1428	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1429
		1430	$x -= $inner_pad_px; # substract the padding
1030	$x = $x * ($hi - $lo) / $self->{w} + $lo;	1431	$x = $x * ($hi - $lo) / $inner_w + $lo;
1031	$x = $lo if $x < $lo;	1432	$x = $lo if $x < $lo;
1032	$x = $hi - $page if $x > $hi - $page;	1433	$x = $hi - $page if $x > $hi - $page;
1033	$self->{range}[0] = $x;	1434	$self->{range}[0] = $x;
1034		1435
1035	$self->{changed}($x) if $self->{changed};	1436	$self->emit (changed => $x);
1036	$self->update;	1437	$self->update;
1037	}	1438	}
1038	}	1439	}
1039		1440
		1441	# the inner_* stuff is for generating a padding for the slider handle,
		1442	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1443	# correct propably, but it does the job for now
		1444	sub _calc_inner_pad_px {
		1445	my ($self, $w) = @_;
		1446	($w / 100) * $self->{inner_pad} # % to pixels
		1447	}
		1448
1040	sub _draw {	1449	sub _draw {
1041	my ($self) = @_;	1450	my ($self) = @_;
1042		1451
1043	$self->SUPER::_draw ();	1452	$self->SUPER::_draw ();
1044
1045	glPushMatrix;
1046		1453
1047	my ($w, $h) = @$self{qw(w h)};	1454	my ($w, $h) = @$self{qw(w h)};
1048		1455
1049	if ($self->{vertical}) {	1456	if ($self->{vertical}) {
1050	# draw a vertical slider like a rotated horizontal slider	1457	# draw a vertical slider like a rotated horizontal slider
1051		1458
1052	glTranslate 0, $self->{w};
1053	glRotate 90, 0, 0, 1;	1459	glRotate 90, 0, 0, 1;
		1460	glTranslate 0, -$self->{w}, 0;
1054		1461
1055	($w, $h) = ($h, $w);	1462	($w, $h) = ($h, $w);
1056	}	1463	}
1057		1464
1058	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1465	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1466	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060		1467
1061	my ($value, $lo, $hi, $page) = @{$self->{range}};	1468	my ($value, $lo, $hi, $page) = @{$self->{range}};
1062		1469
		1470	$hi = $value + 1 if $lo == $hi;
		1471
		1472	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1473	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1474
1063	$page = int $page * $w / ($hi - $lo);	1475	$page = int $page * $inner_w / ($hi - $lo);
1064	$value = int +($value - $lo) * $w / ($hi - $lo);	1476	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1065		1477
1066	$w -= $page;	1478	$w -= $page;
1067	$page &= ~1;	1479	$page &= ~1;
1068	glTranslate $page * 0.5, 0, 0;	1480	glTranslate $page * 0.5, 0, 0;
		1481	$page ||= 2;
1069		1482
1070	glColor @$fg;
1071	glBegin GL_LINES;
1072	glVertex 0, 0; glVertex 0, $h;
1073	glVertex $w - 1, 0; glVertex $w - 1, $h;
1074	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075	glEnd;
1076
1077	my $knob_a = $value - $page * 0.5;	1483	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1078	my $knob_b = $value + $page * 0.5;	1484	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1079		1485
1080	glBegin GL_QUADS;	1486	glEnable GL_BLEND;
1081	glColor @$fg;	1487	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1082	glVertex $knob_a, 0;	1488	glEnable GL_TEXTURE_2D;
1083	glVertex $knob_a, $h;	1489	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1084	glVertex $knob_b, $h;
1085	glVertex $knob_b, 0;
1086		1490
1087	if ($knob_a < $knob_b - 2) {	1491	# draw background
1088	glColor @$bg;	1492	$tex[1]->draw_quad (0, 0, $w, $h);
1089	glVertex $knob_a + 1, 1;	1493
1090	glVertex $knob_a + 1, $h - 1;	1494	# draw handle
1091	glVertex $knob_b - 1, $h - 1;	1495	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1092	glVertex $knob_b - 1, 1;	1496
		1497	glDisable GL_BLEND;
		1498	glDisable GL_TEXTURE_2D;
		1499	}
		1500
		1501	#############################################################################
		1502
		1503	package CFClient::UI::TextView;
		1504
		1505	our @ISA = CFClient::UI::HBox::;
		1506
		1507	use SDL::OpenGL;
		1508
		1509	sub new {
		1510	my $class = shift;
		1511
		1512	my $self = $class->SUPER::new (
		1513	req_w => $::WIDTH / 6,
		1514	req_h => $::HEIGHT / 6,
		1515	fontsize => $::FONTSIZE,
		1516	@_,
		1517
		1518	layout => (new CFClient::Layout),
		1519	par => [],
		1520	height => 0,
		1521	children => [
		1522	(new CFClient::UI::Empty expand => 1),
		1523	(new CFClient::UI::Slider vertical => 1),
		1524	],
		1525	);
		1526
		1527	$self->{children}[1]->connect (changed => sub {
		1528	$self->update;
		1529	});
		1530
		1531	$self
		1532	}
		1533
		1534	sub set_fontsize {
		1535	my ($self, $fontsize) = @_;
		1536
		1537	$self->{fontsize} = $fontsize;
		1538	$self->reflow;
		1539	}
		1540
		1541	sub text_height {
		1542	my ($self, $text) = @_;
		1543
		1544	my $layout = $self->{layout};
		1545
		1546	$layout->set_height ($self->{fontsize});
		1547	$layout->set_width ($self->{w});
		1548	$layout->set_text ($text);
1093	}	1549
1094	glEnd;	1550	($layout->size)[1]
1095
1096	glPopMatrix;
1097	}	1551	}
1098		1552
1099	#############################################################################	1553	sub reflow {
		1554	my ($self) = @_;
1100		1555
		1556	$self->{need_reflow}++;
		1557	$self->update;
		1558	}
		1559
		1560	sub size_request {
		1561	my ($self) = @_;
		1562
		1563	($self->{req_w}, $self->{req_h})
		1564	}
		1565
		1566	sub size_allocate {
		1567	my ($self, $x, $y, $w, $h) = @_;
		1568
		1569	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1570
		1571	$self->{layout}->set_height ($self->{fontsize});
		1572	$self->{layout}->set_width ($self->{w});
		1573
		1574	$self->reflow;
		1575	}
		1576
		1577	sub add_paragraph {
		1578	my ($self, $color, $text) = @_;
		1579
		1580	#TODO: intelligently "reformat" paragraph
		1581
		1582	my $height = $self->text_height ($text);
		1583
		1584	$self->{height} += $height;
		1585
		1586	push @{$self->{par}}, [$height, $color, $text];
		1587
		1588	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1589	$self->{children}[1]->update;
		1590	}
		1591
		1592	sub update {
		1593	my ($self) = @_;
		1594
		1595	$self->SUPER::update;
		1596
		1597	return unless $self->{h} > 0;
		1598
		1599	delete $self->{texture};
		1600
		1601	$ROOT->on_refresh ($self, sub {
		1602	if (delete $self->{need_reflow}) {
		1603	my $height = 0;
		1604
		1605	$height += $_->[0] = $self->text_height ($_->[2])
		1606	for @{$self->{par}};
		1607
		1608	$self->{height} = $height;
		1609
		1610	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1611
		1612	delete $self->{texture};
		1613	}
		1614
		1615	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1616	glClearColor 0, 0, 0, 1;
		1617	glClear GL_COLOR_BUFFER_BIT;
		1618
		1619	glEnable GL_BLEND;
		1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1621	glEnable GL_TEXTURE_2D;
		1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1623
		1624	my $top = int $self->{children}[1]{range}[0];
		1625
		1626	my $y0 = $top;
		1627	my $y1 = $top + $self->{h};
		1628
		1629	my $y = 0;
		1630
		1631	my $layout = $self->{layout};
		1632
		1633	for my $par (@{$self->{par}}) {
		1634	my $h = $par->[0];
		1635
		1636	if ($y0 < $y + $h && $y < $y1) {
		1637	$layout->set_text ($par->[2]);
		1638
		1639	glColor @{ $par->[1] };
		1640	my ($W, $H) = $layout->size;
		1641	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1642	}
		1643
		1644	$y += $h;
		1645	}
		1646
		1647	glDisable GL_TEXTURE_2D;
		1648	glDisable GL_BLEND;
		1649	};
		1650	});
		1651	}
		1652
		1653	sub _draw {
		1654	my ($self) = @_;
		1655
		1656	if ($self->{texture}) {
		1657	glEnable GL_TEXTURE_2D;
		1658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1659	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1660	glDisable GL_TEXTURE_2D;
		1661	}
		1662
		1663	$self->{children}[1]->draw;
		1664
		1665	}
		1666
		1667	#############################################################################
		1668
1101	package CFClient::Widget::MapWidget;	1669	package CFClient::UI::MapWidget;
1102		1670
1103	use strict;	1671	use strict;
1104		1672
1105	use List::Util qw(min max);	1673	use List::Util qw(min max);
1106		1674
1107	use SDL;	1675	use SDL;
1108	use SDL::OpenGL;	1676	use SDL::OpenGL;
1109	use SDL::OpenGL::Constants;
1110		1677
1111	our @ISA = CFClient::Widget::;	1678	our @ISA = CFClient::UI::Base::;
1112		1679
1113	sub new {	1680	sub new {
1114	my $class = shift;	1681	my $class = shift;
1115		1682
1116	$class->SUPER::new (	1683	$class->SUPER::new (
1117	z => -1,	1684	z => -1,
		1685	can_focus => 1,
1118	list => (glGenLists 1),	1686	list => (glGenLists 1),
1119	@_	1687	@_
1120	)	1688	)
1121	}	1689	}
1122		1690
1123	sub key_down {	1691	sub key_down {
…		…
1125	}	1693	}
1126		1694
1127	sub key_up {	1695	sub key_up {
1128	}	1696	}
1129		1697
		1698	sub button_down {
		1699	my ($self, $ev, $x, $y) = @_;
		1700
		1701	$self->focus_in;
		1702
		1703	if ($ev->button == 2) {
		1704	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1705	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1706
		1707	$self->{motion} = sub {
		1708	my ($ev, $x, $y) = @_;
		1709
		1710	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1711
		1712	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1713	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1714
		1715	$self->update;
		1716	};
		1717	}
		1718	}
		1719
		1720	sub button_up {
		1721	my ($self, $ev, $x, $y) = @_;
		1722
		1723	delete $self->{motion};
		1724	}
		1725
		1726	sub mouse_motion {
		1727	my ($self, $ev, $x, $y) = @_;
		1728
		1729	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1730	}
		1731
1130	sub size_request {	1732	sub size_request {
1131	(	1733	(
1132	1 + int $::WIDTH / 32,	1734	1 + 32 * int $::WIDTH / 32,
1133	1 + int $::HEIGHT / 32,	1735	1 + 32 * int $::HEIGHT / 32,
1134	)	1736	)
1135	}	1737	}
1136		1738
1137	sub update {	1739	sub update {
1138	my ($self) = @_;	1740	my ($self) = @_;
1139		1741
1140	$self->{need_update} = 1;	1742	$self->{need_update} = 1;
		1743	$self->SUPER::update;
1141	}	1744	}
1142		1745
1143	sub _draw {	1746	sub draw {
1144	my ($self) = @_;	1747	my ($self) = @_;
1145		1748
1146	if (delete $self->{need_update}) {	1749	if (delete $self->{need_update}) {
1147	glNewList $self->{list}, GL_COMPILE;	1750	glNewList $self->{list}, GL_COMPILE;
1148		1751
1149	my $mx = $::CONN->{mapx};	1752	if ($::MAP) {
1150	my $my = $::CONN->{mapy};
1151
1152	my $map = $::CONN->{map};
1153
1154	my ($xofs, $yofs);
1155
1156	my $sw = 1 + int $::WIDTH / 32;	1753	my $sw = int $::WIDTH / 32;
1157	my $sh = 1 + int $::HEIGHT / 32;	1754	my $sh = int $::HEIGHT / 32;
1158		1755
1159	if ($::CONN->{mapw} > $sw) {	1756	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1160	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1757	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1161	} else {	1758
1162	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1759	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1760
		1761	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1762
		1763	if ($::CFG->{fow_enable}) {
		1764	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1765	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1766	glConvolutionFilter2D
		1767	GL_CONVOLUTION_2D,
		1768	GL_ALPHA,
		1769	3, 3,
		1770	GL_ALPHA, GL_FLOAT,
		1771	pack "f*",
		1772	0.1, 0.1, 0.1,
		1773	0.1, 0.2, 0.1,
		1774	0.1, 0.1, 0.1,
		1775	;
		1776	glEnable GL_CONVOLUTION_2D;
		1777	}
		1778
		1779	my $tex = new CFClient::Texture
		1780	w => $w,
		1781	h => $h,
		1782	data => $data,
		1783	internalformat => GL_ALPHA,
		1784	format => GL_ALPHA;
		1785
		1786	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1787
		1788	glEnable GL_BLEND;
		1789	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1790	glEnable GL_TEXTURE_2D;
		1791	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1792
		1793	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1794	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1795
		1796	glDisable GL_TEXTURE_2D;
		1797	glDisable GL_BLEND;
		1798	}
		1799
		1800	# HACK BEGIN
		1801	{
		1802	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1803	my ($w, $h) = (250, 250);
		1804
		1805	glEnable GL_BLEND;
		1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1807	glEnable GL_TEXTURE_2D;
		1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1809
		1810	CFClient::Texture->new (
		1811	w => $w,
		1812	h => $h,
		1813	data => $::MAP->mapmap ($w, $h),
		1814	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1815	)->draw_quad (100, 100);
		1816
		1817	glDisable GL_TEXTURE_2D;
		1818	glDisable GL_BLEND;
		1819	}
		1820	# HACK END
1163	}	1821	}
1164		1822
1165	if ($::CONN->{maph} > $sh) {
1166	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1167	} else {
1168	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1169	}
1170
1171	glEnable GL_TEXTURE_2D;
1172	glEnable GL_BLEND;
1173	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1174
1175	my $sw4 = ($sw + 3) & ~3;
1176	my $darkness = "\x00" x ($sw4 * $sh);
1177
1178	for my $x (0 .. $sw - 1) {
1179	my $row = $map->[$x + $xofs];
1180	for my $y (0 .. $sh - 1) {
1181
1182	my $cell = $row->[$y + $yofs]
1183	or next;
1184
1185	my $dark = $cell->[0];
1186	if ($dark < 0) {
1187	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188	} else {
1189	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1190	}
1191
1192	for my $num (grep $_, @$cell[1,2,3]) {
1193	my $tex = $::CONN->{face}[$num]{texture} || next;
1194
1195	my $w = $tex->{width};
1196	my $h = $tex->{height};
1197
1198	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1199	}
1200	}
1201	}
1202
1203	# if (1) { # higher quality darkness
1204	# $lighting =~ s/(.)/$1$1$1/gs;
1205	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1206	#
1207	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1208	#
1209	# $lighting = $pb->get_pixels;
1210	# $lighting =~ s/(.)../$1/gs;
1211	# }
1212
1213	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215
1216	$darkness = new CFClient::Texture
1217	width => $sw4,
1218	height => $sh,
1219	data => $darkness,
1220	internalformat => GL_ALPHA,
1221	format => GL_ALPHA;
1222
1223	glColor 0.45, 0.45, 0.45, 1;
1224	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
1226	glDisable GL_TEXTURE_2D;
1227	glDisable GL_BLEND;
1228
1229	glEndList;	1823	glEndList;
1230	}	1824	}
1231		1825
		1826	glPushMatrix;
1232	glCallList $self->{list};	1827	glCallList $self->{list};
		1828	glPopMatrix;
		1829
		1830	if ($FOCUS != $self) {
		1831	glColor 64/255, 64/255, 64/255;
		1832	glLogicOp GL_AND;
		1833	glEnable GL_COLOR_LOGIC_OP;
		1834	glBegin GL_QUADS;
		1835	glVertex 0, 0;
		1836	glVertex 0, $::HEIGHT;
		1837	glVertex $::WIDTH, $::HEIGHT;
		1838	glVertex $::WIDTH, 0;
		1839	glEnd;
		1840	glDisable GL_COLOR_LOGIC_OP;
		1841	}
1233	}	1842	}
1234		1843
1235	my %DIR = (	1844	my %DIR = (
1236	SDLK_KP8, [1, "north"],	1845	SDLK_KP8, [1, "north"],
1237	SDLK_KP9, [2, "northeast"],	1846	SDLK_KP9, [2, "northeast"],
…		…
1253		1862
1254	my $mod = $ev->key_mod;	1863	my $mod = $ev->key_mod;
1255	my $sym = $ev->key_sym;	1864	my $sym = $ev->key_sym;
1256		1865
1257	if ($sym == SDLK_KP5) {	1866	if ($sym == SDLK_KP5) {
1258	$::CONN->send ("command stay fire");	1867	$::CONN->user_send ("command stay fire");
		1868	} elsif ($sym == SDLK_a) {
		1869	$::CONN->user_send ("command apply");
		1870	} elsif ($sym == SDLK_QUOTE) {
		1871	$self->emit ('activate_console');
		1872	} elsif ($sym == SDLK_SLASH) {
		1873	$self->emit ('activate_console' => '/');
1259	} elsif (exists $DIR{$sym}) {	1874	} elsif (exists $DIR{$sym}) {
1260	if ($mod & KMOD_SHIFT) {	1875	if ($mod & KMOD_SHIFT) {
1261	$self->{shft}++;	1876	$self->{shft}++;
1262	$::CONN->send ("command fire $DIR{$sym}[0]");	1877	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1263	} elsif ($mod & KMOD_CTRL) {	1878	} elsif ($mod & KMOD_CTRL) {
1264	$self->{ctrl}++;	1879	$self->{ctrl}++;
1265	$::CONN->send ("command run $DIR{$sym}[0]");	1880	$::CONN->user_send ("command run $DIR{$sym}[0]");
1266	} else {	1881	} else {
1267	$::CONN->send ("command $DIR{$sym}[1]");	1882	$::CONN->user_send ("command $DIR{$sym}[1]");
1268	}	1883	}
1269	}	1884	}
1270	}	1885	}
1271		1886
1272	sub key_up {	1887	sub key_up {
…		…
1274		1889
1275	my $mod = $ev->key_mod;	1890	my $mod = $ev->key_mod;
1276	my $sym = $ev->key_sym;	1891	my $sym = $ev->key_sym;
1277		1892
1278	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1893	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1279	$::CONN->send ("command fire_stop");	1894	$::CONN->user_send ("command fire_stop");
1280	}	1895	}
1281	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1896	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1282	$::CONN->send ("command run_stop");	1897	$::CONN->user_send ("command run_stop");
1283	}	1898	}
1284	}	1899	}
1285		1900
1286	#############################################################################	1901	#############################################################################
1287		1902
1288	package CFClient::Widget::Animator;	1903	package CFClient::UI::Animator;
1289		1904
1290	use SDL::OpenGL;	1905	use SDL::OpenGL;
1291		1906
1292	our @ISA = CFClient::Widget::Bin::;	1907	our @ISA = CFClient::UI::Bin::;
1293		1908
1294	sub moveto {	1909	sub moveto {
1295	my ($self, $x, $y) = @_;	1910	my ($self, $x, $y) = @_;
1296		1911
1297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1912	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
1325	glPopMatrix;	1940	glPopMatrix;
1326	}	1941	}
1327		1942
1328	#############################################################################	1943	#############################################################################
1329		1944
1330	package CFClient::Widget::Toplevel;	1945	package CFClient::UI::Flopper;
1331		1946
		1947	our @ISA = CFClient::UI::Button::;
		1948
		1949	sub new {
		1950	my $class = shift;
		1951
		1952	my $self = $class->SUPER::new (
		1953	state => 0,
		1954	connect_activate => \&toggle_flopper,
		1955	@_
		1956	);
		1957
		1958	if ($self->{state}) {
		1959	$self->{state} = 0;
		1960	$self->toggle_flopper;
		1961	}
		1962
		1963	$self
		1964	}
		1965
		1966	sub toggle_flopper {
		1967	my ($self) = @_;
		1968
		1969	# TODO: use animation
		1970	if ($self->{state} = !$self->{state}) {
		1971	$CFClient::UI::ROOT->add ($self->{other});
		1972	$self->{other}->move ($self->coord2global (0, $self->{h}));
		1973	$self->emit ("open");
		1974	} else {
		1975	$CFClient::UI::ROOT->remove ($self->{other});
		1976	$self->emit ("close");
		1977	}
		1978
		1979	$self->emit (changed => $self->{state});
		1980	}
		1981
		1982	#############################################################################
		1983
		1984	package CFClient::UI::Root;
		1985
1332	our @ISA = CFClient::Widget::Container::;	1986	our @ISA = CFClient::UI::Container::;
		1987
		1988	use SDL::OpenGL;
1333		1989
1334	sub size_request {	1990	sub size_request {
1335	($::WIDTH, $::HEIGHT)	1991	($::WIDTH, $::HEIGHT)
1336	}	1992	}
1337		1993
1338	sub size_allocate {	1994	sub size_allocate {
1339	my ($self, $w, $h) = @_;	1995	my ($self, $x, $y, $w, $h) = @_;
1340		1996
1341	$self->SUPER::size_allocate ($w, $h);	1997	$self->_size_allocate ($x, $y, $w, $h);
1342		1998
1343	$_->size_allocate ($_->size_request)	1999	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1344	for @{$self->{children}};	2000	for @{$self->{children}};
1345	}	2001	}
1346		2002
1347	sub translate {	2003	sub _topleft {
1348	my ($self, $x, $y) = @_;	2004	my ($self, $x, $y) = @_;
1349		2005
1350	($x, $y)	2006	($x, $y)
1351	}	2007	}
1352		2008
1353	sub update {	2009	sub update {
1354	my ($self) = @_;	2010	my ($self) = @_;
1355		2011
1356	$self->size_allocate ($self->size_request);	2012	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1357	::refresh ();	2013	::refresh ();
1358	}	2014	}
1359		2015
1360	sub add {	2016	sub add {
1361	my ($self, $widget) = @_;	2017	my ($self, $widget) = @_;
1362		2018
1363	$self->SUPER::add ($widget);	2019	$self->SUPER::add ($widget);
1364		2020
1365	$widget->size_allocate ($widget->size_request);	2021	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
		2022	}
		2023
		2024	sub on_refresh {
		2025	my ($self, $id, $cb) = @_;
		2026
		2027	$self->{refresh_hook}{$id} = $cb;
1366	}	2028	}
1367		2029
1368	sub draw {	2030	sub draw {
1369	my ($self) = @_;	2031	my ($self) = @_;
1370		2032
		2033	while (my $rcb = delete $self->{refresh_hook}) {
		2034	$_->() for values %$rcb;
		2035	}
		2036
		2037	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2038	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2039	glClear GL_COLOR_BUFFER_BIT;
		2040
		2041	glMatrixMode GL_PROJECTION;
		2042	glLoadIdentity;
		2043	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2044	glMatrixMode GL_MODELVIEW;
		2045	glLoadIdentity;
		2046
1371	$self->_draw;	2047	$self->_draw;
1372	}	2048	}
1373		2049
1374	#############################################################################	2050	#############################################################################
1375		2051
1376	package CFClient::Widget;	2052	package CFClient::UI;
1377		2053
1378	$TOPLEVEL = new CFClient::Widget::Toplevel;	2054	$ROOT = new CFClient::UI::Root;
1379		2055
1380	1	2056	1
1381		2057

Diff Legend

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