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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_text ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
39	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
40	}	51	}
41		52
42	# class methods for events	53	# class methods for events
43	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		56	if $FOCUS;
45	}	57	}
46		58
47	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		61	if $FOCUS;
49	}	62	}
50		63
51	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	65	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	66	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	74	check_tooltip;
62	}	75	}
63		76
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		78
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	79	if ($GRAB) {
		80	($x, $y) = $GRAB->coord2local ($x, $y);
		81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		82	}
67	}	83	}
68		84
69	sub feed_sdl_button_up_event {	85	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	86	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	87	my ($x, $y) = ($ev->{x}, $ev->{y});
72		88
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		90
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		92
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	93	if ($GRAB) {
		94	($x, $y) = $GRAB->coord2local ($x, $y);
		95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		96	}
78		97
79	if (!$BUTTON_STATE) {	98	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	99	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	100	$grab->update if $grab;
82	$GRAB->update if $GRAB;	101	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	117	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		118
100	check_tooltip;	119	check_tooltip;
101	}	120	}
102		121
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	122	if ($HOVER) {
		123	($x, $y) = $HOVER->coord2local ($x, $y);
		124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		125	}
104	}	126	}
105		127
106	# convert position array to integers	128	# convert position array to integers
107	sub harmonize {	129	sub harmonize {
108	my ($vals) = @_;	130	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	136	$rem += $_ - $i;
115	$_ = $i;	137	$_ = $i;
116	}	138	}
117	}	139	}
118		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
		169	}
		170	}
		171
119	#############################################################################	172	#############################################################################
120		173
121	package CFClient::UI::Base;	174	package CFClient::UI::Base;
122		175
123	use strict;	176	use strict;
…		…
126		179
127	sub new {	180	sub new {
128	my $class = shift;	181	my $class = shift;
129		182
130	my $self = bless {	183	my $self = bless {
131	x => 0,	184	x => 0,
132	y => 0,	185	y => 0,
133	z => 0,	186	z => 0,
134	can_events => 1,	187	can_events => 1,
135	@_	188	@_
136	}, $class;	189	}, $class;
137		190
138	for (keys %$self) {	191	for (keys %$self) {
139	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
141	}	194	}
142	}	195	}
143		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
144	$self	199	$self
145	}	200	}
146		201
147	sub destroy {	202	sub destroy {
148	my ($self) = @_;	203	my ($self) = @_;
…		…
151	%$self = ();	206	%$self = ();
152	}	207	}
153		208
154	sub show {	209	sub show {
155	my ($self) = @_;	210	my ($self) = @_;
156
157	return if $self->{parent};	211	return if $self->{parent};
158		212
159	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
160	}	214	}
161		215
162	sub hide {	216	sub hide {
163	my ($self) = @_;	217	my ($self) = @_;
164		218
165	return unless $self->{parent};	219	undef $GRAB if $GRAB == $self;
		220	undef $HOVER if $HOVER == $self;
166		221
167	$self->{parent}->remove ($self);	222	$self->{parent}->remove ($self)
		223	if $self->{parent};
168	}	224	}
169		225
170	sub move {	226	sub move {
171	my ($self, $x, $y, $z) = @_;	227	my ($self, $x, $y, $z) = @_;
172		228
…		…
211	$self->{y} = $y;	267	$self->{y} = $y;
212	$self->update;	268	$self->update;
213	}	269	}
214		270
215	if ($self->{w} != $w || $self->{h} != $h) {	271	if ($self->{w} != $w || $self->{h} != $h) {
216	$self->{w} = $w;	272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217	$self->{h} = $h;
218
219	$self->size_allocate ($w, $h);
220	$self->update;
221	}	273	}
222	}	274	}
223		275
224	sub size_allocate {	276	sub size_allocate {
225	# nothing to be done	277	# nothing to be done
226	}	278	}
227		279
		280	sub reconfigure {
		281	my ($self) = @_;
		282
		283	$self->check_size (1);
		284	$self->update;
		285	}
		286
		287	sub children {
		288	}
		289
228	sub set_max_size {	290	sub set_max_size {
229	my ($self, $w, $h) = @_;	291	my ($self, $w, $h) = @_;
230		292
231	delete $self->{max_w}; $self->{max_w} = $w if $w;	293	delete $self->{max_w}; $self->{max_w} = $w if $w;
232	delete $self->{max_h}; $self->{max_h} = $h if $h;	294	delete $self->{max_h}; $self->{max_h} = $h if $h;
233	}	295	}
234		296
235	# return top left coordinates	297	sub set_tooltip {
236	sub _topleft {
237	my ($self, $x, $y) = @_;	298	my ($self, $tooltip) = @_;
238		299
239	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	300	$self->{tooltip} = $tooltip;
		301
		302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		303	delete $CFClient::UI::TOOLTIP->{owner};
		304	CFClient::UI::check_tooltip;
		305	}
240	}	306	}
241		307
242	# translate global coordinates to local coordinate system	308	# translate global coordinates to local coordinate system
243	sub coord2local {	309	sub coord2local {
244	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
245		311
246	my ($X, $Y) = $self->_topleft;	312	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247	($x - $X, $y - $Y)
248	}	313	}
249		314
250	# translate local coordinates to global coordinate system	315	# translate local coordinates to global coordinate system
251	sub coord2global {	316	sub coord2global {
252	my ($self, $x, $y) = @_;	317	my ($self, $x, $y) = @_;
253		318
254	my ($X, $Y) = $self->_topleft;	319	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255	($x + $X, $y + $Y)
256	}	320	}
257		321
258	sub focus_in {	322	sub focus_in {
259	my ($self) = @_;	323	my ($self) = @_;
260		324
…		…
320	glVertex $x + $self->{w}, $y + $self->{h};	384	glVertex $x + $self->{w}, $y + $self->{h};
321	glVertex $x , $y + $self->{h};	385	glVertex $x , $y + $self->{h};
322	glEnd;	386	glEnd;
323	glDisable GL_BLEND;	387	glDisable GL_BLEND;
324	}	388	}
		389
		390	if ($ENV{PCLIENT_DEBUG}) {
		391	glPushMatrix;
		392	glColor 1, 1, 0, 1;
		393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		394	glBegin GL_LINE_LOOP;
		395	glVertex 0 , 0;
		396	glVertex $self->{w}, 0;
		397	glVertex $self->{w}, $self->{h};
		398	glVertex 0 , $self->{h};
		399	glEnd;
		400	glPopMatrix;
		401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		402	}
325	}	403	}
326		404
327	sub _draw {	405	sub _draw {
328	my ($self) = @_;	406	my ($self) = @_;
329		407
…		…
344		422
345	sub set_parent {	423	sub set_parent {
346	my ($self, $parent) = @_;	424	my ($self, $parent) = @_;
347		425
348	Scalar::Util::weaken ($self->{parent} = $parent);	426	Scalar::Util::weaken ($self->{parent} = $parent);
		427
		428	# TODO: req_w _does_change after ->reconfigure
		429	$self->check_size
		430	unless exists $self->{req_w};
		431
		432	$self->show;
349	}	433	}
350		434
351	sub check_size {	435	sub check_size {
352	my ($self) = @_;	436	my ($self, $forced) = @_;
353		437
354	$self->{parent}	438	$self->{force_alloc} = 1 if $forced;
355	or return 1;	439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357	my ($w, $h) = $self->{user_w} && $self->{user_h}
358	? @$self{qw(user_w user_h)}
359	: $self->size_request;
360
361	if ($w != $self->{req_w} || $h != $self->{req_h}) {
362	$self->{req_w} = $w;
363	$self->{req_h} = $h;
364
365	$self->{parent}->check_size
366	or $self->size_allocate (
367	(List::Util::max $self->{w}, $w),
368	(List::Util::max $self->{h}, $h),
369	);
370
371	1
372	} else {
373	0
374	}
375	}	440	}
376		441
377	sub update {	442	sub update {
378	my ($self) = @_;	443	my ($self) = @_;
379		444
…		…
388	}	453	}
389		454
390	sub emit {	455	sub emit {
391	my ($self, $signal, @args) = @_;	456	my ($self, $signal, @args) = @_;
392		457
393	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394	$cb->($self, @args);
395	}
396	}	459	}
397		460
398	sub DESTROY {	461	sub DESTROY {
399	my ($self) = @_;	462	my ($self) = @_;
400		463
		464	delete $WIDGET{$self+0};
401	#$self->deactivate;	465	#$self->deactivate;
402	}	466	}
403		467
404	#############################################################################	468	#############################################################################
405		469
…		…
414	my $class = shift;	478	my $class = shift;
415		479
416	# range [value, low, high, page]	480	# range [value, low, high, page]
417		481
418	$class->SUPER::new (	482	$class->SUPER::new (
419	bg => [0, 0, 0, 0.2],	483	#bg => [0, 0, 0, 0.2],
420	active_bg => [1, 1, 1, 0.5],	484	#active_bg => [1, 1, 1, 0.5],
421	@_	485	@_
422	)	486	)
423	}	487	}
424		488
425	sub _draw {	489	sub _draw {
426	my ($self) = @_;	490	my ($self) = @_;
427		491
		492	my $color = $FOCUS == $self && $self->{active_bg}
		493	? $self->{active_bg}
		494	: $self->{bg};
		495
		496	if ($color && (@$color < 4 || $color->[3])) {
428	my ($w, $h) = @$self{qw(w h)};	497	my ($w, $h) = @$self{qw(w h)};
429		498
430	glEnable GL_BLEND;	499	glEnable GL_BLEND;
431	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	500	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
432	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	501	glColor @$color;
433		502
434	glBegin GL_QUADS;	503	glBegin GL_QUADS;
435	glVertex 0 , 0;	504	glVertex 0 , 0;
436	glVertex 0 , $h;	505	glVertex 0 , $h;
437	glVertex $w, $h;	506	glVertex $w, $h;
438	glVertex $w, 0;	507	glVertex $w, 0;
439	glEnd;	508	glEnd;
440		509
441	glDisable GL_BLEND;	510	glDisable GL_BLEND;
		511	}
442	}	512	}
443		513
444	#############################################################################	514	#############################################################################
445		515
446	package CFClient::UI::Empty;	516	package CFClient::UI::Empty;
…		…
467	sub new {	537	sub new {
468	my ($class, %arg) = @_;	538	my ($class, %arg) = @_;
469		539
470	my $children = delete $arg{children} || [];	540	my $children = delete $arg{children} || [];
471		541
472	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	542	my $self = $class->SUPER::new (
		543	children => [],
		544	can_events => 0,
		545	%arg,
		546	);
473	$self->add ($_) for @$children;	547	$self->add ($_) for @$children;
474		548
475	$self	549	$self
476	}	550	}
477		551
478	sub add {	552	sub add {
479	my ($self, $child) = @_;	553	my ($self, @widgets) = @_;
480		554
481	$child->set_parent ($self);	555	$_->set_parent ($self)
		556	for @widgets;
482		557
483	use sort 'stable';	558	use sort 'stable';
484		559
485	$self->{children} = [	560	$self->{children} = [
486	sort { $a->{z} <=> $b->{z} }	561	sort { $a->{z} <=> $b->{z} }
487	@{$self->{children}}, $child	562	@{$self->{children}}, @widgets
488	];	563	];
489		564
490	$child->check_size;	565	$self->check_size (1);
		566	$self->update;
		567	}
		568
		569	sub children {
		570	@{ $_[0]{children} }
491	}	571	}
492		572
493	sub remove {	573	sub remove {
494	my ($self, $child) = @_;	574	my ($self, $child) = @_;
495		575
496	delete $child->{parent};	576	delete $child->{parent};
		577	$child->hide;
497		578
498	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		580
		581	$self->check_size;
		582	$self->update;
		583	}
		584
		585	sub clear {
		586	my ($self) = @_;
		587
		588	my $children = delete $self->{children};
		589	$self->{children} = [];
		590
		591	for (@$children) {
		592	delete $_->{parent};
		593	$_->hide;
		594	}
499		595
500	$self->check_size;	596	$self->check_size;
501	$self->update;	597	$self->update;
502	}	598	}
503		599
…		…
581	}	677	}
582		678
583	sub update {	679	sub update {
584	my ($self) = @_;	680	my ($self) = @_;
585		681
586	# we want to do this delayed...	682	$ROOT->on_post_alloc ($self => sub { $self->render_child });
587	$self->render_chld;
588	$self->SUPER::update;	683	$self->SUPER::update;
589	}
590
591	sub render_chld {
592	my ($self) = @_;
593
594	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595	glClearColor 0, 0, 0, 1;
596	glClear GL_COLOR_BUFFER_BIT;
597	$self->child->draw;
598	};
599	}	684	}
600		685
601	sub size_allocate {	686	sub size_allocate {
602	my ($self, $w, $h) = @_;	687	my ($self, $w, $h) = @_;
603		688
604	$self->child->configure (0, 0, $w, $h);	689	$self->SUPER::size_allocate ($w, $h);
		690	$self->update;
		691	}
605		692
		693	sub _render {
		694	$_[0]{children}[0]->draw;
		695	}
		696
		697	sub render_child {
		698	my ($self) = @_;
		699
		700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		701	glClearColor 0, 0, 0, 0;
		702	glClear GL_COLOR_BUFFER_BIT;
		703
606	$self->render_chld;	704	$self->_render;
		705	};
607	}	706	}
608		707
609	sub _draw {	708	sub _draw {
610	my ($self) = @_;	709	my ($self) = @_;
611		710
612	my ($w, $h) = ($self->w, $self->h);	711	my ($w, $h) = ($self->w, $self->h);
613		712
614	my $tex = $self->{texture}	713	my $tex = $self->{texture}
615	or return;	714	or return;
616		715
617	glEnable GL_BLEND;
618	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619	glEnable GL_TEXTURE_2D;	716	glEnable GL_TEXTURE_2D;
620	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		718	glColor 1, 1, 1, 1;
621		719
622	$tex->draw_quad (0, 0, $w, $h);	720	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623		721
624	glDisable GL_BLEND;
625	glDisable GL_TEXTURE_2D;	722	glDisable GL_TEXTURE_2D;
626	}	723	}
627		724
628	#############################################################################	725	#############################################################################
629		726
630	package CFClient::UI::ViewPort;	727	package CFClient::UI::ViewPort;
631		728
632	our @ISA = CFClient::UI::Window::;	729	our @ISA = CFClient::UI::Window::;
633		730
634	sub new { die }
635
636	sub size_request {	731	sub size_request {
637	my ($self) = @_;	732	my ($self) = @_;
638		733
639	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
641		736
642	@$self{qw(child_w child_h)}	737	@$self{qw(child_w child_h)}
643	}	738	}
644		739
645	sub _draw {	740	sub size_allocate {
646	my ($self) = @_;	741	my ($self, $w, $h) = @_;
647		742
648	$self->{children}[1]->draw;	743	$self->update;
649	}	744	}
650		745
		746	sub set_offset {
		747	my ($self, $x, $y) = @_;
		748
		749	$self->{view_x} = int $x;
		750	$self->{view_y} = int $y;
		751
		752	$self->update;
		753	}
		754
		755	# hmm, this does not work for topleft of $self... but we should not ask for that
		756	sub coord2local {
		757	my ($self, $x, $y) = @_;
		758
		759	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		760	}
		761
		762	sub coord2global {
		763	my ($self, $x, $y) = @_;
		764
		765	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		766	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		767
		768	$self->SUPER::coord2global ($x, $y)
		769	}
		770
		771	sub find_widget {
		772	my ($self, $x, $y) = @_;
		773
		774	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		775	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		776	) {
		777	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		778	} else {
		779	$self->CFClient::UI::Base::find_widget ($x, $y)
		780	}
		781	}
		782
		783	sub _render {
		784	my ($self) = @_;
		785
		786	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		787
		788	$self->SUPER::_render;
		789	}
651		790
652	#############################################################################	791	#############################################################################
653		792
654	package CFClient::UI::Frame;	793	package CFClient::UI::ScrolledWindow;
655		794
656	our @ISA = CFClient::UI::Bin::;	795	our @ISA = CFClient::UI::HBox::;
657
658	use CFClient::OpenGL;
659		796
660	sub new {	797	sub new {
661	my $class = shift;	798	my $class = shift;
662		799
		800	my $self;
		801
		802	my $slider = new CFClient::UI::Slider
		803	vertical => 1,
		804	range => [0, 0, 1, 0.01], # HACK fix
		805	connect_changed => sub {
		806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		807	},
		808	;
		809
663	my $self = $class->SUPER::new (	810	$self = $class->SUPER::new (
664	bg => [1, 1, 1, 1],	811	vp => (new CFClient::UI::ViewPort expand => 1),
665	border_bg => [1, 1, 1, 1],	812	slider => $slider,
666	border => 0.8,
667	@_	813	@_,
668	);	814	);
669		815
		816	$self->{vp}->add ($self->{scrolled});
		817	$self->add ($self->{vp});
		818	$self->add ($self->{slider});
		819
670	$self	820	$self
671	}	821	}
672		822
		823	#TODO# update range on size_allocate depending on child
		824	# update viewport offset on scroll
		825
		826	#############################################################################
		827
		828	package CFClient::UI::Frame;
		829
		830	our @ISA = CFClient::UI::Bin::;
		831
		832	use CFClient::OpenGL;
		833
		834	sub new {
		835	my $class = shift;
		836
		837	$class->SUPER::new (
		838	bg => undef,
		839	@_,
		840	)
		841	}
		842
673	sub _draw {	843	sub _draw {
674	my ($self) = @_;	844	my ($self) = @_;
675		845
676	my ($w, $h) = ($self->{w}, $self->{h});	846	if ($self->{bg}) {
		847	my ($w, $h) = @$self{qw(w h)};
677		848
678	glEnable GL_BLEND;	849	glEnable GL_BLEND;
679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	850	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680	glEnable GL_TEXTURE_2D;	851	glColor @{ $self->{bg} };
681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682		852
683	# glBegin GL_QUADS;	853	glBegin GL_QUADS;
684	# glColor 0, 0, 0, 0;
685	# glVertex 0 , 0;	854	glVertex 0 , 0;
686	# glVertex 0 , $h;	855	glVertex 0 , $h;
687	# glVertex $w, $h;	856	glVertex $w, $h;
688	# glVertex $w, 0;	857	glVertex $w, 0;
689	# glEnd;	858	glEnd;
690		859
691
692	$self->child->draw;
693	glDisable GL_BLEND;	860	glDisable GL_BLEND;
694	glDisable GL_TEXTURE_2D;	861	}
		862
		863	$self->SUPER::_draw;
695	}	864	}
696		865
697	#############################################################################	866	#############################################################################
698		867
699	package CFClient::UI::FancyFrame;	868	package CFClient::UI::FancyFrame;
…		…
710	my $class = shift;	879	my $class = shift;
711		880
712	# TODO: user_x, user_y, overwrite moveto?	881	# TODO: user_x, user_y, overwrite moveto?
713		882
714	my $self = $class->SUPER::new (	883	my $self = $class->SUPER::new (
715	bg => [1, 1, 1, 1],	884	bg => [1, 1, 1, 1],
716	border_bg => [1, 1, 1, 1],	885	border_bg => [1, 1, 1, 1],
717	border => 0.8,	886	border => 0.6,
		887	toplevel => 1,
718	can_events => 1,	888	can_events => 1,
719	@_	889	@_
720	);	890	);
721		891
722	$self->{title} &&= new CFClient::UI::Label	892	$self->{title} &&= new CFClient::UI::Label
723	align => 0,	893	align => 0,
724	valign => 1,	894	valign => 1,
725	text => $self->{title},	895	text => $self->{title},
726	fontsize => 1;	896	fontsize => $self->{border};
727		897
728	$self	898	$self
729	}	899	}
730		900
731	sub border {	901	sub border {
…		…
747	my ($self, $w, $h) = @_;	917	my ($self, $w, $h) = @_;
748		918
749	$h -= List::Util::max 0, $self->border * 2;	919	$h -= List::Util::max 0, $self->border * 2;
750	$w -= List::Util::max 0, $self->border * 2;	920	$w -= List::Util::max 0, $self->border * 2;
751		921
752	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
753	if $self->{title};	923	if $self->{title};
754		924
755	$self->child->configure ($self->border, $self->border, $w, $h);	925	$self->child->configure ($self->border, $self->border, $w, $h);
756	}	926	}
757		927
758	sub button_down {	928	sub button_down {
759	my ($self, $ev, $x, $y) = @_;	929	my ($self, $ev, $x, $y) = @_;
760		930
		931	my ($w, $h) = @$self{qw(w h)};
761	my $border = $self->border;	932	my $border = $self->border;
762		933
763	if ($x < $self->{w} && $x >= $self->{w} - $border	934	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764	&& $y < $self->{h} && $y >= $self->{h} - $border) {	935	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765		936
		937	if ($lr & $td) {
		938	my ($wx, $wy) = ($self->{x}, $self->{y});
766	my ($ox, $oy) = ($ev->{x}, $ev->{y});	939	my ($ox, $oy) = ($ev->{x}, $ev->{y});
767	my ($bw, $bh) = ($self->{w}, $self->{h});	940	my ($bw, $bh) = ($self->{w}, $self->{h});
768		941
		942	my $mx = $x < $border;
		943	my $my = $y < $border;
		944
769	$self->{motion} = sub {	945	$self->{motion} = sub {
770	my ($ev, $x, $y) = @_;	946	my ($ev, $x, $y) = @_;
771		947
772	($x, $y) = ($ev->{x}, $ev->{y});	948	my $dx = $ev->{x} - $ox;
		949	my $dy = $ev->{y} - $oy;
773		950
774	$self->{user_w} = $bw + $x - $ox;	951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775	$self->{user_h} = $bh + $y - $oy;	952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
776	$self->check_size;	954	$self->check_size;
777	};	955	};
778		956
779	} elsif ($x >= 0 && $x < $self->{w}	957	} elsif ($lr ^ $td) {
780	&& $y >= 0 && $y < $border) {
781
782	my ($ox, $oy) = ($ev->{x}, $ev->{y});	958	my ($ox, $oy) = ($ev->{x}, $ev->{y});
783	my ($bx, $by) = ($self->{x}, $self->{y});	959	my ($bx, $by) = ($self->{x}, $self->{y});
784		960
785	$self->{motion} = sub {	961	$self->{motion} = sub {
786	my ($ev, $x, $y) = @_;	962	my ($ev, $x, $y) = @_;
…		…
809	my ($self) = @_;	985	my ($self) = @_;
810		986
811	my ($w, $h ) = ($self->{w}, $self->{h});	987	my ($w, $h ) = ($self->{w}, $self->{h});
812	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813		989
814	glEnable GL_BLEND;
815	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816	glEnable GL_TEXTURE_2D;	990	glEnable GL_TEXTURE_2D;
817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818		992
819	my $border = $self->border;	993	my $border = $self->border;
820		994
821	glColor @{ $self->{border_bg} };	995	glColor @{ $self->{border_bg} };
822	$tex[1]->draw_quad (0, 0, $w, $border);	996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
823	$tex[3]->draw_quad (0, $border, $border, $ch);	997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825	$tex[4]->draw_quad (0, $h - $border, $w, $border);	999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826		1000
		1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827	my $bg = $tex[0];	1002	my $bg = $tex[0];
828		1003
829	# TODO: repeat texture not scale	1004	# TODO: repeat texture not scale
830	my $rep_x = $cw / $bg->{w};	1005	my $rep_x = $cw / $bg->{w};
831	my $rep_y = $ch / $bg->{h};	1006	my $rep_y = $ch / $bg->{h};
832		1007
833	glColor @{ $self->{bg} };	1008	glColor @{ $self->{bg} };
834		1009
835	$bg->{s} = $rep_x;	1010	$bg->{s} = $rep_x;
836	$bg->{t} = $rep_y;	1011	$bg->{t} = $rep_y;
837	$bg->{wrap_mode} = 1;	1012	$bg->{wrap_mode} = 1;
838	$bg->draw_quad ($border, $border, $cw, $ch);	1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1014	}
839		1015
840	glDisable GL_TEXTURE_2D;	1016	glDisable GL_TEXTURE_2D;
841	glDisable GL_BLEND;
842		1017
843	$self->{title}->draw if $self->{title};	1018	$self->{title}->draw if $self->{title};
		1019
844	$self->child->draw;	1020	$self->child->draw;
845	}	1021	}
846		1022
847	#############################################################################	1023	#############################################################################
848		1024
…		…
870	$self->{children}[$y][$x] = $child;	1046	$self->{children}[$y][$x] = $child;
871		1047
872	$child->check_size;	1048	$child->check_size;
873	}	1049	}
874		1050
		1051	sub children {
		1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1053	}
		1054
875	# TODO: move to container class maybe? send childs a signal on removal?	1055	# TODO: move to container class maybe? send childs a signal on removal?
876	sub clear {	1056	sub clear {
877	my ($self) = @_;	1057	my ($self) = @_;
878		1058
		1059	my @children = $self->children;
879	delete $self->{children};	1060	delete $self->{children};
		1061
		1062	for (@children) {
		1063	delete $_->{parent};
		1064	$_->hide;
		1065	}
		1066
880	$self->update;	1067	$self->update;
881	}	1068	}
882		1069
883	sub get_wh {	1070	sub get_wh {
884	my ($self) = @_;	1071	my ($self) = @_;
…		…
1061	}	1248	}
1062		1249
1063	sub size_allocate {	1250	sub size_allocate {
1064	my ($self, $w, $h) = @_;	1251	my ($self, $w, $h) = @_;
1065		1252
		1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1254
1066	my $children = $self->{children};	1255	my $children = $self->{children};
1067		1256
1068	my @h = map $_->{req_h}, @$children;	1257	my @h = map $_->{req_h}, @$children;
1069		1258
1070	my $req_h = List::Util::sum @h;	1259	my $req_h = List::Util::sum @h;
…		…
1099		1288
1100	#############################################################################	1289	#############################################################################
1101		1290
1102	package CFClient::UI::Label;	1291	package CFClient::UI::Label;
1103		1292
1104	our @ISA = CFClient::UI::Base::;	1293	our @ISA = CFClient::UI::DrawBG::;
1105		1294
1106	use CFClient::OpenGL;	1295	use CFClient::OpenGL;
1107		1296
1108	sub new {	1297	sub new {
1109	my ($class, %arg) = @_;	1298	my ($class, %arg) = @_;
1110		1299
1111	my $self = $class->SUPER::new (	1300	my $self = $class->SUPER::new (
1112	fg => [1, 1, 1],	1301	fg => [1, 1, 1],
		1302	#bg => none
		1303	#active_bg => none
1113	#font => default_font	1304	#font => default_font
		1305	#text => initial text
		1306	#markup => initial narkup
		1307	#max_w => maximum pixel width
		1308	ellipsise => 3, # end
		1309	layout => (new CFClient::Layout),
1114	fontsize => 1,	1310	fontsize => 1,
1115	text => "",
1116	align => -1,	1311	align => -1,
1117	valign => -1,	1312	valign => -1,
1118	padding => 2,	1313	padding => 2,
1119	layout => new CFClient::Layout,
1120	can_events => 0,	1314	can_events => 0,
1121	%arg	1315	%arg
1122	);	1316	);
1123		1317
1124	if (exists $self->{template}) {	1318	if (exists $self->{template}) {
1125	my $layout = new CFClient::Layout;	1319	my $layout = new CFClient::Layout;
1126	$layout->set_text (delete $self->{template});	1320	$layout->set_text (delete $self->{template});
1127	$self->{template} = $layout;	1321	$self->{template} = $layout;
1128	}	1322	}
1129		1323
1130	$self->set_text (delete $self->{text}) if exists $self->{text};	1324	if (exists $self->{markup}) {
1131	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1325	$self->set_markup (delete $self->{markup});
		1326	} else {
		1327	$self->set_text (delete $self->{text});
		1328	}
1132		1329
1133	$self	1330	$self
1134	}	1331	}
1135		1332
1136	sub escape_text {	1333	sub escape($) {
1137	local $_ = $_[1];	1334	local $_ = $_[0];
1138		1335
1139	s/&/&amp;/g;	1336	s/&/&amp;/g;
1140	s/>/&gt;/g;	1337	s/>/&gt;/g;
1141	s/</&lt;/g;	1338	s/</&lt;/g;
1142		1339
1143	$_[1]	1340	$_
		1341	}
		1342
		1343	sub update {
		1344	my ($self) = @_;
		1345
		1346	delete $self->{texture};
		1347	$self->SUPER::update;
1144	}	1348	}
1145		1349
1146	sub set_text {	1350	sub set_text {
1147	my ($self, $text) = @_;	1351	my ($self, $text) = @_;
1148		1352
		1353	return if $self->{text} eq "T$text";
		1354	$self->{text} = "T$text";
		1355
		1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149	$self->{layout}->set_text ($text);	1357	$self->{layout}->set_text ($text);
1150		1358
1151	delete $self->{texture};	1359	$self->update;
1152	$self->check_size;	1360	$self->check_size;
1153	$self->update;
1154	}	1361	}
1155		1362
1156	sub set_markup {	1363	sub set_markup {
1157	my ($self, $markup) = @_;	1364	my ($self, $markup) = @_;
1158		1365
		1366	return if $self->{text} eq "M$markup";
		1367	$self->{text} = "M$markup";
		1368
		1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1370
		1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159	$self->{layout}->set_markup ($markup);	1372	$self->{layout}->set_markup ($markup);
1160		1373
1161	delete $self->{texture};	1374	$self->update;
1162	$self->check_size;	1375	$self->check_size;
1163	$self->update;
1164	}	1376	}
1165		1377
1166	sub size_request {	1378	sub size_request {
1167	my ($self) = @_;	1379	my ($self) = @_;
1168		1380
1169	$self->{layout}->set_font ($self->{font}) if $self->{font};	1381	$self->{layout}->set_font ($self->{font}) if $self->{font};
1170	$self->{layout}->set_width ($self->{max_w} || -1);	1382	$self->{layout}->set_width ($self->{max_w} || -1);
		1383	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1384	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1171	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172		1386
1173	my ($w, $h) = $self->{layout}->size;	1387	my ($w, $h) = $self->{layout}->size;
1174		1388
1175	if (exists $self->{template}) {	1389	if (exists $self->{template}) {
…		…
1197	sub set_fontsize {	1411	sub set_fontsize {
1198	my ($self, $fontsize) = @_;	1412	my ($self, $fontsize) = @_;
1199		1413
1200	$self->{fontsize} = $fontsize;	1414	$self->{fontsize} = $fontsize;
1201	delete $self->{texture};	1415	delete $self->{texture};
		1416
		1417	$self->update;
1202	$self->check_size;	1418	$self->check_size;
1203	$self->update;
1204	}	1419	}
1205		1420
1206	sub _draw {	1421	sub _draw {
1207	my ($self) = @_;	1422	my ($self) = @_;
1208		1423
		1424	$self->SUPER::_draw; # draw background, if applicable
		1425
1209	my $tex = $self->{texture} ||= do {	1426	my $tex = $self->{texture} ||= do {
		1427	$self->{layout}->set_foreground (@{$self->{fg}});
1210	$self->{layout}->set_font ($self->{font}) if $self->{font};	1428	$self->{layout}->set_font ($self->{font}) if $self->{font};
1211	$self->{layout}->set_width ($self->{w});	1429	$self->{layout}->set_width ($self->{w});
		1430	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1212	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1433
1213	new_from_layout CFClient::Texture $self->{layout}	1434	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1435
		1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1438	: ($self->{w} - $tex->{w}) * 0.5);
		1439
		1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1442	: ($self->{h} - $tex->{h}) * 0.5);
		1443
		1444	$tex
1214	};	1445	};
1215		1446
1216	glEnable GL_BLEND;
1217	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218	glEnable GL_TEXTURE_2D;	1447	glEnable GL_TEXTURE_2D;
1219	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220		1449
		1450	if ($tex->{format} == GL_ALPHA) {
1221	glColor @{$self->{fg}};	1451	glColor @{$self->{fg}};
1222
1223	$self->{ox} = int (
1224	$self->{align} < 0 ? $self->{padding}
1225	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226	: ($self->{w} - $tex->{w}) * 0.5
1227	);
1228
1229	$self->{oy} = int (
1230	$self->{valign} < 0 ? $self->{padding}
1231	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232	: ($self->{h} - $tex->{h}) * 0.5
1233	);
1234
1235	$tex->draw_quad ($self->{ox}, $self->{oy});	1452	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1453	} else {
		1454	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1455	}
1236		1456
1237	glDisable GL_TEXTURE_2D;	1457	glDisable GL_TEXTURE_2D;
1238	glDisable GL_BLEND;
1239	}	1458	}
1240		1459
1241	#############################################################################	1460	#############################################################################
1242		1461
1243	package CFClient::UI::EntryBase;	1462	package CFClient::UI::EntryBase;
…		…
1248		1467
1249	sub new {	1468	sub new {
1250	my $class = shift;	1469	my $class = shift;
1251		1470
1252	$class->SUPER::new (	1471	$class->SUPER::new (
1253	fg => [1, 1, 1],	1472	fg => [1, 1, 1],
1254	bg => [0, 0, 0, 0.2],	1473	bg => [0, 0, 0, 0.2],
1255	active_bg => [1, 1, 1, 0.5],	1474	active_bg => [1, 1, 1, 0.5],
1256	active_fg => [0, 0, 0],	1475	active_fg => [0, 0, 0],
1257	can_hover => 1,	1476	can_hover => 1,
1258	can_focus => 1,	1477	can_focus => 1,
1259	valign => 0,	1478	valign => 0,
1260	can_events => 1,	1479	can_events => 1,
1261	@_	1480	@_
1262	)	1481	)
1263	}	1482	}
1264		1483
…		…
1278	$self->{layout}->set_text ("$text ");	1497	$self->{layout}->set_text ("$text ");
1279		1498
1280	$self->emit (changed => $self->{text});	1499	$self->emit (changed => $self->{text});
1281	}	1500	}
1282		1501
1283	sub get_text {
1284	$_[0]{text}
1285	}
1286
1287	sub size_request {
1288	my ($self) = @_;
1289
1290	my ($w, $h) = $self->SUPER::size_request;
1291
1292	($w + 1, $h) # add 1 for cursor
1293	}
1294
1295	sub size_allocate {
1296	my ($self, $w, $h) = @_;
1297
1298	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299	}
1300
1301	sub set_text {	1502	sub set_text {
1302	my ($self, $text) = @_;	1503	my ($self, $text) = @_;
1303		1504
1304	$self->{cursor} = length $text;	1505	$self->{cursor} = length $text;
1305	$self->_set_text ($text);	1506	$self->_set_text ($text);
1306	$self->update;	1507	$self->update;
		1508	$self->check_size;
		1509	}
		1510
		1511	sub get_text {
		1512	$_[0]{text}
		1513	}
		1514
		1515	sub size_request {
		1516	my ($self) = @_;
		1517
		1518	my ($w, $h) = $self->SUPER::size_request;
		1519
		1520	($w + 1, $h) # add 1 for cursor
		1521	}
		1522
		1523	sub size_allocate {
		1524	my ($self, $w, $h) = @_;
		1525
		1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1307	}	1527	}
1308		1528
1309	sub key_down {	1529	sub key_down {
1310	my ($self, $ev) = @_;	1530	my ($self, $ev) = @_;
1311		1531
…		…
1313	my $sym = $ev->{sym};	1533	my $sym = $ev->{sym};
1314	my $uni = $ev->{unicode};	1534	my $uni = $ev->{unicode};
1315		1535
1316	my $text = $self->get_text;	1536	my $text = $self->get_text;
1317		1537
1318	if ($sym == 8) {	1538	if ($uni == 8) {
1319	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1539	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320	} elsif ($sym == 127) {	1540	} elsif ($uni == 127) {
1321	substr $text, $self->{cursor}, 1, "";	1541	substr $text, $self->{cursor}, 1, "";
1322	} elsif ($sym == CFClient::SDLK_LEFT) {	1542	} elsif ($sym == CFClient::SDLK_LEFT) {
1323	--$self->{cursor} if $self->{cursor};	1543	--$self->{cursor} if $self->{cursor};
1324	} elsif ($sym == CFClient::SDLK_RIGHT) {	1544	} elsif ($sym == CFClient::SDLK_RIGHT) {
1325	++$self->{cursor} if $self->{cursor} < length $self->{text};	1545	++$self->{cursor} if $self->{cursor} < length $self->{text};
1326	} elsif ($sym == CFClient::SDLK_HOME) {	1546	} elsif ($sym == CFClient::SDLK_HOME) {
1327	$self->{cursor} = 0;	1547	$self->{cursor} = 0;
1328	} elsif ($sym == CFClient::SDLK_END) {	1548	} elsif ($sym == CFClient::SDLK_END) {
1329	$self->{cursor} = length $text;	1549	$self->{cursor} = length $text;
1330	} elsif ($sym == 27) {	1550	} elsif ($uni == 27) {
1331	$self->emit ('escape');	1551	$self->emit ('escape');
1332	} elsif ($uni) {	1552	} elsif ($uni) {
1333	substr $text, $self->{cursor}++, 0, chr $uni;	1553	substr $text, $self->{cursor}++, 0, chr $uni;
1334	}	1554	}
1335		1555
1336	$self->_set_text ($text);	1556	$self->_set_text ($text);
1337	$self->update;	1557	$self->update;
		1558	$self->check_size;
1338	}	1559	}
1339		1560
1340	sub focus_in {	1561	sub focus_in {
1341	my ($self) = @_;	1562	my ($self) = @_;
1342		1563
…		…
1418	my ($self, $ev) = @_;	1639	my ($self, $ev) = @_;
1419		1640
1420	my $sym = $ev->{sym};	1641	my $sym = $ev->{sym};
1421		1642
1422	if ($sym == 13) {	1643	if ($sym == 13) {
		1644	unshift @{$self->{history}},
		1645	my $txt = $self->get_text;
		1646	$self->{history_pointer} = -1;
		1647	$self->{history_saveback} = '';
1423	$self->emit (activate => $self->get_text);	1648	$self->emit (activate => $txt);
1424	$self->update;	1649	$self->update;
		1650
		1651	} elsif ($sym == CFClient::SDLK_UP) {
		1652	if ($self->{history_pointer} < 0) {
		1653	$self->{history_saveback} = $self->get_text;
		1654	}
		1655	if (@{$self->{history} || []} > 0) {
		1656	$self->{history_pointer}++;
		1657	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1658	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1659	}
		1660	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1661	}
		1662
		1663	} elsif ($sym == CFClient::SDLK_DOWN) {
		1664	$self->{history_pointer}--;
		1665	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1666
		1667	if ($self->{history_pointer} >= 0) {
		1668	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1669	} else {
		1670	$self->set_text ($self->{history_saveback});
		1671	}
1425		1672
1426	} else {	1673	} else {
1427	$self->SUPER::key_down ($ev);	1674	$self->SUPER::key_down ($ev);
1428	}	1675	}
1429		1676
…		…
1443		1690
1444	sub new {	1691	sub new {
1445	my $class = shift;	1692	my $class = shift;
1446		1693
1447	$class->SUPER::new (	1694	$class->SUPER::new (
1448	padding => 4,	1695	padding => 4,
1449	fg => [1, 1, 1],	1696	fg => [1, 1, 1],
1450	bg => [1, 1, 1, 0.2],
1451	active_fg => [0, 0, 1],	1697	active_fg => [0, 0, 1],
1452	can_hover => 1,	1698	can_hover => 1,
1453	align => 0,	1699	align => 0,
1454	valign => 0,	1700	valign => 0,
1455	can_events => 1,	1701	can_events => 1,
1456	@_	1702	@_
1457	)	1703	)
1458	}	1704	}
1459		1705
…		…
1473		1719
1474	if ($GRAB == $self) {	1720	if ($GRAB == $self) {
1475	$self->{fg} = $self->{active_fg};	1721	$self->{fg} = $self->{active_fg};
1476	}	1722	}
1477		1723
1478	glEnable GL_BLEND;
1479	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480	glEnable GL_TEXTURE_2D;	1724	glEnable GL_TEXTURE_2D;
1481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1725	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482	glColor 0, 0, 0, 1;	1726	glColor 0, 0, 0, 1;
1483		1727
1484	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1728	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485		1729
1486	glDisable GL_TEXTURE_2D;	1730	glDisable GL_TEXTURE_2D;
1487	glDisable GL_BLEND;
1488		1731
1489	$self->SUPER::_draw;	1732	$self->SUPER::_draw;
1490	}	1733	}
1491		1734
1492	#############################################################################	1735	#############################################################################
…		…
1506		1749
1507	$class->SUPER::new (	1750	$class->SUPER::new (
1508	padding => 2,	1751	padding => 2,
1509	fg => [1, 1, 1],	1752	fg => [1, 1, 1],
1510	active_fg => [1, 1, 0],	1753	active_fg => [1, 1, 0],
		1754	bg => [0, 0, 0, 0.2],
		1755	active_bg => [1, 1, 1, 0.5],
1511	state => 0,	1756	state => 0,
1512	can_hover => 1,	1757	can_hover => 1,
1513	@_	1758	@_
1514	)	1759	)
1515	}	1760	}
…		…
1539		1784
1540	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541		1786
1542	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543		1788
1544	glEnable GL_BLEND;	1789	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1790
1545	glEnable GL_TEXTURE_2D;	1791	glEnable GL_TEXTURE_2D;
1546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548	my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550	$tex->draw_quad (0, 0, $s, $s);	1792	$tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552	glDisable GL_TEXTURE_2D;	1793	glDisable GL_TEXTURE_2D;
1553	glDisable GL_BLEND;
1554	}	1794	}
1555		1795
1556	#############################################################################	1796	#############################################################################
1557		1797
1558	package CFClient::UI::Image;	1798	package CFClient::UI::Image;
…		…
1601	glTranslate 0, -$self->{w}, 0;	1841	glTranslate 0, -$self->{w}, 0;
1602		1842
1603	($w, $h) = ($h, $w);	1843	($w, $h) = ($h, $w);
1604	}	1844	}
1605		1845
1606	glEnable GL_BLEND;
1607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608	glEnable GL_TEXTURE_2D;	1846	glEnable GL_TEXTURE_2D;
1609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610		1848
1611	$tex->draw_quad (0, 0, $w, $h);	1849	$tex->draw_quad_alpha (0, 0, $w, $h);
1612		1850
1613	glDisable GL_BLEND;
1614	glDisable GL_TEXTURE_2D;	1851	glDisable GL_TEXTURE_2D;
1615	}	1852	}
1616		1853
1617	#############################################################################	1854	#############################################################################
1618		1855
…		…
1666	}	1903	}
1667		1904
1668	sub set_max {	1905	sub set_max {
1669	my ($self, $max) = @_;	1906	my ($self, $max) = @_;
1670		1907
		1908	return if $self->{max_val} == $max;
		1909
1671	$self->{max_val} = $max;	1910	$self->{max_val} = $max;
		1911	$self->update;
1672	}	1912	}
1673		1913
1674	sub set_value {	1914	sub set_value {
1675	my ($self, $val, $max) = @_;	1915	my ($self, $val, $max) = @_;
1676		1916
1677	$self->set_max ($max)	1917	$self->set_max ($max)
1678	if defined $max;	1918	if defined $max;
1679		1919
1680	$max = $self->{max_val};	1920	return if $self->{val} == $val;
		1921
1681	$self->{val} = $val;	1922	$self->{val} = $val;
1682
1683	$self->update;	1923	$self->update;
1684	}	1924	}
1685		1925
1686	sub _draw {	1926	sub _draw {
1687	my ($self) = @_;	1927	my ($self) = @_;
…		…
1750		1990
1751	sub new {	1991	sub new {
1752	my ($class, %arg) = @_;	1992	my ($class, %arg) = @_;
1753		1993
1754	my $self = $class->SUPER::new (	1994	my $self = $class->SUPER::new (
1755	tooltip => $arg{type},	1995	tooltip => $arg{type},
		1996	can_hover => 1,
1756	can_events => 1,	1997	can_events => 1,
1757	can_hover => 1,
1758	%arg,	1998	%arg,
1759	);	1999	);
1760		2000
1761	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2001	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2002	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1770		2010
1771	$self->{value}->set_fontsize ($fsize);	2011	$self->{value}->set_fontsize ($fsize);
1772	$self->{max} ->set_fontsize ($fsize);	2012	$self->{max} ->set_fontsize ($fsize);
1773	}	2013	}
1774		2014
		2015	sub set_max {
		2016	my ($self, $max) = @_;
		2017
		2018	$self->{gauge}->set_max ($max);
		2019	$self->{max}->set_text ($max);
		2020	}
		2021
1775	sub set_value {	2022	sub set_value {
1776	my ($self, $val, $max) = @_;	2023	my ($self, $val, $max) = @_;
1777		2024
1778	$self->set_max ($max)	2025	$self->set_max ($max)
1779	if defined $max;	2026	if defined $max;
1780		2027
1781	$self->{gauge}->set_value ($val, $max);	2028	$self->{gauge}->set_value ($val, $max);
1782	$self->{value}->set_text ($val);	2029	$self->{value}->set_text ($val);
1783	}
1784
1785	sub set_max {
1786	my ($self, $max) = @_;
1787
1788	$self->{gauge}->set_max ($max);
1789	$self->{max}->set_text ($max);
1790	}	2030	}
1791		2031
1792	#############################################################################	2032	#############################################################################
1793		2033
1794	package CFClient::UI::Slider;	2034	package CFClient::UI::Slider;
…		…
1804	qw(s1_slider.png s1_slider_bg.png);	2044	qw(s1_slider.png s1_slider_bg.png);
1805		2045
1806	sub new {	2046	sub new {
1807	my $class = shift;	2047	my $class = shift;
1808		2048
1809	# range [value, low, high, page]	2049	# range [value, low, high, page, unit]
1810		2050
1811	# TODO: 0-width page	2051	# TODO: 0-width page
1812	# TODO: req_w/h are wrong with vertical	2052	# TODO: req_w/h are wrong with vertical
1813	# TODO: calculations are off	2053	# TODO: calculations are off
1814	my $self = $class->SUPER::new (	2054	my $self = $class->SUPER::new (
1815	fg => [1, 1, 1],	2055	fg => [1, 1, 1],
1816	active_fg => [0, 0, 0],	2056	active_fg => [0, 0, 0],
		2057	bg => [0, 0, 0, 0.2],
		2058	active_bg => [1, 1, 1, 0.5],
1817	range => [0, 0, 100, 10],	2059	range => [0, 0, 100, 10],
1818	req_w => 20,	2060	req_w => $::WIDTH / 80,
1819	req_h => 20,	2061	req_h => $::WIDTH / 80,
1820	vertical => 0,	2062	vertical => 0,
1821	can_hover => 1,	2063	can_hover => 1,
1822	inner_pad => 5,	2064	inner_pad => 0.02,
1823	@_	2065	@_
1824	);	2066	);
1825		2067
		2068	$self->set_value ($self->{range}[0]);
		2069	$self->update;
		2070
1826	$self	2071	$self
		2072	}
		2073
		2074	sub set_value {
		2075	my ($self, $value) = @_;
		2076
		2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2078
		2079	$hi = $lo + 1 if $hi <= $lo;
		2080
		2081	$value = $lo if $value < $lo;
		2082	$value = $hi if $value > $hi;
		2083
		2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2085	if $unit;
		2086
		2087	$page = $hi - $lo if $page > $hi - $lo;
		2088
		2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2090
		2091	if ($value != $old_value) {
		2092	$self->emit (changed => $value);
		2093	$self->update;
		2094	}
1827	}	2095	}
1828		2096
1829	sub size_request {	2097	sub size_request {
1830	my ($self) = @_;	2098	my ($self) = @_;
1831		2099
…		…
1844		2112
1845	sub mouse_motion {	2113	sub mouse_motion {
1846	my ($self, $ev, $x, $y) = @_;	2114	my ($self, $ev, $x, $y) = @_;
1847		2115
1848	if ($GRAB == $self) {	2116	if ($GRAB == $self) {
		2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2118
		2119	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2120
		2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2122
		2123	$self->set_value ($x * ($hi - $lo) + $lo);
		2124	}
		2125	}
		2126
		2127	sub update {
		2128	my ($self) = @_;
		2129
		2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2131	$self->set_value ($self->{range}[0]);
		2132
1849	my ($value, $lo, $hi, $page) = @{$self->{range}};	2133	my ($value, $lo, $hi, $page) = @{$self->{range}};
1850		2134
1851	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2135	my $inner_w = 1 - 2 * $self->{inner_pad};
1852		2136
1853	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1854	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1855		2138
1856	$x -= $inner_pad_px; # substract the padding	2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1857	$x = $x * ($hi - $lo) / $inner_w + $lo;	2140	$value = $self->{scale} * ($value - $lo);
1858	$x = $lo if $x < $lo;
1859	$x = $hi - $page if $x > $hi - $page;
1860	$self->{range}[0] = $x;
1861		2141
1862	$self->emit (changed => $x);	2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
1863	$self->update;	2143
		2144	$value = 0 if $value < 0;
		2145	$page = 1 - $value if $value + $page > 1;
		2146
		2147	$self->{knob_x} = $value;
		2148	$self->{knob_w} = $page;
1864	}	2149	});
1865	}
1866		2150
1867	# the inner_* stuff is for generating a padding for the slider handle,	2151	$self->SUPER::update;
1868	# so that the handle doesn't leave the texture. This calculation isn't 100%
1869	# correct propably, but it does the job for now
1870	sub _calc_inner_pad_px {
1871	my ($self, $w) = @_;
1872	($w / 100) * $self->{inner_pad} # % to pixels
1873	}	2152	}
1874		2153
1875	sub _draw {	2154	sub _draw {
1876	my ($self) = @_;	2155	my ($self) = @_;
1877		2156
1878	$self->SUPER::_draw ();	2157	$self->SUPER::_draw ();
1879		2158
1880	my ($w, $h) = @$self{qw(w h)};	2159	glScale $self->{w}, $self->{h};
1881		2160
1882	if ($self->{vertical}) {	2161	if ($self->{vertical}) {
1883	# draw a vertical slider like a rotated horizontal slider	2162	# draw a vertical slider like a rotated horizontal slider
1884		2163
		2164	glTranslate 1, 0, 0;
1885	glRotate 90, 0, 0, 1;	2165	glRotate 90, 0, 0, 1;
1886	glTranslate 0, -$self->{w}, 0;
1887
1888	($w, $h) = ($h, $w);
1889	}	2166	}
1890		2167
1891	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2168	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2169	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893		2170
1894	my ($value, $lo, $hi, $page) = @{$self->{range}};
1895
1896	$hi = $value + 1 if $lo == $hi;
1897
1898	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1899	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1900
1901	$page = int $page * $inner_w / ($hi - $lo);
1902	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1903
1904	$w -= $page;
1905	$page &= ~1;
1906	glTranslate $page * 0.5, 0, 0;
1907	$page ||= 2;
1908
1909	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911
1912	glEnable GL_BLEND;
1913	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914	glEnable GL_TEXTURE_2D;	2171	glEnable GL_TEXTURE_2D;
1915	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2172	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916		2173
1917	# draw background	2174	# draw background
1918	$tex[1]->draw_quad (0, 0, $w, $h);	2175	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919		2176
1920	# draw handle	2177	# draw handle
1921	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1922		2179
1923	glDisable GL_BLEND;
1924	glDisable GL_TEXTURE_2D;	2180	glDisable GL_TEXTURE_2D;
1925	}	2181	}
1926		2182
1927	#############################################################################	2183	#############################################################################
1928		2184
…		…
1934		2190
1935	sub new {	2191	sub new {
1936	my $class = shift;	2192	my $class = shift;
1937		2193
1938	my $self = $class->SUPER::new (	2194	my $self = $class->SUPER::new (
1939	fontsize => 1,	2195	fontsize => 1,
		2196	can_events => 0,
1940	#font => default_font	2197	#font => default_font
1941	@_,	2198	@_,
1942		2199
1943	layout => (new CFClient::Layout),	2200	layout => (new CFClient::Layout 1),
1944	par => [],	2201	par => [],
1945	height => 0,	2202	height => 0,
1946	children => [	2203	children => [
1947	(new CFClient::UI::Empty expand => 1),	2204	(new CFClient::UI::Empty expand => 1),
1948	(new CFClient::UI::Slider vertical => 1),	2205	(new CFClient::UI::Slider vertical => 1),
1949	],	2206	],
1950	);	2207	);
1951		2208
1952	$self->{children}[1]->connect (changed => sub {	2209	$self->{children}[1]->connect (changed => sub { $self->update });
1953	$self->update;
1954	});
1955		2210
1956	$self	2211	$self
1957	}	2212	}
1958		2213
1959	sub set_fontsize {	2214	sub set_fontsize {
1960	my ($self, $fontsize) = @_;	2215	my ($self, $fontsize) = @_;
1961		2216
1962	$self->{fontsize} = $fontsize;	2217	$self->{fontsize} = $fontsize;
1963	$self->reflow;	2218	$self->reflow;
1964	}
1965
1966	sub text_height {
1967	my ($self, $text) = @_;
1968
1969	my $layout = $self->{layout};
1970
1971	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972	$layout->set_width ($self->{w});
1973	$layout->set_text ($text);
1974
1975	($layout->size)[1]
1976	}
1977
1978	sub reflow {
1979	my ($self) = @_;
1980
1981	$self->{need_reflow}++;
1982	$self->update;
1983	}	2219	}
1984		2220
1985	sub size_allocate {	2221	sub size_allocate {
1986	my ($self, $w, $h) = @_;	2222	my ($self, $w, $h) = @_;
1987		2223
…		…
1992	$self->{layout}->set_width ($self->{children}[0]{w});	2228	$self->{layout}->set_width ($self->{children}[0]{w});
1993		2229
1994	$self->reflow;	2230	$self->reflow;
1995	}	2231	}
1996		2232
		2233	sub text_height {
		2234	my ($self, $text, $indent) = @_;
		2235
		2236	my $layout = $self->{layout};
		2237
		2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2239	$layout->set_width ($self->{children}[0]{w} - $indent);
		2240	$layout->set_markup ($text);
		2241
		2242	($layout->size)[1]
		2243	}
		2244
		2245	sub reflow {
		2246	my ($self) = @_;
		2247
		2248	$self->{need_reflow}++;
		2249	$self->update;
		2250	}
		2251
1997	sub add_paragraph {	2252	sub add_paragraph {
1998	my ($self, $color, $text) = @_;	2253	my ($self, $color, $text, $indent) = @_;
1999		2254
2000	#TODO: intelligently "reformat" paragraph	2255	#TODO: intelligently "reformat" paragraph
2001		2256
		2257	for my $line (split /\n/, $text) {
2002	my $height = $self->text_height ($text);	2258	my $height = $self->text_height ($line);
2003
2004	$self->{height} += $height;	2259	$self->{height} += $height;
2005
2006	push @{$self->{par}}, [$height, $color, $text];	2260	push @{$self->{par}}, [$height, $color, $indent, $line];
		2261	}
2007		2262
2008	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2009	$self->{children}[1]->update;	2264	$self->{children}[1]->update;
2010	}	2265	}
2011		2266
…		…
2016		2271
2017	return unless $self->{h} > 0;	2272	return unless $self->{h} > 0;
2018		2273
2019	delete $self->{texture};	2274	delete $self->{texture};
2020		2275
2021	$ROOT->on_refresh ($self, sub {	2276	$ROOT->on_post_alloc ($self, sub {
2022	if (delete $self->{need_reflow}) {	2277	if (delete $self->{need_reflow}) {
2023	my $height = 0;	2278	my $height = 0;
2024		2279
2025	$height += $_->[0] = $self->text_height ($_->[2])	2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2026	for @{$self->{par}};	2281	for @{$self->{par}};
2027		2282
2028	$self->{height} = $height;	2283	$self->{height} = $height;
2029		2284
2030	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2286	$self->{children}[1]->update;
2031		2287
2032	delete $self->{texture};	2288	delete $self->{texture};
2033	}	2289	}
2034		2290
2035	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2036	glClearColor 0, 0, 0, 1;	2292	glClearColor 0.5, 0.5, 0.5, 0;
2037	glClear GL_COLOR_BUFFER_BIT;	2293	glClear GL_COLOR_BUFFER_BIT;
2038
2039	glEnable GL_BLEND;
2040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041	glEnable GL_TEXTURE_2D;
2042	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043		2294
2044	my $top = int $self->{children}[1]{range}[0];	2295	my $top = int $self->{children}[1]{range}[0];
2045		2296
2046	my $y0 = $top;	2297	my $y0 = $top;
2047	my $y1 = $top + $self->{h};	2298	my $y1 = $top + $self->{h};
…		…
2050		2301
2051	my $layout = $self->{layout};	2302	my $layout = $self->{layout};
2052		2303
2053	$layout->set_font ($self->{font}) if $self->{font};	2304	$layout->set_font ($self->{font}) if $self->{font};
2054		2305
		2306	glEnable GL_BLEND;
		2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2308
2055	for my $par (@{$self->{par}}) {	2309	for my $par (@{$self->{par}}) {
2056	my $h = $par->[0];	2310	my $h = $par->[0];
2057		2311
2058	if ($y0 < $y + $h && $y < $y1) {	2312	if ($y0 < $y + $h && $y < $y1) {
		2313	$layout->set_foreground (@{ $par->[1] });
		2314	$layout->set_width ($self->{w} - $par->[2]);
2059	$layout->set_text ($par->[2]);	2315	$layout->set_markup ($par->[3]);
2060		2316
2061	glColor @{ $par->[1] };	2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062	my ($W, $H) = $layout->size;	2318
2063	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2319	glRasterPos $par->[2], $y - $y0;
		2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2064	}	2321	}
2065		2322
2066	$y += $h;	2323	$y += $h;
2067	}	2324	}
2068		2325
2069	glDisable GL_TEXTURE_2D;
2070	glDisable GL_BLEND;	2326	glDisable GL_BLEND;
2071	};	2327	};
2072	});	2328	});
2073	}	2329	}
2074		2330
2075	sub _draw {	2331	sub _draw {
2076	my ($self) = @_;	2332	my ($self) = @_;
2077		2333
2078	if ($self->{texture}) {
2079	glEnable GL_TEXTURE_2D;	2334	glEnable GL_TEXTURE_2D;
2080	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2336	glColor 1, 1, 1, 1;
2081	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2337	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
2083	}
2084		2339
2085	$self->{children}[1]->draw;	2340	$self->{children}[1]->draw;
2086		2341
2087	}	2342	}
2088		2343
…		…
2136		2391
2137	sub new {	2392	sub new {
2138	my $class = shift;	2393	my $class = shift;
2139		2394
2140	my $self = $class->SUPER::new (	2395	my $self = $class->SUPER::new (
2141	state => 0,	2396	state => 0,
2142	connect_activate => \&toggle_flopper,	2397	connect_activate => \&toggle_flopper,
2143	can_events => 1,
2144	@_	2398	@_
2145	);	2399	);
2146		2400
2147	if ($self->{state}) {	2401	if ($self->{state}) {
2148	$self->{state} = 0;	2402	$self->{state} = 0;
…		…
2183	@_,	2437	@_,
2184	can_events => 0,	2438	can_events => 0,
2185	)	2439	)
2186	}	2440	}
2187		2441
2188	sub set_text {	2442	sub set_tooltip_from {
2189	my ($self, $text) = @_;	2443	my ($self, $widget) = @_;
2190		2444
2191	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2445	$self->add (new CFClient::UI::Label
2192	$self->{label}->set_text ($text);	2446	markup => $widget->{tooltip},
2193	$self->add ($self->{label});	2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2448	fontsize => 0.8,
		2449	fg => [0, 0, 0, 1],
		2450	ellipsise => 0,
		2451	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2452	);
2194	}	2453	}
2195		2454
2196	sub size_request {	2455	sub size_request {
2197	my ($self) = @_;	2456	my ($self) = @_;
2198		2457
2199	$self->child->set_max_size ($::WIDTH * 0.3);
2200
2201	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2458	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202		2459
2203	($w + 4, $h + 4)	2460	($w + 4, $h + 4)
2204	}	2461	}
2205		2462
		2463	sub size_allocate {
		2464	my ($self, $w, $h) = @_;
		2465
		2466	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2467	}
		2468
2206	sub _draw {	2469	sub _draw {
2207	my ($self) = @_;	2470	my ($self) = @_;
2208		2471
2209	glPushMatrix;
2210	glTranslate 0.375, 0.375;	2472	glTranslate 0.375, 0.375;
2211		2473
2212	my ($w, $h) = @$self{qw(w h)};	2474	my ($w, $h) = @$self{qw(w h)};
2213		2475
2214	glColor 1, 0.8, 0.4;	2476	glColor 1, 0.8, 0.4;
…		…
2225	glVertex 0 , $h;	2487	glVertex 0 , $h;
2226	glVertex $w, $h;	2488	glVertex $w, $h;
2227	glVertex $w, 0;	2489	glVertex $w, 0;
2228	glEnd;	2490	glEnd;
2229		2491
2230	glPopMatrix;	2492	glTranslate 2 - 0.375, 2 - 0.375;
2231
2232	glTranslate 2, 2;
2233	$self->SUPER::_draw;	2493	$self->SUPER::_draw;
2234	}	2494	}
2235		2495
2236	#############################################################################	2496	#############################################################################
2237		2497
		2498	package CFClient::UI::Face;
		2499
		2500	our @ISA = CFClient::UI::Base::;
		2501
		2502	use CFClient::OpenGL;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	my $self = $class->SUPER::new (
		2508	aspect => 1,
		2509	@_,
		2510	);
		2511
		2512	if ($self->{anim} && $self->{animspeed}) {
		2513	Scalar::Util::weaken (my $widget = $self);
		2514
		2515	$self->{timer} = Event->timer (
		2516	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2517	hard => 1,
		2518	interval => $self->{animspeed},
		2519	cb => sub {
		2520	++$widget->{frame};
		2521	$widget->update;
		2522	},
		2523	);
		2524	}
		2525
		2526	$self
		2527	}
		2528
		2529	sub size_request {
		2530	(32, 8)
		2531	}
		2532
		2533	sub update {
		2534	my ($self) = @_;
		2535
		2536	return unless $self->{visible};
		2537
		2538	$self->SUPER::update;
		2539	}
		2540
		2541	sub _draw {
		2542	my ($self) = @_;
		2543
		2544	return unless $::CONN;#d# manage and cache textures differently
		2545
		2546	my $face;
		2547
		2548	if ($self->{frame}) {
		2549	my $anim = $::CONN->{anim}[$self->{anim}];
		2550
		2551	$face = $anim->[ $self->{frame} % @$anim ]
		2552	if $anim && @$anim;
		2553	}
		2554
		2555	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
		2556
		2557	if ($tex) {
		2558	glEnable GL_TEXTURE_2D;
		2559	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2560	glColor 1, 1, 1, 1;
		2561	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2562	glDisable GL_TEXTURE_2D;
		2563	}
		2564	}
		2565
		2566	sub DESTROY {
		2567	my ($self) = @_;
		2568
		2569	$self->{timer}->cancel
		2570	if $self->{timer};
		2571
		2572	$self->SUPER::DESTROY;
		2573	}
		2574
		2575	#############################################################################
		2576
		2577	package CFClient::UI::InventoryItem;
		2578
		2579	our @ISA = CFClient::UI::HBox::;
		2580
		2581	sub _item_to_desc {
		2582	my ($item) = @_;
		2583
		2584	my $desc =
		2585	$item->{nrof} < 2
		2586	? $item->{name}
		2587	: "$item->{nrof} × $item->{name_pl}";
		2588
		2589	$item->{flags} & Crossfire::Protocol::F_OPEN
		2590	and $desc .= " (open)";
		2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2592	and $desc .= " (applied)";
		2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2594	and $desc .= " (unpaid)";
		2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2596	and $desc .= " (magic)";
		2597	$item->{flags} & Crossfire::Protocol::F_CURSED
		2598	and $desc .= " (cursed)";
		2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2600	and $desc .= " (damned)";
		2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2602	and $desc .= " *";
		2603
		2604	$desc
		2605	}
		2606
		2607	sub new {
		2608	my $class = shift;
		2609
		2610	my %args = @_;
		2611
		2612	my $item = delete $args{item};
		2613
		2614	my $desc = _item_to_desc ($item);
		2615
		2616	my $self = $class->SUPER::new (
		2617	can_hover => 1,
		2618	can_events => 1,
		2619	tooltip => ((CFClient::UI::Label::escape $desc)
		2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2621	connect_button_down => sub {
		2622	my ($self, $ev, $x, $y) = @_;
		2623
		2624	# todo: maybe put examine on 1? but should just be a tooltip :(
		2625	if ($ev->{button} == 1) {
		2626	my $targ = $::CONN->{player}{tag};
		2627
		2628	if ($item->{container} == $::CONN->{player}{tag}) {
		2629	$targ = $main::OPENCONT;
		2630	}
		2631
		2632	$::CONN->send ("move $targ $item->{tag} 0");
		2633	} elsif ($ev->{button} == 2) {
		2634	$::CONN->send ("apply $item->{tag}");
		2635	} elsif ($ev->{button} == 3) {
		2636	my @menu_items = (
		2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2640	(
		2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2642	? (
		2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2644	)
		2645	: (
		2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2648	)
		2649	),
		2650	);
		2651
		2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2653	}
		2654
		2655	1
		2656	},
		2657	%args
		2658	);
		2659
		2660
		2661	$self->add (new CFClient::UI::Face
		2662	can_events => 0,
		2663	face => $item->{face},
		2664	anim => $item->{anim},
		2665	animspeed => $item->{animspeed},
		2666	);
		2667
		2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2669
		2670	$self->{item} = $item;
		2671
		2672	$self->update_item;
		2673
		2674	$self
		2675	}
		2676
		2677	sub update_item {
		2678	my ($self) = @_;
		2679
		2680	my $desc = _item_to_desc ($self->{item});
		2681
		2682	$self->{name_lbl}->set_text ($desc);
		2683	}
		2684
		2685	#############################################################################
		2686
		2687	package CFClient::UI::Inventory;
		2688
		2689	our @ISA = CFClient::UI::ScrolledWindow::;
		2690
		2691	sub new {
		2692	my $class = shift;
		2693
		2694	my $self = $class->SUPER::new (
		2695	scrolled => (new CFClient::UI::VBox),
		2696	@_,
		2697	);
		2698
		2699	$self
		2700	}
		2701
		2702	sub set_items {
		2703	my ($self, $items) = @_;
		2704
		2705	$self->{scrolled}->clear;
		2706	return unless $items;
		2707
		2708	my @items = sort {
		2709	($a->{type} <=> $b->{type})
		2710	or ($a->{name} cmp $b->{name})
		2711	} @$items;
		2712
		2713	$self->{real_items} = \@items;
		2714
		2715	for my $item (@items) {
		2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2717	$item->update_item ();
		2718	}
		2719
		2720	$self->{scrolled}->add (@items);
		2721
		2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2723	}
		2724
		2725	sub size_request {
		2726	my ($self) = @_;
		2727	($self->{req_w}, $self->{req_h});
		2728	}
		2729
		2730	#############################################################################
		2731
		2732	package CFClient::UI::Menu;
		2733
		2734	our @ISA = CFClient::UI::FancyFrame::;
		2735
		2736	use CFClient::OpenGL;
		2737
		2738	sub new {
		2739	my $class = shift;
		2740
		2741	my $self = $class->SUPER::new (
		2742	items => [],
		2743	z => 100,
		2744	@_,
		2745	);
		2746
		2747	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2748
		2749	for my $item (@{ $self->{items} }) {
		2750	my ($widget, $cb) = @$item;
		2751
		2752	# handle various types of items, only text for now
		2753	if (!ref $widget) {
		2754	$widget = new CFClient::UI::Label
		2755	can_hover => 1,
		2756	can_events => 1,
		2757	text => $widget;
		2758	}
		2759
		2760	$self->{item}{$widget} = $item;
		2761
		2762	$self->{vbox}->add ($widget);
		2763	}
		2764
		2765	$self
		2766	}
		2767
		2768	# popup given the event (must be a mouse button down event currently)
		2769	sub popup {
		2770	my ($self, $ev) = @_;
		2771
		2772	$self->emit ("popdown");
		2773
		2774	# maybe save $GRAB? must be careful about events...
		2775	$GRAB = $self;
		2776	$self->{button} = $ev->{button};
		2777
		2778	$self->show;
		2779	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2780	}
		2781
		2782	sub mouse_motion {
		2783	my ($self, $ev, $x, $y) = @_;
		2784
		2785	# TODO: should use vbox->find_widget or so
		2786	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2787	$self->{hover} = $self->{item}{$HOVER};
		2788	}
		2789
		2790	sub button_up {
		2791	my ($self, $ev, $x, $y) = @_;
		2792
		2793	if ($ev->{button} == $self->{button}) {
		2794	undef $GRAB;
		2795	$self->hide;
		2796
		2797	$self->emit ("popdown");
		2798	$self->{hover}[1]->() if $self->{hover};
		2799	}
		2800	}
		2801
		2802	#############################################################################
		2803
		2804	package CFClient::UI::Statusbox;
		2805
		2806	our @ISA = CFClient::UI::VBox::;
		2807
		2808	sub new {
		2809	my $class = shift;
		2810
		2811	$class->SUPER::new (
		2812	fontsize => 0.8,
		2813	@_,
		2814	)
		2815	}
		2816
		2817	sub reorder {
		2818	my ($self) = @_;
		2819	my $NOW = time;
		2820
		2821	while (my ($k, $v) = each %{ $self->{item} }) {
		2822	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2823	}
		2824
		2825	my @widgets;
		2826
		2827	my @items = sort {
		2828	$a->{pri} <=> $b->{pri}
		2829	or $b->{id} <=> $a->{id}
		2830	} values %{ $self->{item} };
		2831
		2832	my $count = 10 + 1;
		2833	for my $item (@items) {
		2834	last unless --$count;
		2835
		2836	push @widgets, $item->{label} ||= do {
		2837	# TODO: doesn't handle markup well (read as: at all)
		2838	my $short = $item->{count} > 1
		2839	? "<b>$item->{count} ×</b> $item->{text}"
		2840	: $item->{text};
		2841
		2842	for ($short) {
		2843	s/^\s+//;
		2844	s/\s+/ /g;
		2845	}
		2846
		2847	new CFClient::UI::Label
		2848	markup => $short,
		2849	tooltip => $item->{tooltip},
		2850	tooltip_font => $::FONT_PROP,
		2851	tooltip_width => 0.67,
		2852	fontsize => $item->{fontsize} || $self->{fontsize},
		2853	max_w => $::WIDTH * 0.44,
		2854	fg => $item->{fg},
		2855	can_events => 1,
		2856	can_hover => 1
		2857	};
		2858	}
		2859
		2860	$self->clear;
		2861	$self->SUPER::add (reverse @widgets);
		2862	}
		2863
		2864	sub add {
		2865	my ($self, $text, %arg) = @_;
		2866
		2867	$text =~ s/^\s+//;
		2868	$text =~ s/\s+$//;
		2869
		2870	my $timeout = time + ((delete $arg{timeout}) || 60);
		2871
		2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2873
		2874	if (my $item = $self->{item}{$group}) {
		2875	if ($item->{text} eq $text) {
		2876	$item->{count}++;
		2877	} else {
		2878	$item->{count} = 1;
		2879	$item->{text} = $item->{tooltip} = $text;
		2880	}
		2881	$item->{id} = ++$self->{id};
		2882	$item->{timeout} = $timeout;
		2883	delete $item->{label};
		2884	} else {
		2885	$self->{item}{$group} = {
		2886	id => ++$self->{id},
		2887	text => $text,
		2888	timeout => $timeout,
		2889	tooltip => $text,
		2890	fg => [0.8, 0.8, 0.8, 0.8],
		2891	pri => 0,
		2892	count => 1,
		2893	%arg,
		2894	};
		2895	}
		2896
		2897	$self->reorder;
		2898	}
		2899
		2900	sub reconfigure {
		2901	my ($self) = @_;
		2902
		2903	delete $_->{label}
		2904	for values %{ $self->{item} || {} };
		2905
		2906	$self->reorder;
		2907	$self->SUPER::reconfigure;
		2908	}
		2909
		2910	#############################################################################
		2911
2238	package CFClient::UI::Root;	2912	package CFClient::UI::Root;
2239		2913
2240	our @ISA = CFClient::UI::Container::;	2914	our @ISA = CFClient::UI::Container::;
2241		2915
2242	use CFClient::OpenGL;	2916	use CFClient::OpenGL;
2243		2917
2244	sub check_size {	2918	sub new {
2245	my ($self) = @_;	2919	my $class = shift;
2246		2920
2247	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2921	$class->SUPER::new (
2248	}	2922	@_,
2249		2923	)
2250	sub size_request {
2251	($::WIDTH, $::HEIGHT)
2252	}	2924	}
2253		2925
2254	sub configure {	2926	sub configure {
2255	my ($self, $x, $y, $w, $h) = @_;	2927	my ($self, $x, $y, $w, $h) = @_;
2256		2928
2257	$self->SUPER::configure ($x, $y, $w, $h);	2929	$self->{w} = $w;
		2930	$self->{h} = $h;
		2931	}
2258		2932
		2933	sub check_size {
		2934	my ($self) = @_;
		2935
		2936	$self->size_allocate ($self->{w}, $self->{h})
		2937	if $self->{w};
		2938	}
		2939
		2940	sub size_request {
		2941	my ($self) = @_;
		2942
		2943	($self->{w}, $self->{h})
		2944	}
		2945
		2946	sub size_allocate {
		2947	my ($self, $w, $h) = @_;
		2948
		2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2951
		2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2954
2259	for my $child (@{$self->{children}}) {	2955	for my $child ($self->children) {
2260	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261		2957
		2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2959	if exists $child->{req_x};
		2960
		2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2962	if exists $child->{req_y};
		2963
2262	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2263	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2966
2264	$child->configure ($X, $Y, $W,$H);	2967	$child->configure ($X, $Y, $W, $H);
2265	}	2968	}
2266	}	2969	}
2267		2970
2268	sub _topleft {	2971	sub coord2local {
2269	my ($self, $x, $y) = @_;	2972	my ($self, $x, $y) = @_;
2270		2973
2271	($x, $y)	2974	($x, $y)
2272	}	2975	}
2273		2976
		2977	sub coord2global {
		2978	my ($self, $x, $y) = @_;
		2979
		2980	($x, $y)
		2981	}
		2982
2274	sub update {	2983	sub update {
2275	my ($self) = @_;	2984	my ($self) = @_;
2276		2985
2277	$self->check_size;	2986	$self->check_size;
2278	::refresh ();	2987	$::WANT_REFRESH++;
2279	}	2988	}
2280		2989
2281	sub add {	2990	sub add {
2282	my ($self, $child) = @_;	2991	my ($self, @children) = @_;
2283		2992
		2993	for my $child (@children) {
		2994	$child->{toplevel} = 1;
		2995
2284	# integerize window positions	2996	# integerise window positions
2285	$child->{x} = int $child->{x};	2997	$child->{x} = int $child->{x};
2286	$child->{y} = int $child->{y};	2998	$child->{y} = int $child->{y};
		2999	}
2287		3000
2288	$self->SUPER::add ($child);	3001	$self->SUPER::add (@children);
		3002
		3003	while (@children) {
		3004	my $w = pop @children;
		3005	push @children, $w->children;
		3006	$w->{visible} = 1;
		3007	}
		3008	}
		3009
		3010	sub remove {
		3011	my ($self, @children) = @_;
		3012
		3013	$self->SUPER::remove (@children);
		3014
		3015	while (@children) {
		3016	my $w = pop @children;
		3017	push @children, $w->children;
		3018	delete $w->{visible};
		3019	}
2289	}	3020	}
2290		3021
2291	sub on_refresh {	3022	sub on_refresh {
2292	my ($self, $id, $cb) = @_;	3023	my ($self, $id, $cb) = @_;
2293		3024
2294	$self->{refresh_hook}{$id} = $cb;	3025	$self->{refresh_hook}{$id} = $cb;
2295	}	3026	}
2296		3027
		3028	sub on_post_alloc {
		3029	my ($self, $id, $cb) = @_;
		3030
		3031	$self->{post_alloc_hook}{$id} = $cb;
		3032	}
		3033
2297	sub draw {	3034	sub draw {
2298	my ($self) = @_;	3035	my ($self) = @_;
2299		3036
2300	while (my $rcb = delete $self->{refresh_hook}) {	3037	while ($self->{refresh_hook}) {
2301	$_->() for values %$rcb;	3038	$_->()
		3039	for values %{delete $self->{refresh_hook}};
		3040	}
		3041
		3042	if ($self->{check_size}) {
		3043	my @queue = ([], []);
		3044
		3045	for (;;) {
		3046	if ($self->{check_size}) {
		3047	# heuristic: check containers last
		3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3049	for values %{delete $self->{check_size}}
		3050	}
		3051
		3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3053
		3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3055	? @$widget{qw(user_w user_h)}
		3056	: $widget->size_request;
		3057
		3058	if (delete $widget->{force_alloc}
		3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3061
		3062	$widget->{req_w} = $w;
		3063	$widget->{req_h} = $h;
		3064
		3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3066
		3067	$widget->{parent}->check_size
		3068	if $widget->{parent};
		3069	}
		3070	}
		3071	}
		3072
		3073	while ($self->{size_alloc}) {
		3074	for (values %{delete $self->{size_alloc}}) {
		3075	my ($widget, $w, $h) = @$_;
		3076
		3077	$w = 0 if $w < 0;
		3078	$h = 0 if $h < 0;
		3079
		3080	$widget->{w} = $w;
		3081	$widget->{h} = $h;
		3082	$widget->size_allocate ($w, $h);
		3083	$widget->emit (size_allocate => $w, $h);
		3084	}
		3085	}
		3086
		3087	while ($self->{post_alloc_hook}) {
		3088	$_->()
		3089	for values %{delete $self->{post_alloc_hook}};
2302	}	3090	}
2303		3091
2304	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306	glClear GL_COLOR_BUFFER_BIT;	3094	glClear GL_COLOR_BUFFER_BIT;
2307		3095
2308	glMatrixMode GL_PROJECTION;	3096	glMatrixMode GL_PROJECTION;
2309	glLoadIdentity;	3097	glLoadIdentity;
2310	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311	glMatrixMode GL_MODELVIEW;	3099	glMatrixMode GL_MODELVIEW;
2312	glLoadIdentity;	3100	glLoadIdentity;
2313		3101
2314	$self->_draw;	3102	$self->_draw;
2315	}	3103	}
…		…
2317	#############################################################################	3105	#############################################################################
2318		3106
2319	package CFClient::UI;	3107	package CFClient::UI;
2320		3108
2321	$ROOT = new CFClient::UI::Root;	3109	$ROOT = new CFClient::UI::Root;
2322	$TOOLTIP = new CFClient::UI::Tooltip;	3110	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323		3111
2324	1	3112	1
2325		3113

Diff Legend

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