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

Diff Legend

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