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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.203 by root, Sun May 14 21:13:11 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
8	use CFClient;	9	use CFClient;
9		10
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
		14	our $TOOLTIP;
13	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
		18
		19	sub check_tooltip {
		20	if (!$GRAB) {
		21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		22	if (length $widget->{tooltip}) {
		23
		24	if ($TOOLTIP->{owner} != $widget) {
		25	$TOOLTIP->{owner} = $widget;
		26
		27	my $tip = $widget->{tooltip};
		28
		29	$tip = $tip->($widget) if CODE:: eq ref $tip;
		30
		31	$TOOLTIP->set_tooltip_from ($widget);
		32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		38	}
		39
		40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
		43	}
		44
		45	return;
		46	}
		47	}
		48	}
		49
		50	$TOOLTIP->hide;
		51	delete $TOOLTIP->{owner};
		52	}
14		53
15	# class methods for events	54	# class methods for events
16	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		57	if $FOCUS;
18	}	58	}
19		59
20	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		62	if $FOCUS;
22	}	63	}
23		64
24	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	66	my ($ev) = @_;
26	my ($x, $y) = ($ev->{x}, $ev->{y});	67	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
28	if (!$BUTTON_STATE) {	69	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	70	my $widget = $ROOT->find_widget ($x, $y);
30		71
31	$GRAB = $widget;	72	$GRAB = $widget;
32	$GRAB->update if $GRAB;	73	$GRAB->update if $GRAB;
		74
		75	check_tooltip;
33	}	76	}
34		77
35	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		79
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	80	if ($GRAB) {
		81	($x, $y) = $GRAB->coord2local ($x, $y);
		82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		83	}
38	}	84	}
39		85
40	sub feed_sdl_button_up_event {	86	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	87	my ($ev) = @_;
42	my ($x, $y) = ($ev->{x}, $ev->{y});	88	my ($x, $y) = ($ev->{x}, $ev->{y});
43		89
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		91
46	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		93
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	94	if ($GRAB) {
		95	($x, $y) = $GRAB->coord2local ($x, $y);
		96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		97	}
49		98
50	if (!$BUTTON_STATE) {	99	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	100	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	101	$grab->update if $grab;
53	$GRAB->update if $GRAB;	102	$GRAB->update if $GRAB;
		103
		104	check_tooltip;
54	}	105	}
55	}	106	}
56		107
57	sub feed_sdl_motion_event {	108	sub feed_sdl_motion_event {
58	my ($ev) = @_;	109	my ($ev) = @_;
…		…
63	if ($widget != $HOVER) {	114	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	115	my $hover = $HOVER; $HOVER = $widget;
65		116
66	$hover->update if $hover && $hover->{can_hover};	117	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	118	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		119
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	120	check_tooltip;
		121	}
		122
		123	if ($HOVER) {
		124	($x, $y) = $HOVER->coord2local ($x, $y);
		125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		126	}
71	}	127	}
72		128
73	# convert position array to integers	129	# convert position array to integers
74	sub harmonize {	130	sub harmonize {
75	my ($vals) = @_;	131	my ($vals) = @_;
…		…
81	$rem += $_ - $i;	137	$rem += $_ - $i;
82	$_ = $i;	138	$_ = $i;
83	}	139	}
84	}	140	}
85		141
		142	# call when resolution changes etc.
		143	sub rescale_widgets {
		144	my ($sx, $sy) = @_;
		145
		146	for my $widget (values %WIDGET) {
		147	if ($widget->{toplevel}) {
		148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		156	}
		157
		158	$widget->reconfigure;
		159	}
		160	}
		161
86	#############################################################################	162	#############################################################################
87		163
88	package CFClient::UI::Base;	164	package CFClient::UI::Base;
89		165
90	use strict;	166	use strict;
…		…
93		169
94	sub new {	170	sub new {
95	my $class = shift;	171	my $class = shift;
96		172
97	my $self = bless {	173	my $self = bless {
98	x => 0,	174	x => 0,
99	y => 0,	175	y => 0,
100	z => 0,	176	z => 0,
		177	can_events => 1,
101	@_	178	@_
102	}, $class;	179	}, $class;
103		180
104	for (keys %$self) {	181	for (keys %$self) {
105	if (/^connect_(.*)$/) {	182	if (/^connect_(.*)$/) {
106	$self->connect ($1 => delete $self->{$_});	183	$self->connect ($1 => delete $self->{$_});
107	}	184	}
108	}	185	}
109		186
		187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		188
110	$self	189	$self
111	}	190	}
112		191
		192	sub destroy {
		193	my ($self) = @_;
		194
		195	$self->hide;
		196	%$self = ();
		197	}
		198
113	sub show {	199	sub show {
114	my ($self) = @_;	200	my ($self) = @_;
115		201
116	return if $self->{parent};	202	return if $self->{parent};
117		203
…		…
119	}	205	}
120		206
121	sub hide {	207	sub hide {
122	my ($self) = @_;	208	my ($self) = @_;
123		209
124	return unless $self->{parent};	210	undef $GRAB if $GRAB == $self;
		211	undef $HOVER if $HOVER == $self;
125		212
126	$self->{parent}->remove ($self);	213	$self->{parent}->remove ($self)
		214	if $self->{parent};
127	}	215	}
128		216
129	sub move {	217	sub move {
130	my ($self, $x, $y, $z) = @_;	218	my ($self, $x, $y, $z) = @_;
131		219
…		…
134	$self->{z} = $z if defined $z;	222	$self->{z} = $z if defined $z;
135		223
136	$self->update;	224	$self->update;
137	}	225	}
138		226
139	sub needs_redraw {	227	sub set_size {
140	0	228	my ($self, $w, $h) = @_;
		229
		230	$self->{user_w} = $w;
		231	$self->{user_h} = $h;
		232
		233	$self->check_size;
141	}	234	}
142		235
143	sub size_request {	236	sub size_request {
144	require Carp;	237	require Carp;
145	Carp::confess "size_request is abstract";	238	Carp::confess "size_request is abstract";
…		…
165	$self->{y} = $y;	258	$self->{y} = $y;
166	$self->update;	259	$self->update;
167	}	260	}
168		261
169	if ($self->{w} != $w || $self->{h} != $h) {	262	if ($self->{w} != $w || $self->{h} != $h) {
170	$self->{w} = $w;	263	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171	$self->{h} = $h;
172
173	$self->size_allocate ($w, $h);
174	$self->update;
175	}	264	}
176	}	265	}
177		266
178	sub size_allocate {	267	sub size_allocate {
179	# nothing to be done	268	# nothing to be done
180	}	269	}
181		270
182	# return top left coordinates	271	sub reconfigure {
183	sub _topleft {	272	my ($self) = @_;
		273
		274	$self->check_size (1);
		275	$self->update;
		276	}
		277
		278	sub children {
		279	}
		280
		281	sub set_max_size {
184	my ($self, $x, $y) = @_;	282	my ($self, $w, $h) = @_;
185		283
186	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	284	delete $self->{max_w}; $self->{max_w} = $w if $w;
		285	delete $self->{max_h}; $self->{max_h} = $h if $h;
187	}	286	}
188		287
189	# translate global coordinates to local coordinate system	288	# translate global coordinates to local coordinate system
190	sub coord2local {	289	sub coord2local {
191	my ($self, $x, $y) = @_;	290	my ($self, $x, $y) = @_;
192		291
193	my ($X, $Y) = $self->_topleft;	292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194	($x - $X, $y - $Y)
195	}	293	}
196		294
197	# translate local coordinates to global coordinate system	295	# translate local coordinates to global coordinate system
198	sub coord2global {	296	sub coord2global {
199	my ($self, $x, $y) = @_;	297	my ($self, $x, $y) = @_;
200		298
201	my ($X, $Y) = $self->_topleft;	299	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202	($x + $X, $y + $Y)
203	}	300	}
204		301
205	sub focus_in {	302	sub focus_in {
206	my ($self) = @_;	303	my ($self) = @_;
207		304
…		…
267	glVertex $x + $self->{w}, $y + $self->{h};	364	glVertex $x + $self->{w}, $y + $self->{h};
268	glVertex $x , $y + $self->{h};	365	glVertex $x , $y + $self->{h};
269	glEnd;	366	glEnd;
270	glDisable GL_BLEND;	367	glDisable GL_BLEND;
271	}	368	}
		369
		370	if ($ENV{PCLIENT_DEBUG}) {
		371	glPushMatrix;
		372	glColor 1, 1, 0, 1;
		373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		374	glBegin GL_LINE_LOOP;
		375	glVertex 0 , 0;
		376	glVertex $self->{w}, 0;
		377	glVertex $self->{w}, $self->{h};
		378	glVertex 0 , $self->{h};
		379	glEnd;
		380	glPopMatrix;
		381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		382	}
272	}	383	}
273		384
274	sub _draw {	385	sub _draw {
275	my ($self) = @_;	386	my ($self) = @_;
276		387
277	warn "no draw defined for $self\n";	388	warn "no draw defined for $self\n";
278	}	389	}
279		390
280	sub find_widget {	391	sub find_widget {
281	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
		393
		394	return () unless $self->{can_events};
282		395
283	return $self	396	return $self
284	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	397	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	398	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
286		399
…		…
289		402
290	sub set_parent {	403	sub set_parent {
291	my ($self, $parent) = @_;	404	my ($self, $parent) = @_;
292		405
293	Scalar::Util::weaken ($self->{parent} = $parent);	406	Scalar::Util::weaken ($self->{parent} = $parent);
		407
		408	# TODO: req_w _does_change after ->reconfigure
		409	$self->check_size
		410	unless exists $self->{req_w};
294	}	411	}
295		412
296	sub check_size {	413	sub check_size {
297	my ($self) = @_;	414	my ($self, $forced) = @_;
298		415
299	my ($w, $h) = $self->size_request;	416	$self->{force_alloc} = 1 if $forced;
300		417	$CFClient::UI::ROOT->{check_size}{$self} = $self;
301	if ($w != $self->{req_w} || $h != $self->{req_h}) {
302	$self->{req_w} = $w;
303	$self->{req_h} = $h;
304
305	$self->{parent}->check_size
306	if $self->{parent};
307	}
308	}	418	}
309		419
310	sub update {	420	sub update {
311	my ($self) = @_;	421	my ($self) = @_;
312		422
…		…
321	}	431	}
322		432
323	sub emit {	433	sub emit {
324	my ($self, $signal, @args) = @_;	434	my ($self, $signal, @args) = @_;
325		435
326	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327	$cb->($self, @args);
328	}
329	}	437	}
330		438
331	sub DESTROY {	439	sub DESTROY {
332	my ($self) = @_;	440	my ($self) = @_;
333		441
		442	delete $WIDGET{$self+0};
334	#$self->deactivate;	443	#$self->deactivate;
335	}	444	}
336		445
337	#############################################################################	446	#############################################################################
338		447
…		…
378		487
379	package CFClient::UI::Empty;	488	package CFClient::UI::Empty;
380		489
381	our @ISA = CFClient::UI::Base::;	490	our @ISA = CFClient::UI::Base::;
382		491
		492	sub new {
		493	my ($class, %arg) = @_;
		494	$class->SUPER::new (can_events => 0, %arg);
		495	}
		496
383	sub size_request {	497	sub size_request {
384	(0, 0)	498	(0, 0)
385	}	499	}
386		500
387	sub draw { }	501	sub draw { }
…		…
395	sub new {	509	sub new {
396	my ($class, %arg) = @_;	510	my ($class, %arg) = @_;
397		511
398	my $children = delete $arg{children} || [];	512	my $children = delete $arg{children} || [];
399		513
400	my $self = $class->SUPER::new (children => [], %arg);	514	my $self = $class->SUPER::new (
		515	children => [],
		516	can_events => 0,
		517	%arg,
		518	);
401	$self->add ($_) for @$children;	519	$self->add ($_) for @$children;
402		520
403	$self	521	$self
404	}	522	}
405		523
406	sub add {	524	sub add {
407	my ($self, $child) = @_;	525	my ($self, @widgets) = @_;
408		526
409	$child->set_parent ($self);	527	$_->set_parent ($self)
		528	for @widgets;
410		529
411	use sort 'stable';	530	use sort 'stable';
412		531
413	$self->{children} = [	532	$self->{children} = [
414	sort { $a->{z} <=> $b->{z} }	533	sort { $a->{z} <=> $b->{z} }
415	@{$self->{children}}, $child	534	@{$self->{children}}, @widgets
416	];	535	];
417		536
418	$child->check_size;	537	$self->check_size (1);
		538	$self->update;
		539	}
		540
		541	sub children {
		542	@{ $_[0]{children} }
419	}	543	}
420		544
421	sub remove {	545	sub remove {
422	my ($self, $child) = @_;	546	my ($self, $child) = @_;
423		547
424	delete $child->{parent};	548	delete $child->{parent};
		549	$child->hide;
425		550
426	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427		552
428	$self->check_size;	553	$self->check_size;
		554	$self->update;
		555	}
		556
		557	sub clear {
		558	my ($self) = @_;
		559
		560	my $children = delete $self->{children};
		561	$self->{children} = [];
		562
		563	for (@$children) {
		564	delete $_->{parent};
		565	$_->hide;
		566	}
		567
		568	$self->check_size;
		569	$self->update;
429	}	570	}
430		571
431	sub find_widget {	572	sub find_widget {
432	my ($self, $x, $y) = @_;	573	my ($self, $x, $y) = @_;
433		574
…		…
508	}	649	}
509		650
510	sub update {	651	sub update {
511	my ($self) = @_;	652	my ($self) = @_;
512		653
513	# we want to do this delayed...	654	$ROOT->on_post_alloc ($self => sub { $self->render_child });
514	$self->render_chld;
515	$self->SUPER::update;	655	$self->SUPER::update;
516	}
517
518	sub render_chld {
519	my ($self) = @_;
520
521	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522	glClearColor 0, 0, 0, 1;
523	glClear GL_COLOR_BUFFER_BIT;
524	$self->child->draw;
525	};
526	}	656	}
527		657
528	sub size_allocate {	658	sub size_allocate {
529	my ($self, $w, $h) = @_;	659	my ($self, $w, $h) = @_;
530		660
531	$self->child->configure (0, 0, $w, $h);	661	$self->SUPER::size_allocate ($w, $h);
		662	$self->update;
		663	}
532		664
		665	sub _render {
		666	$_[0]{children}[0]->draw;
		667	}
		668
		669	sub render_child {
		670	my ($self) = @_;
		671
		672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		673	glClearColor 0, 0, 0, 0;
		674	glClear GL_COLOR_BUFFER_BIT;
		675
533	$self->render_chld;	676	$self->_render;
		677	# glColorMask 1, 1, 1, 0;
		678	# glEnable GL_BLEND;
		679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		680	# glRasterPos 0, 0;
		681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		682	# glDisable GL_BLEND;
		683	# glColorMask 1, 1, 1, 1;
		684	};
534	}	685	}
535		686
536	sub _draw {	687	sub _draw {
537	my ($self) = @_;	688	my ($self) = @_;
538		689
539	my ($w, $h) = ($self->w, $self->h);	690	my ($w, $h) = ($self->w, $self->h);
540		691
541	my $tex = $self->{texture}	692	my $tex = $self->{texture}
542	or return;	693	or return;
543		694
544	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546	glEnable GL_TEXTURE_2D;	695	glEnable GL_TEXTURE_2D;
547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		697	glColor 0, 0, 0, 1;
548		698
549	$tex->draw_quad (0, 0, $w, $h);	699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550		700
551	glDisable GL_BLEND;
552	glDisable GL_TEXTURE_2D;	701	glDisable GL_TEXTURE_2D;
553	}	702	}
554		703
555	#############################################################################	704	#############################################################################
556		705
557	package CFClient::UI::ViewPort;	706	package CFClient::UI::ViewPort;
558		707
559	our @ISA = CFClient::UI::Window::;	708	our @ISA = CFClient::UI::Window::;
560		709
561	sub new { die }
562
563	sub size_request {	710	sub size_request {
564	my ($self) = @_;	711	my ($self) = @_;
565		712
566	@$self{qw(child_w child_h)} = $self->child->size_request;	713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
568		715
569	@$self{qw(child_w child_h)}	716	@$self{qw(child_w child_h)}
570	}	717	}
571		718
572	sub _draw {	719	sub size_allocate {
573	my ($self) = @_;	720	my ($self, $w, $h) = @_;
574		721
575	$self->{children}[1]->draw;	722	$self->update;
576	}	723	}
577		724
		725	sub set_offset {
		726	my ($self, $x, $y) = @_;
578		727
579	#############################################################################	728	$self->{view_x} = int $x;
		729	$self->{view_y} = int $y;
580		730
		731	$self->update;
		732	}
		733
		734	# hmm, this does not work for topleft of $self... but we should not ask for that
		735	sub coord2local {
		736	my ($self, $x, $y) = @_;
		737
		738	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		739	}
		740
		741	sub coord2global {
		742	my ($self, $x, $y) = @_;
		743
		744	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		745	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		746
		747	$self->SUPER::coord2global ($x, $y)
		748	}
		749
		750	sub find_widget {
		751	my ($self, $x, $y) = @_;
		752
		753	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		754	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		755	) {
		756	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		757	} else {
		758	$self->CFClient::UI::Base::find_widget ($x, $y)
		759	}
		760	}
		761
		762	sub _render {
		763	my ($self) = @_;
		764
		765	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		766
		767	$self->SUPER::_render;
		768	}
		769
		770	#############################################################################
		771
581	package CFClient::UI::Frame;	772	package CFClient::UI::ScrolledWindow;
582		773
583	our @ISA = CFClient::UI::Bin::;	774	our @ISA = CFClient::UI::HBox::;
584
585	use CFClient::OpenGL;
586		775
587	sub new {	776	sub new {
588	my $class = shift;	777	my $class = shift;
589		778
		779	my $self;
		780
		781	my $slider = new CFClient::UI::Slider
		782	vertical => 1,
		783	range => [0, 0, 1, 0.01], # HACK fix
		784	connect_changed => sub {
		785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		786	},
		787	;
		788
590	my $self = $class->SUPER::new (	789	$self = $class->SUPER::new (
591	bg => [1, 1, 1, 1],	790	vp => (new CFClient::UI::ViewPort),
592	border_bg => [1, 1, 1, 1],	791	slider => $slider,
593	border => 0.8,
594	@_	792	@_,
595	);	793	);
596		794
		795	$self->{vp}->add ($self->{scrolled});
		796	$self->add ($self->{vp});
		797	$self->add ($self->{slider});
		798
597	$self	799	$self
598	}	800	}
599		801
600	sub set_size {	802	#TODO# update range on size_allocate depending on child
601	my ($self, $w, $h) = @_;	803	# update viewport offset on scroll
602	$self->{req_w} = $w;
603	$self->{req_h} = $h;
604	$self->check_size;
605	}
606		804
607	sub size_request {	805	#############################################################################
608	my ($self) = @_;
609	($self->{req_w}, $self->{req_h})
610	}
611		806
612	sub size_allocate {	807	package CFClient::UI::Frame;
613	my ($self, $w, $h) = @_;	808
614	$self->{w} = $w;	809	our @ISA = CFClient::UI::Bin::;
615	$self->{h} = $h;	810
616	$self->child->configure (0, 0, $w, $h);	811	use CFClient::OpenGL;
		812
		813	sub new {
		814	my $class = shift;
		815
		816	$class->SUPER::new (
		817	bg => undef,
		818	@_,
		819	)
617	}	820	}
618		821
619	sub _draw {	822	sub _draw {
620	my ($self) = @_;	823	my ($self) = @_;
621		824
622	my ($w, $h) = ($self->{w}, $self->{h});	825	if ($self->{bg}) {
		826	my ($w, $h) = @$self{qw(w h)};
623		827
624	glEnable GL_BLEND;	828	glEnable GL_BLEND;
625	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	829	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
626	glEnable GL_TEXTURE_2D;	830	glColor @{ $self->{bg} };
627	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
628		831
629	# glBegin GL_QUADS;	832	glBegin GL_QUADS;
630	# glColor 0, 0, 0, 0;
631	# glVertex 0 , 0;	833	glVertex 0 , 0;
632	# glVertex 0 , $h;	834	glVertex 0 , $h;
633	# glVertex $w, $h;	835	glVertex $w, $h;
634	# glVertex $w, 0;	836	glVertex $w, 0;
635	# glEnd;	837	glEnd;
636		838
637
638	$self->child->draw;
639	glDisable GL_BLEND;	839	glDisable GL_BLEND;
640	glDisable GL_TEXTURE_2D;	840	}
		841
		842	$self->SUPER::_draw;
641	}	843	}
642		844
643	#############################################################################	845	#############################################################################
644		846
645	package CFClient::UI::FancyFrame;	847	package CFClient::UI::FancyFrame;
…		…
656	my $class = shift;	858	my $class = shift;
657		859
658	# TODO: user_x, user_y, overwrite moveto?	860	# TODO: user_x, user_y, overwrite moveto?
659		861
660	my $self = $class->SUPER::new (	862	my $self = $class->SUPER::new (
661	bg => [1, 1, 1, 1],	863	bg => [1, 1, 1, 1],
662	border_bg => [1, 1, 1, 1],	864	border_bg => [1, 1, 1, 1],
663	border => 0.8,	865	border => 0.6,
		866	toplevel => 1,
		867	can_events => 1,
664	@_	868	@_
665	);	869	);
666		870
667	$self->{title} &&= new CFClient::UI::Label	871	$self->{title} &&= new CFClient::UI::Label
668	align => 0,	872	align => 0,
669	valign => 1,	873	valign => 1,
670	text => $self->{title},	874	text => $self->{title},
671	fontsize => 1;	875	fontsize => $self->{border};
672		876
673	$self	877	$self
674	}	878	}
675		879
676	sub border {	880	sub border {
677	int $_[0]{border} * $::FONTSIZE	881	int $_[0]{border} * $::FONTSIZE
678	}	882	}
679		883
680	sub size_request {	884	sub size_request {
681	my ($self) = @_;	885	my ($self) = @_;
682
683	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684		886
685	my ($w, $h) = $self->SUPER::size_request;	887	my ($w, $h) = $self->SUPER::size_request;
686		888
687	(	889	(
688	$w + $self->border * 2,	890	$w + $self->border * 2,
…		…
703	}	905	}
704		906
705	sub button_down {	907	sub button_down {
706	my ($self, $ev, $x, $y) = @_;	908	my ($self, $ev, $x, $y) = @_;
707		909
		910	my ($w, $h) = @$self{qw(w h)};
708	my $border = $self->border;	911	my $border = $self->border;
709		912
710	if ($x < $self->{w} && $x >= $self->{w} - $border	913	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711	&& $y < $self->{h} && $y >= $self->{h} - $border) {	914	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712		915
		916	if ($lr & $td) {
		917	my ($wx, $wy) = ($self->{x}, $self->{y});
713	my ($ox, $oy) = ($ev->{x}, $ev->{y});	918	my ($ox, $oy) = ($ev->{x}, $ev->{y});
714	my ($bw, $bh) = ($self->{w}, $self->{h});	919	my ($bw, $bh) = ($self->{w}, $self->{h});
715		920
		921	my $mx = $x < $border;
		922	my $my = $y < $border;
		923
716	$self->{motion} = sub {	924	$self->{motion} = sub {
717	my ($ev, $x, $y) = @_;	925	my ($ev, $x, $y) = @_;
718		926
719	($x, $y) = ($ev->{x}, $ev->{y});	927	my $dx = $ev->{x} - $ox;
		928	my $dy = $ev->{y} - $oy;
720		929
721	$self->{user_w} = $bw + $x - $ox;	930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722	$self->{user_h} = $bh + $y - $oy;	931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
723	$self->check_size;	933	$self->check_size;
724	};	934	};
725		935
726	} elsif ($x >= 0 && $x < $self->{w}	936	} elsif ($lr ^ $td) {
727	&& $y >= 0 && $y < $border) {
728
729	my ($ox, $oy) = ($ev->{x}, $ev->{y});	937	my ($ox, $oy) = ($ev->{x}, $ev->{y});
730	my ($bx, $by) = ($self->{x}, $self->{y});	938	my ($bx, $by) = ($self->{x}, $self->{y});
731		939
732	$self->{motion} = sub {	940	$self->{motion} = sub {
733	my ($ev, $x, $y) = @_;	941	my ($ev, $x, $y) = @_;
…		…
756	my ($self) = @_;	964	my ($self) = @_;
757		965
758	my ($w, $h ) = ($self->{w}, $self->{h});	966	my ($w, $h ) = ($self->{w}, $self->{h});
759	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	967	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
760		968
761	glEnable GL_BLEND;
762	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
763	glEnable GL_TEXTURE_2D;	969	glEnable GL_TEXTURE_2D;
764	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	970	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
765		971
766	my $border = $self->border;	972	my $border = $self->border;
767		973
768	glColor @{ $self->{border_bg} };	974	glColor @{ $self->{border_bg} };
769	$tex[1]->draw_quad (0, 0, $w, $border);	975	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
770	$tex[3]->draw_quad (0, $border, $border, $ch);	976	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
771	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	977	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
772	$tex[4]->draw_quad (0, $h - $border, $w, $border);	978	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
773		979
		980	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774	my $bg = $tex[0];	981	my $bg = $tex[0];
775		982
776	# TODO: repeat texture not scale	983	# TODO: repeat texture not scale
777	my $rep_x = $cw / $bg->{w};	984	my $rep_x = $cw / $bg->{w};
778	my $rep_y = $ch / $bg->{h};	985	my $rep_y = $ch / $bg->{h};
779		986
780	glColor @{ $self->{bg} };	987	glColor @{ $self->{bg} };
781		988
782	$bg->{s} = $rep_x;	989	$bg->{s} = $rep_x;
783	$bg->{t} = $rep_y;	990	$bg->{t} = $rep_y;
784	$bg->{wrap_mode} = 1;	991	$bg->{wrap_mode} = 1;
785	$bg->draw_quad ($border, $border, $cw, $ch);	992	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		993	}
786		994
787	glDisable GL_TEXTURE_2D;	995	glDisable GL_TEXTURE_2D;
788	glDisable GL_BLEND;
789		996
790	$self->{title}->draw if $self->{title};	997	$self->{title}->draw if $self->{title};
		998
791	$self->child->draw;	999	$self->child->draw;
792	}	1000	}
793		1001
794	#############################################################################	1002	#############################################################################
795		1003
…		…
817	$self->{children}[$y][$x] = $child;	1025	$self->{children}[$y][$x] = $child;
818		1026
819	$child->check_size;	1027	$child->check_size;
820	}	1028	}
821		1029
		1030	sub children {
		1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1032	}
		1033
822	# TODO: move to container class maybe? send childs a signal on removal?	1034	# TODO: move to container class maybe? send childs a signal on removal?
823	sub clear {	1035	sub clear {
824	my ($self) = @_;	1036	my ($self) = @_;
825		1037
		1038	my @children = $self->children;
826	delete $self->{children};	1039	delete $self->{children};
		1040
		1041	for (@children) {
		1042	delete $_->{parent};
		1043	$_->hide;
		1044	}
		1045
827	$self->update;	1046	$self->update;
828	}	1047	}
829		1048
830	sub get_wh {	1049	sub get_wh {
831	my ($self) = @_;	1050	my ($self) = @_;
…		…
837	or next;	1056	or next;
838		1057
839	for my $x (0 .. $#$row) {	1058	for my $x (0 .. $#$row) {
840	my $widget = $row->[$x]	1059	my $widget = $row->[$x]
841	or next;	1060	or next;
842	my ($w, $h) = $widget->size_request;	1061	my ($w, $h) = @$widget{qw(req_w req_h)};
843		1062
844	$w[$x] = max $w[$x], $w;	1063	$w[$x] = max $w[$x], $w;
845	$h[$y] = max $h[$y], $h;	1064	$h[$y] = max $h[$y], $h;
846	}	1065	}
847	}	1066	}
…		…
952		1171
953	($h, $w) = ($w, $h);	1172	($h, $w) = ($w, $h);
954		1173
955	my $children = $self->{children};	1174	my $children = $self->{children};
956		1175
957	my @h = map +($_->size_request)[0], @$children;	1176	my @h = map $_->{req_w}, @$children;
958		1177
959	my $req_h = List::Util::sum @h;	1178	my $req_h = List::Util::sum @h;
960		1179
961	if ($req_h > $h) {	1180	if ($req_h > $h) {
962	# ah well, not enough space	1181	# ah well, not enough space
…		…
1008	}	1227	}
1009		1228
1010	sub size_allocate {	1229	sub size_allocate {
1011	my ($self, $w, $h) = @_;	1230	my ($self, $w, $h) = @_;
1012		1231
		1232	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1233
1013	my $children = $self->{children};	1234	my $children = $self->{children};
1014		1235
1015	my @h = map +($_->size_request)[1], @$children;	1236	my @h = map $_->{req_h}, @$children;
1016		1237
1017	my $req_h = List::Util::sum @h;	1238	my $req_h = List::Util::sum @h;
1018		1239
1019	if ($req_h > $h) {	1240	if ($req_h > $h) {
1020	# ah well, not enough space	1241	# ah well, not enough space
…		…
1054		1275
1055	sub new {	1276	sub new {
1056	my ($class, %arg) = @_;	1277	my ($class, %arg) = @_;
1057		1278
1058	my $self = $class->SUPER::new (	1279	my $self = $class->SUPER::new (
1059	fg => [1, 1, 1],	1280	fg => [1, 1, 1],
		1281	#font => default_font
		1282	#text => initial text
		1283	#markup => initial narkup
		1284	layout => (new CFClient::Layout),
1060	fontsize => 1,	1285	fontsize => 1,
1061	text => "",
1062	align => -1,	1286	align => -1,
1063	valign => -1,	1287	valign => -1,
1064	padding => 2,	1288	padding => 2,
1065	layout => new CFClient::Layout,	1289	can_events => 0,
1066	%arg	1290	%arg
1067	);	1291	);
1068		1292
1069	if (exists $self->{template}) {	1293	if (exists $self->{template}) {
1070	my $layout = new CFClient::Layout;	1294	my $layout = new CFClient::Layout;
1071	$layout->set_text (delete $self->{template});	1295	$layout->set_text (delete $self->{template});
1072	$self->{template} = $layout;	1296	$self->{template} = $layout;
1073	}	1297	}
1074		1298
1075	$self->set_text (delete $self->{text}) if exists $self->{text};	1299	if (exists $self->{markup}) {
1076	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1300	$self->set_markup (delete $self->{markup});
		1301	} else {
		1302	$self->set_text (delete $self->{text});
		1303	}
1077		1304
1078	$self	1305	$self
1079	}	1306	}
1080		1307
1081	sub escape_text {	1308	sub escape {
1082	local $_ = $_[1];	1309	local $_ = $_[1];
1083		1310
1084	s/&/&amp;/g;	1311	s/&/&amp;/g;
1085	s/>/&gt;/g;	1312	s/>/&gt;/g;
1086	s/</&lt;/g;	1313	s/</&lt;/g;
1087		1314
1088	$_[1]	1315	$_[1]
1089	}	1316	}
1090		1317
		1318	sub update {
		1319	my ($self) = @_;
		1320
		1321	delete $self->{texture};
		1322	$self->SUPER::update;
		1323	}
		1324
1091	sub set_text {	1325	sub set_text {
1092	my ($self, $text) = @_;	1326	my ($self, $text) = @_;
1093		1327
		1328	return if $self->{text} eq "T$text";
		1329	$self->{text} = "T$text";
		1330
		1331	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1094	$self->{layout}->set_text ($text);	1332	$self->{layout}->set_text ($text);
1095		1333
1096	delete $self->{texture};
1097	$self->update;	1334	$self->update;
		1335	$self->check_size;
1098	}	1336	}
1099		1337
1100	sub set_markup {	1338	sub set_markup {
1101	my ($self, $markup) = @_;	1339	my ($self, $markup) = @_;
1102		1340
		1341	return if $self->{text} eq "M$markup";
		1342	$self->{text} = "M$markup";
		1343
		1344	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1345
		1346	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1103	$self->{layout}->set_markup ($markup);	1347	$self->{layout}->set_markup ($markup);
1104		1348
1105	delete $self->{texture};
1106	$self->update;	1349	$self->update;
		1350	$self->check_size;
1107	}	1351	}
1108		1352
1109	sub size_request {	1353	sub size_request {
1110	my ($self) = @_;	1354	my ($self) = @_;
1111		1355
1112	$self->{layout}->set_width;	1356	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1357	$self->{layout}->set_width ($self->{max_w} || -1);
1113	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114		1359
1115	my ($w, $h) = $self->{layout}->size;	1360	my ($w, $h) = $self->{layout}->size;
1116		1361
1117	if (exists $self->{template}) {	1362	if (exists $self->{template}) {
		1363	$self->{template}->set_font ($self->{font}) if $self->{font};
1118	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1364	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119		1365
1120	my ($w2, $h2) = $self->{template}->size;	1366	my ($w2, $h2) = $self->{template}->size;
1121		1367
1122	$w = List::Util::max $w, $w2;	1368	$w = List::Util::max $w, $w2;
…		…
1137		1383
1138	sub set_fontsize {	1384	sub set_fontsize {
1139	my ($self, $fontsize) = @_;	1385	my ($self, $fontsize) = @_;
1140		1386
1141	$self->{fontsize} = $fontsize;	1387	$self->{fontsize} = $fontsize;
		1388	delete $self->{texture};
		1389
		1390	$self->update;
1142	$self->check_size;	1391	$self->check_size;
1143	}	1392	}
1144		1393
1145	sub _draw {	1394	sub _draw {
1146	my ($self) = @_;	1395	my ($self) = @_;
1147		1396
1148	my $tex = $self->{texture} ||= do {	1397	my $tex = $self->{texture} ||= do {
		1398	$self->{layout}->set_foreground (@{$self->{fg}});
		1399	$self->{layout}->set_font ($self->{font}) if $self->{font};
1149	$self->{layout}->set_width ($self->{w});	1400	$self->{layout}->set_width ($self->{w});
1150	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1402
1151	new_from_layout CFClient::Texture $self->{layout}	1403	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1404
		1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1407	: ($self->{w} - $tex->{w}) * 0.5;
		1408
		1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1411	: ($self->{h} - $tex->{h}) * 0.5;
		1412
		1413	$tex
1152	};	1414	};
1153		1415
1154	glEnable GL_BLEND;
1155	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1156	glEnable GL_TEXTURE_2D;	1416	glEnable GL_TEXTURE_2D;
1157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1158		1418
		1419	if ($tex->{format} == GL_ALPHA) {
1159	glColor @{$self->{fg}};	1420	glColor @{$self->{fg}};
1160
1161	$self->{ox} = int (
1162	$self->{align} < 0 ? $self->{padding}
1163	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1164	: ($self->{w} - $tex->{w}) * 0.5
1165	);
1166
1167	$self->{oy} = int (
1168	$self->{valign} < 0 ? $self->{padding}
1169	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1170	: ($self->{h} - $tex->{h}) * 0.5
1171	);
1172
1173	$tex->draw_quad ($self->{ox}, $self->{oy});	1421	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1422	} else {
		1423	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1424	}
1174		1425
1175	glDisable GL_TEXTURE_2D;	1426	glDisable GL_TEXTURE_2D;
1176	glDisable GL_BLEND;
1177	}	1427	}
1178		1428
1179	#############################################################################	1429	#############################################################################
1180		1430
1181	package CFClient::UI::EntryBase;	1431	package CFClient::UI::EntryBase;
…		…
1186		1436
1187	sub new {	1437	sub new {
1188	my $class = shift;	1438	my $class = shift;
1189		1439
1190	$class->SUPER::new (	1440	$class->SUPER::new (
1191	fg => [1, 1, 1],	1441	fg => [1, 1, 1],
1192	bg => [0, 0, 0, 0.2],	1442	bg => [0, 0, 0, 0.2],
1193	active_bg => [1, 1, 1, 0.5],	1443	active_bg => [1, 1, 1, 0.5],
1194	active_fg => [0, 0, 0],	1444	active_fg => [0, 0, 0],
1195	can_hover => 1,	1445	can_hover => 1,
1196	can_focus => 1,	1446	can_focus => 1,
1197	valign => 0,	1447	valign => 0,
		1448	can_events => 1,
1198	@_	1449	@_
1199	)	1450	)
1200	}	1451	}
1201		1452
1202	sub _set_text {	1453	sub _set_text {
…		…
1215	$self->{layout}->set_text ("$text ");	1466	$self->{layout}->set_text ("$text ");
1216		1467
1217	$self->emit (changed => $self->{text});	1468	$self->emit (changed => $self->{text});
1218	}	1469	}
1219		1470
		1471	sub set_text {
		1472	my ($self, $text) = @_;
		1473
		1474	$self->{cursor} = length $text;
		1475	$self->_set_text ($text);
		1476	$self->check_size;
		1477	$self->update;
		1478	}
		1479
1220	sub get_text {	1480	sub get_text {
1221	$_[0]{text}	1481	$_[0]{text}
1222	}	1482	}
1223		1483
1224	sub size_request {	1484	sub size_request {
…		…
1230	}	1490	}
1231		1491
1232	sub size_allocate {	1492	sub size_allocate {
1233	my ($self, $w, $h) = @_;	1493	my ($self, $w, $h) = @_;
1234		1494
1235	$self->_set_text ($self->{text});	1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236	}
1237
1238	sub set_text {
1239	my ($self, $text) = @_;
1240
1241	$self->{cursor} = length $text;
1242	$self->_set_text ($text);
1243	$self->update;
1244	}	1496	}
1245		1497
1246	sub key_down {	1498	sub key_down {
1247	my ($self, $ev) = @_;	1499	my ($self, $ev) = @_;
1248		1500
…		…
1250	my $sym = $ev->{sym};	1502	my $sym = $ev->{sym};
1251	my $uni = $ev->{unicode};	1503	my $uni = $ev->{unicode};
1252		1504
1253	my $text = $self->get_text;	1505	my $text = $self->get_text;
1254		1506
1255	if ($sym == 8) {	1507	if ($uni == 8) {
1256	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1508	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1257	} elsif ($sym == 127) {	1509	} elsif ($uni == 127) {
1258	substr $text, $self->{cursor}, 1, "";	1510	substr $text, $self->{cursor}, 1, "";
1259	} elsif ($sym == CFClient::SDLK_LEFT) {	1511	} elsif ($sym == CFClient::SDLK_LEFT) {
1260	--$self->{cursor} if $self->{cursor};	1512	--$self->{cursor} if $self->{cursor};
1261	} elsif ($sym == CFClient::SDLK_RIGHT) {	1513	} elsif ($sym == CFClient::SDLK_RIGHT) {
1262	++$self->{cursor} if $self->{cursor} < length $self->{text};	1514	++$self->{cursor} if $self->{cursor} < length $self->{text};
1263	} elsif ($sym == CFClient::SDLK_HOME) {	1515	} elsif ($sym == CFClient::SDLK_HOME) {
1264	$self->{cursor} = 0;	1516	$self->{cursor} = 0;
1265	} elsif ($sym == CFClient::SDLK_END) {	1517	} elsif ($sym == CFClient::SDLK_END) {
1266	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1267	} elsif ($sym == 27) {	1519	} elsif ($uni == 27) {
1268	$self->emit ('escape');	1520	$self->emit ('escape');
1269	} elsif ($uni) {	1521	} elsif ($uni) {
1270	substr $text, $self->{cursor}++, 0, chr $uni;	1522	substr $text, $self->{cursor}++, 0, chr $uni;
1271	}	1523	}
1272		1524
…		…
1355	my ($self, $ev) = @_;	1607	my ($self, $ev) = @_;
1356		1608
1357	my $sym = $ev->{sym};	1609	my $sym = $ev->{sym};
1358		1610
1359	if ($sym == 13) {	1611	if ($sym == 13) {
		1612	unshift @{$self->{history}},
		1613	my $txt = $self->get_text;
		1614	$self->{history_pointer} = -1;
		1615	$self->{history_saveback} = '';
1360	$self->emit (activate => $self->get_text);	1616	$self->emit (activate => $txt);
1361	$self->update;	1617	$self->update;
		1618
		1619	} elsif ($sym == CFClient::SDLK_UP) {
		1620	if ($self->{history_pointer} < 0) {
		1621	$self->{history_saveback} = $self->get_text;
		1622	}
		1623	if (@{$self->{history} || []} > 0) {
		1624	$self->{history_pointer}++;
		1625	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1626	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1627	}
		1628	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1629	}
		1630
		1631	} elsif ($sym == CFClient::SDLK_DOWN) {
		1632	$self->{history_pointer}--;
		1633	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1634
		1635	if ($self->{history_pointer} >= 0) {
		1636	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1637	} else {
		1638	$self->set_text ($self->{history_saveback});
		1639	}
1362		1640
1363	} else {	1641	} else {
1364	$self->SUPER::key_down ($ev);	1642	$self->SUPER::key_down ($ev);
1365	}	1643	}
1366		1644
…		…
1380		1658
1381	sub new {	1659	sub new {
1382	my $class = shift;	1660	my $class = shift;
1383		1661
1384	$class->SUPER::new (	1662	$class->SUPER::new (
1385	padding => 4,	1663	padding => 4,
1386	fg => [1, 1, 1],	1664	fg => [1, 1, 1],
1387	bg => [1, 1, 1, 0.2],	1665	bg => [1, 1, 1, 0.2],
1388	active_fg => [0, 0, 1],	1666	active_fg => [0, 0, 1],
1389	can_hover => 1,	1667	can_hover => 1,
1390	align => 0,	1668	align => 0,
1391	valign => 0,	1669	valign => 0,
		1670	can_events => 1,
1392	@_	1671	@_
1393	)	1672	)
1394	}	1673	}
1395		1674
1396	sub button_up {	1675	sub button_up {
…		…
1409		1688
1410	if ($GRAB == $self) {	1689	if ($GRAB == $self) {
1411	$self->{fg} = $self->{active_fg};	1690	$self->{fg} = $self->{active_fg};
1412	}	1691	}
1413		1692
1414	glEnable GL_BLEND;
1415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1416	glEnable GL_TEXTURE_2D;	1693	glEnable GL_TEXTURE_2D;
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1694	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418	glColor 0, 0, 0, 1;	1695	glColor 0, 0, 0, 1;
1419		1696
1420	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1697	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1421		1698
1422	glDisable GL_TEXTURE_2D;	1699	glDisable GL_TEXTURE_2D;
1423	glDisable GL_BLEND;
1424		1700
1425	$self->SUPER::_draw;	1701	$self->SUPER::_draw;
1426	}	1702	}
1427		1703
1428	#############################################################################	1704	#############################################################################
…		…
1475		1751
1476	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1752	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1477		1753
1478	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1754	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1479		1755
1480	glEnable GL_BLEND;	1756	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1757
1481	glEnable GL_TEXTURE_2D;	1758	glEnable GL_TEXTURE_2D;
1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483
1484	my $tex = $self->{state} ? $tex[1] : $tex[0];
1485
1486	$tex->draw_quad (0, 0, $s, $s);	1759	$tex->draw_quad_alpha (0, 0, $s, $s);
1487
1488	glDisable GL_TEXTURE_2D;	1760	glDisable GL_TEXTURE_2D;
1489	glDisable GL_BLEND;
1490	}	1761	}
1491		1762
1492	#############################################################################	1763	#############################################################################
1493		1764
1494	package CFClient::UI::Image;	1765	package CFClient::UI::Image;
…		…
1501	our %loaded_images;	1772	our %loaded_images;
1502		1773
1503	sub new {	1774	sub new {
1504	my $class = shift;	1775	my $class = shift;
1505		1776
1506	my $self = $class->SUPER::new (@_);	1777	my $self = $class->SUPER::new (can_events => 0, @_);
1507		1778
1508	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	1779	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509		1780
1510	$loaded_images{$self->{image}} ||=	1781	$loaded_images{$self->{image}} ||=
1511	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	1782	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
…		…
1537	glTranslate 0, -$self->{w}, 0;	1808	glTranslate 0, -$self->{w}, 0;
1538		1809
1539	($w, $h) = ($h, $w);	1810	($w, $h) = ($h, $w);
1540	}	1811	}
1541		1812
1542	glEnable GL_BLEND;
1543	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1544	glEnable GL_TEXTURE_2D;	1813	glEnable GL_TEXTURE_2D;
1545	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1546		1815
1547	$tex->draw_quad (0, 0, $w, $h);	1816	$tex->draw_quad_alpha (0, 0, $w, $h);
1548		1817
1549	glDisable GL_BLEND;
1550	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1551	}	1819	}
1552		1820
1553	#############################################################################	1821	#############################################################################
1554		1822
1555	package CFClient::UI::VGauge;	1823	package CFClient::UI::VGauge;
1556		1824
1557	our @ISA = CFClient::UI::Base::;	1825	our @ISA = CFClient::UI::Base::;
		1826
		1827	use List::Util qw(min max);
1558		1828
1559	use CFClient::OpenGL;	1829	use CFClient::OpenGL;
1560		1830
1561	my %tex = (	1831	my %tex = (
1562	food => [	1832	food => [
1563	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1833	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1834	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565	],	1835	],
1566	grace => [	1836	grace => [
1567	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1837	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1838	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569	],	1839	],
1570	hp => [	1840	hp => [
1571	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1841	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1842	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573	],	1843	],
1574	mana => [	1844	mana => [
1575	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1845	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1846	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577	],	1847	],
1578	);	1848	);
1579		1849
1580	# eg. VGauge->new (gauge => 'food'), default gauge: food	1850	# eg. VGauge->new (gauge => 'food'), default gauge: food
1581	sub new {	1851	sub new {
…		…
1600	}	1870	}
1601		1871
1602	sub set_max {	1872	sub set_max {
1603	my ($self, $max) = @_;	1873	my ($self, $max) = @_;
1604		1874
		1875	return if $self->{max_val} == $max;
		1876
1605	$self->{max_val} = $max;	1877	$self->{max_val} = $max;
		1878	$self->update;
1606	}	1879	}
1607		1880
1608	sub set_value {	1881	sub set_value {
1609	my ($self, $val, $max) = @_;	1882	my ($self, $val, $max) = @_;
1610		1883
1611	$self->set_max ($max)	1884	$self->set_max ($max)
1612	if defined $max;	1885	if defined $max;
1613		1886
1614	$max = $self->{max_val};	1887	return if $self->{val} == $val;
		1888
1615	$self->{val} = $val;	1889	$self->{val} = $val;
1616
1617	$self->update;	1890	$self->update;
1618	}	1891	}
1619		1892
1620	sub _draw {	1893	sub _draw {
1621	my ($self) = @_;	1894	my ($self) = @_;
1622		1895
1623	my $tex = $tex{$self->{type}};	1896	my $tex = $tex{$self->{type}};
		1897	my ($t1, $t2, $t3) = @$tex;
1624		1898
1625	my ($w, $h) = ($self->{w}, $self->{h});	1899	my ($w, $h) = ($self->{w}, $self->{h});
1626		1900
1627	if ($self->{vertical}) {	1901	if ($self->{vertical}) {
1628	glRotate 90, 0, 0, 1;	1902	glRotate 90, 0, 0, 1;
…		…
1630		1904
1631	($w, $h) = ($h, $w);	1905	($w, $h) = ($h, $w);
1632	}	1906	}
1633		1907
1634	my $ycut = $self->{val} / ($self->{max_val} || 1);	1908	my $ycut = $self->{val} / ($self->{max_val} || 1);
1635	$ycut = 1 if $self->{val} > $self->{max_val};
1636		1909
1637	my $t1 = $tex->[0];	1910	my $ycut1 = max 0, min 1, $ycut;
1638	my $t2 = $tex->[1];	1911	my $ycut2 = max 0, min 1, $ycut - 1;
		1912
		1913	my $h1 = $self->{h} * (1 - $ycut1);
		1914	my $h2 = $self->{h} * (1 - $ycut2);
1639		1915
1640	glEnable GL_BLEND;	1916	glEnable GL_BLEND;
1641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1917	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642	glEnable GL_TEXTURE_2D;	1918	glEnable GL_TEXTURE_2D;
1643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644		1920
1645	my $h1 = $self->{h} - $ycut * $self->{h};
1646	my $h2 = $ycut * $self->{h};
1647
1648	glBindTexture GL_TEXTURE_2D, $t1->{name};	1921	glBindTexture GL_TEXTURE_2D, $t1->{name};
1649	glBegin GL_QUADS;	1922	glBegin GL_QUADS;
1650	glTexCoord 0 , 0; glVertex 0 , 0;	1923	glTexCoord 0 , 0; glVertex 0 , 0;
1651	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;	1924	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;	1925	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653	glTexCoord $t1->{s}, 0; glVertex $w, 0;	1926	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654	glEnd;	1927	glEnd;
1655		1928
		1929	my $ycut1 = List::Util::min 1, $ycut;
1656	glBindTexture GL_TEXTURE_2D, $t2->{name};	1930	glBindTexture GL_TEXTURE_2D, $t2->{name};
1657	glBegin GL_QUADS;	1931	glBegin GL_QUADS;
1658	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;	1932	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;	1933	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;	1934	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;	1935	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662	glEnd;	1936	glEnd;
		1937
		1938	if ($t3) {
		1939	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1940	glBegin GL_QUADS;
		1941	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1942	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1943	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1944	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1945	glEnd;
		1946	}
1663		1947
1664	glDisable GL_BLEND;	1948	glDisable GL_BLEND;
1665	glDisable GL_TEXTURE_2D;	1949	glDisable GL_TEXTURE_2D;
1666	}	1950	}
1667		1951
…		…
1670	package CFClient::UI::Gauge;	1954	package CFClient::UI::Gauge;
1671		1955
1672	our @ISA = CFClient::UI::VBox::;	1956	our @ISA = CFClient::UI::VBox::;
1673		1957
1674	sub new {	1958	sub new {
1675	my ($class, %arg) = shift;	1959	my ($class, %arg) = @_;
1676		1960
1677	my $self = $class->SUPER::new (	1961	my $self = $class->SUPER::new (
1678	@_,	1962	tooltip => $arg{type},
		1963	can_hover => 1,
		1964	can_events => 1,
		1965	%arg,
1679	);	1966	);
1680		1967
1681	$self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");	1968	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);	1969	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683	$self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");	1970	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684		1971
1685	$self	1972	$self
1686	}	1973	}
1687		1974
1688	sub set_fontsize {	1975	sub set_fontsize {
…		…
1690		1977
1691	$self->{value}->set_fontsize ($fsize);	1978	$self->{value}->set_fontsize ($fsize);
1692	$self->{max} ->set_fontsize ($fsize);	1979	$self->{max} ->set_fontsize ($fsize);
1693	}	1980	}
1694		1981
		1982	sub set_max {
		1983	my ($self, $max) = @_;
		1984
		1985	$self->{gauge}->set_max ($max);
		1986	$self->{max}->set_text ($max);
		1987	}
		1988
1695	sub set_value {	1989	sub set_value {
1696	my ($self, $val, $max) = @_;	1990	my ($self, $val, $max) = @_;
1697		1991
1698	$self->set_max ($max)	1992	$self->set_max ($max)
1699	if defined $max;	1993	if defined $max;
1700		1994
1701	$self->{gauge}->set_value ($val, $max);	1995	$self->{gauge}->set_value ($val, $max);
1702	$self->{value}->set_text ($val);	1996	$self->{value}->set_text ($val);
1703	}
1704
1705	sub set_max {
1706	my ($self, $max) = @_;
1707
1708	$self->{gauge}->set_max ($max);
1709	$self->{max}->set_text ($max);
1710	}	1997	}
1711		1998
1712	#############################################################################	1999	#############################################################################
1713		2000
1714	package CFClient::UI::Slider;	2001	package CFClient::UI::Slider;
…		…
1733	# TODO: calculations are off	2020	# TODO: calculations are off
1734	my $self = $class->SUPER::new (	2021	my $self = $class->SUPER::new (
1735	fg => [1, 1, 1],	2022	fg => [1, 1, 1],
1736	active_fg => [0, 0, 0],	2023	active_fg => [0, 0, 0],
1737	range => [0, 0, 100, 10],	2024	range => [0, 0, 100, 10],
1738	req_w => 20,	2025	req_w => $::WIDTH / 80,
1739	req_h => 20,	2026	req_h => $::WIDTH / 80,
1740	vertical => 0,	2027	vertical => 0,
1741	can_hover => 1,	2028	can_hover => 1,
1742	inner_pad => 5,	2029	inner_pad => 5,
1743	@_	2030	@_
1744	);	2031	);
…		…
1827	$page ||= 2;	2114	$page ||= 2;
1828		2115
1829	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1830	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1831		2118
1832	glEnable GL_BLEND;
1833	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1834	glEnable GL_TEXTURE_2D;	2119	glEnable GL_TEXTURE_2D;
1835	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1836		2121
1837	# draw background	2122	# draw background
1838	$tex[1]->draw_quad (0, 0, $w, $h);	2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1839		2124
1840	# draw handle	2125	# draw handle
1841	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1842		2127
1843	glDisable GL_BLEND;
1844	glDisable GL_TEXTURE_2D;	2128	glDisable GL_TEXTURE_2D;
1845	}	2129	}
1846		2130
1847	#############################################################################	2131	#############################################################################
1848		2132
…		…
1854		2138
1855	sub new {	2139	sub new {
1856	my $class = shift;	2140	my $class = shift;
1857		2141
1858	my $self = $class->SUPER::new (	2142	my $self = $class->SUPER::new (
1859	fontsize => 1,	2143	fontsize => 1,
		2144	can_events => 0,
		2145	#font => default_font
1860	@_,	2146	@_,
1861		2147
1862	layout => (new CFClient::Layout),	2148	layout => (new CFClient::Layout 1),
1863	par => [],	2149	par => [],
1864	height => 0,	2150	height => 0,
1865	children => [	2151	children => [
1866	(new CFClient::UI::Empty expand => 1),	2152	(new CFClient::UI::Empty expand => 1),
1867	(new CFClient::UI::Slider vertical => 1),	2153	(new CFClient::UI::Slider vertical => 1),
1868	],	2154	],
1869	);	2155	);
1870		2156
1871	$self->{children}[1]->connect (changed => sub {	2157	$self->{children}[1]->connect (changed => sub { $self->update });
1872	$self->update;
1873	});
1874		2158
1875	$self	2159	$self
1876	}	2160	}
1877		2161
1878	sub set_fontsize {	2162	sub set_fontsize {
…		…
1886	my ($self, $text) = @_;	2170	my ($self, $text) = @_;
1887		2171
1888	my $layout = $self->{layout};	2172	my $layout = $self->{layout};
1889		2173
1890	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891	$layout->set_width ($self->{w});	2175	$layout->set_width ($self->{children}[0]{w});
1892	$layout->set_text ($text);	2176	$layout->set_markup ($text);
1893		2177
1894	($layout->size)[1]	2178	($layout->size)[1]
1895	}	2179	}
1896		2180
1897	sub reflow {	2181	sub reflow {
…		…
1904	sub size_allocate {	2188	sub size_allocate {
1905	my ($self, $w, $h) = @_;	2189	my ($self, $w, $h) = @_;
1906		2190
1907	$self->SUPER::size_allocate ($w, $h);	2191	$self->SUPER::size_allocate ($w, $h);
1908		2192
		2193	$self->{layout}->set_font ($self->{font}) if $self->{font};
1909	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2194	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910	$self->{layout}->set_width ($self->{children}[0]{w});	2195	$self->{layout}->set_width ($self->{children}[0]{w});
1911		2196
1912	$self->reflow;	2197	$self->reflow;
1913	}	2198	}
…		…
1934		2219
1935	return unless $self->{h} > 0;	2220	return unless $self->{h} > 0;
1936		2221
1937	delete $self->{texture};	2222	delete $self->{texture};
1938		2223
1939	$ROOT->on_refresh ($self, sub {	2224	$ROOT->on_post_alloc ($self, sub {
1940	if (delete $self->{need_reflow}) {	2225	if (delete $self->{need_reflow}) {
1941	my $height = 0;	2226	my $height = 0;
1942		2227
1943	$height += $_->[0] = $self->text_height ($_->[2])	2228	$height += $_->[0] = $self->text_height ($_->[2])
1944	for @{$self->{par}};	2229	for @{$self->{par}};
…		…
1948	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1949		2234
1950	delete $self->{texture};	2235	delete $self->{texture};
1951	}	2236	}
1952		2237
1953	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1954	glClearColor 0, 0, 0, 1;	2239	glClearColor 0, 0, 0, 0;
1955	glClear GL_COLOR_BUFFER_BIT;	2240	glClear GL_COLOR_BUFFER_BIT;
1956		2241
1957	glEnable GL_BLEND;
1958	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1959	glEnable GL_TEXTURE_2D;	2242	glEnable GL_TEXTURE_2D;
1960	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1961		2244
1962	my $top = int $self->{children}[1]{range}[0];	2245	my $top = int $self->{children}[1]{range}[0];
1963		2246
…		…
1966		2249
1967	my $y = 0;	2250	my $y = 0;
1968		2251
1969	my $layout = $self->{layout};	2252	my $layout = $self->{layout};
1970		2253
		2254	$layout->set_font ($self->{font}) if $self->{font};
		2255
1971	for my $par (@{$self->{par}}) {	2256	for my $par (@{$self->{par}}) {
1972	my $h = $par->[0];	2257	my $h = $par->[0];
1973		2258
1974	if ($y0 < $y + $h && $y < $y1) {	2259	if ($y0 < $y + $h && $y < $y1) {
		2260	$layout->set_foreground (@{ $par->[1] });
1975	$layout->set_text ($par->[2]);	2261	$layout->set_markup ($par->[2]);
1976		2262
1977	glColor @{ $par->[1] };
1978	my ($W, $H) = $layout->size;	2263	my ($W, $H) = $layout->size;
1979	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1980	}	2265	}
1981		2266
1982	$y += $h;	2267	$y += $h;
1983	}	2268	}
1984		2269
1985	glDisable GL_TEXTURE_2D;	2270	glDisable GL_TEXTURE_2D;
1986	glDisable GL_BLEND;
1987	};	2271	};
1988	});	2272	});
1989	}	2273	}
1990		2274
1991	sub _draw {	2275	sub _draw {
1992	my ($self) = @_;	2276	my ($self) = @_;
1993		2277
1994	if ($self->{texture}) {
1995	glEnable GL_TEXTURE_2D;	2278	glEnable GL_TEXTURE_2D;
1996	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2280	glColor 1, 1, 1, 1;
		2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998	glDisable GL_TEXTURE_2D;	2282	glDisable GL_TEXTURE_2D;
1999	}
2000		2283
2001	$self->{children}[1]->draw;	2284	$self->{children}[1]->draw;
2002		2285
2003	}	2286	}
2004		2287
…		…
2052		2335
2053	sub new {	2336	sub new {
2054	my $class = shift;	2337	my $class = shift;
2055		2338
2056	my $self = $class->SUPER::new (	2339	my $self = $class->SUPER::new (
2057	state => 0,	2340	state => 0,
2058	connect_activate => \&toggle_flopper,	2341	connect_activate => \&toggle_flopper,
2059	@_	2342	@_
2060	);	2343	);
2061		2344
2062	if ($self->{state}) {	2345	if ($self->{state}) {
…		…
2083	$self->emit (changed => $self->{state});	2366	$self->emit (changed => $self->{state});
2084	}	2367	}
2085		2368
2086	#############################################################################	2369	#############################################################################
2087		2370
		2371	package CFClient::UI::Tooltip;
		2372
		2373	our @ISA = CFClient::UI::Bin::;
		2374
		2375	use CFClient::OpenGL;
		2376
		2377	sub new {
		2378	my $class = shift;
		2379
		2380	$class->SUPER::new (
		2381	@_,
		2382	can_events => 0,
		2383	)
		2384	}
		2385
		2386	sub set_tooltip_from {
		2387	my ($self, $widget) = @_;
		2388
		2389	$self->add (new CFClient::UI::Label
		2390	markup => $widget->{tooltip},
		2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2392	fontsize => 0.8,
		2393	fg => [0, 0, 0, 1],
		2394	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2395	);
		2396	}
		2397
		2398	sub size_request {
		2399	my ($self) = @_;
		2400
		2401	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2402
		2403	($w + 4, $h + 4)
		2404	}
		2405
		2406	sub size_allocate {
		2407	my ($self, $w, $h) = @_;
		2408
		2409	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2410	}
		2411
		2412	sub _draw {
		2413	my ($self) = @_;
		2414
		2415	glTranslate 0.375, 0.375;
		2416
		2417	my ($w, $h) = @$self{qw(w h)};
		2418
		2419	glColor 1, 0.8, 0.4;
		2420	glBegin GL_QUADS;
		2421	glVertex 0 , 0;
		2422	glVertex 0 , $h;
		2423	glVertex $w, $h;
		2424	glVertex $w, 0;
		2425	glEnd;
		2426
		2427	glColor 0, 0, 0;
		2428	glBegin GL_LINE_LOOP;
		2429	glVertex 0 , 0;
		2430	glVertex 0 , $h;
		2431	glVertex $w, $h;
		2432	glVertex $w, 0;
		2433	glEnd;
		2434
		2435	glTranslate 2 - 0.375, 2 - 0.375;
		2436	$self->SUPER::_draw;
		2437	}
		2438
		2439	#############################################################################
		2440
		2441	package CFClient::UI::Face;
		2442
		2443	our @ISA = CFClient::UI::Base::;
		2444
		2445	use CFClient::OpenGL;
		2446
		2447	sub new {
		2448	my $class = shift;
		2449
		2450	$class->SUPER::new (
		2451	aspect => 1,
		2452	@_,
		2453	)
		2454	}
		2455
		2456	sub size_request {
		2457	(32, 8)
		2458	}
		2459
		2460	sub _draw {
		2461	my ($self) = @_;
		2462
		2463	return unless $::CONN;#d# manage and cache textures differently
		2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2465
		2466	# TODO animation
		2467	if ($tex) {
		2468	glEnable GL_TEXTURE_2D;
		2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2470	glColor 1, 1, 1, 1;
		2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2472	glDisable GL_TEXTURE_2D;
		2473	}
		2474	}
		2475
		2476	#############################################################################
		2477
		2478	package CFClient::UI::InventoryItem;
		2479
		2480	our @ISA = CFClient::UI::HBox::;
		2481
		2482	sub new {
		2483	my $class = shift;
		2484
		2485	my %args = @_;
		2486
		2487	my $item = delete $args{item};
		2488
		2489	my $desc = $item->{nrof} < 2
		2490	? $item->{name}
		2491	: "$item->{nrof} $item->{name_pl}";
		2492
		2493
		2494	my $self = $class->SUPER::new (
		2495	can_hover => 1,
		2496	can_events => 1,
		2497	tooltip => (CFClient::UI::Label->escape ($desc)
		2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2499	connect_button_down => sub {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	# todo: maybe put examine on 1? but should just be a tooltip :(
		2503	if ($ev->{button} == 1) {
		2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2505	} elsif ($ev->{button} == 2) {
		2506	$::CONN->send ("apply $item->{tag}");
		2507	} elsif ($ev->{button} == 3) {
		2508	CFClient::UI::Menu->new (
		2509	items => [
		2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2511	[
		2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2513	sub { $::CONN->send ("lock $item->{tag}") },
		2514	],
		2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2518	],
		2519	)->popup ($ev);
		2520	}
		2521
		2522	1
		2523	},
		2524	%args
		2525	);
		2526
		2527	$self->add (new CFClient::UI::Face
		2528	can_events => 0,
		2529	face => $item->{face},
		2530	anim => $item->{anim},
		2531	animspeed => $item->{animspeed},
		2532	);
		2533
		2534	$self->add (new CFClient::UI::Label
		2535	can_events => 0,
		2536	text => $desc,
		2537	);
		2538
		2539	$self
		2540	}
		2541
		2542	#############################################################################
		2543
		2544	package CFClient::UI::Inventory;
		2545
		2546	our @ISA = CFClient::UI::ScrolledWindow::;
		2547
		2548	sub new {
		2549	my $class = shift;
		2550
		2551	my $self = $class->SUPER::new (
		2552	scrolled => (new CFClient::UI::VBox),
		2553	@_,
		2554	);
		2555
		2556	$self
		2557	}
		2558
		2559	sub set_items {
		2560	my ($self, $items) = @_;
		2561
		2562	$self->{scrolled}->clear;
		2563	return unless $items;
		2564
		2565	my @items = sort {
		2566	($a->{type} <=> $b->{type})
		2567	or ($a->{name} cmp $b->{name})
		2568	} @$items;
		2569
		2570	$self->{real_items} = \@items;
		2571
		2572	for my $item (@items) {
		2573	my $desc = $item->{nrof} < 2
		2574	? $item->{name}
		2575	: "$item->{nrof} $item->{name_pl}";
		2576
		2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2578	}
		2579
		2580	$self->{scrolled}->add (@items);
		2581
		2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2583	}
		2584
		2585	sub size_request {
		2586	my ($self) = @_;
		2587	($self->{req_w}, $self->{req_h});
		2588	}
		2589
		2590	#############################################################################
		2591
		2592	package CFClient::UI::Menu;
		2593
		2594	our @ISA = CFClient::UI::FancyFrame::;
		2595
		2596	use CFClient::OpenGL;
		2597
		2598	sub new {
		2599	my $class = shift;
		2600
		2601	my $self = $class->SUPER::new (
		2602	items => [],
		2603	z => 100,
		2604	@_,
		2605	);
		2606
		2607	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2608
		2609	for my $item (@{ $self->{items} }) {
		2610	my ($widget, $cb) = @$item;
		2611
		2612	# handle various types of items, only text for now
		2613	if (!ref $widget) {
		2614	$widget = new CFClient::UI::Label
		2615	can_hover => 1,
		2616	can_events => 1,
		2617	text => $widget;
		2618	}
		2619
		2620	$self->{item}{$widget} = $item;
		2621
		2622	$self->{vbox}->add ($widget);
		2623	}
		2624
		2625	$self
		2626	}
		2627
		2628	# popup given the event (must be a mouse button down event currently)
		2629	sub popup {
		2630	my ($self, $ev) = @_;
		2631
		2632	$self->emit ("popdown");
		2633
		2634	# maybe save $GRAB? must be careful about events...
		2635	$GRAB = $self;
		2636	$self->{button} = $ev->{button};
		2637
		2638	$self->show;
		2639	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2640	}
		2641
		2642	sub mouse_motion {
		2643	my ($self, $ev, $x, $y) = @_;
		2644
		2645	# TODO: should use vbox->find_widget or so
		2646	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2647	$self->{hover} = $self->{item}{$HOVER};
		2648	}
		2649
		2650	sub button_up {
		2651	my ($self, $ev, $x, $y) = @_;
		2652
		2653	if ($ev->{button} == $self->{button}) {
		2654	undef $GRAB;
		2655	$self->hide;
		2656
		2657	$self->emit ("popdown");
		2658	$self->{hover}[1]->() if $self->{hover};
		2659	}
		2660	}
		2661
		2662	#############################################################################
		2663
		2664	package CFClient::UI::Statusbox;
		2665
		2666	our @ISA = CFClient::UI::VBox::;
		2667
		2668	sub reorder {
		2669	my ($self) = @_;
		2670	my $NOW = time;
		2671
		2672	while (my ($k, $v) = each %{ $self->{item} }) {
		2673	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2674	}
		2675
		2676	my @widgets;
		2677
		2678	my @items = sort {
		2679	$a->{pri} <=> $b->{pri}
		2680	or $b->{id} <=> $a->{id}
		2681	} values %{ $self->{item} };
		2682
		2683	my $count = 10 + 1;
		2684	for my $item (@items) {
		2685	last unless --$count;
		2686
		2687	push @widgets, $item->{label} ||= do {
		2688	# TODO: doesn't handle markup well (read as: at all)
		2689	my $short = $item->{count} > 1
		2690	? "<b>$item->{count} ×</b> $item->{text}"
		2691	: $item->{text};
		2692
		2693	for ($short) {
		2694	s/^\s+//;
		2695	s/\012.*/…/s;
		2696	my $len = int 40 / $item->{fontsize};
		2697	substr $_, $len, length, "…" if $len < length;
		2698	}
		2699
		2700	new CFClient::UI::Label
		2701	markup => $short,
		2702	tooltip => $item->{tooltip},
		2703	tooltip_font => $::FONT_PROP,
		2704	tooltip_width => 0.67,
		2705	fontsize => $item->{fontsize},
		2706	color => $item->{color},
		2707	can_events => 1,
		2708	can_hover => 1
		2709	};
		2710	}
		2711
		2712	$self->clear;
		2713	$self->SUPER::add (reverse @widgets);
		2714	}
		2715
		2716	sub add {
		2717	my ($self, $text, %arg) = @_;
		2718
		2719	$text =~ s/^\s+//;
		2720	$text =~ s/\s+$//;
		2721
		2722	my $timeout = time + ((delete $arg{timeout}) || 60);
		2723
		2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2725
		2726	if (my $item = $self->{item}{$group}) {
		2727	if ($item->{text} eq $text) {
		2728	$item->{count}++;
		2729	} else {
		2730	$item->{count} = 1;
		2731	$item->{text} = $item->{tooltip} = $text;
		2732	}
		2733	$item->{id} = ++$self->{id};
		2734	$item->{timeout} = $timeout;
		2735	delete $item->{label};
		2736	} else {
		2737	$self->{item}{$group} = {
		2738	id => ++$self->{id},
		2739	text => $text,
		2740	timeout => $timeout,
		2741	tooltip => $text,
		2742	fontsize => 0.8,
		2743	color => [0.8, 0.8, 0.8, 0.8],
		2744	pri => 0,
		2745	count => 1,
		2746	%arg,
		2747	};
		2748	}
		2749
		2750	$self->reorder;
		2751	}
		2752
		2753	#############################################################################
		2754
2088	package CFClient::UI::Root;	2755	package CFClient::UI::Root;
2089		2756
2090	our @ISA = CFClient::UI::Container::;	2757	our @ISA = CFClient::UI::Container::;
2091		2758
2092	use CFClient::OpenGL;	2759	use CFClient::OpenGL;
2093		2760
2094	sub check_size {	2761	sub new {
2095	my ($self) = @_;	2762	my $class = shift;
2096		2763
2097	$self->configure (0, 0, $::WITH, $::HEIGHT);	2764	$class->SUPER::new (
2098	}	2765	@_,
2099		2766	)
2100	sub size_request {
2101	($::WIDTH, $::HEIGHT)
2102	}	2767	}
2103		2768
2104	sub configure {	2769	sub configure {
2105	my ($self, $x, $y, $w, $h) = @_;	2770	my ($self, $x, $y, $w, $h) = @_;
2106		2771
2107	$self->SUPER::configure ($x, $y, $w, $h);	2772	$self->{w} = $w;
2108		2773	$self->{h} = $h;
2109	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2110	for @{$self->{children}};
2111	}	2774	}
2112		2775
2113	sub _topleft {	2776	sub check_size {
		2777	my ($self) = @_;
		2778
		2779	$self->size_allocate ($self->{w}, $self->{h})
		2780	if $self->{w};
		2781	}
		2782
		2783	sub size_request {
		2784	my ($self) = @_;
		2785
		2786	($self->{w}, $self->{h})
		2787	}
		2788
		2789	sub size_allocate {
		2790	my ($self, $w, $h) = @_;
		2791
		2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2794
		2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2797
		2798	for my $child ($self->children) {
		2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2800
		2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2803	$child->configure ($X, $Y, $W, $H);
		2804	}
		2805	}
		2806
		2807	sub coord2local {
2114	my ($self, $x, $y) = @_;	2808	my ($self, $x, $y) = @_;
2115		2809
2116	($x, $y)	2810	($x, $y)
2117	}	2811	}
2118		2812
		2813	sub coord2global {
		2814	my ($self, $x, $y) = @_;
		2815
		2816	($x, $y)
		2817	}
		2818
2119	sub update {	2819	sub update {
2120	my ($self) = @_;	2820	my ($self) = @_;
2121		2821
2122	$self->check_size;	2822	$self->check_size;
2123	::refresh ();	2823	$::WANT_REFRESH++;
2124	}	2824	}
2125		2825
2126	sub add {	2826	sub add {
2127	my ($self, $child) = @_;	2827	my ($self, @children) = @_;
2128		2828
		2829	for my $child (@children) {
		2830	$child->{toplevel} = 1;
		2831
2129	# integerize window positions	2832	# integerise window positions
2130	$child->{x} = int $child->{x};	2833	$child->{x} = int $child->{x};
2131	$child->{y} = int $child->{y};	2834	$child->{y} = int $child->{y};
		2835	}
2132		2836
2133	$self->SUPER::add ($child);	2837	$self->SUPER::add (@children);
2134	}	2838	}
2135		2839
2136	sub on_refresh {	2840	sub on_refresh {
2137	my ($self, $id, $cb) = @_;	2841	my ($self, $id, $cb) = @_;
2138		2842
2139	$self->{refresh_hook}{$id} = $cb;	2843	$self->{refresh_hook}{$id} = $cb;
2140	}	2844	}
2141		2845
		2846	sub on_post_alloc {
		2847	my ($self, $id, $cb) = @_;
		2848
		2849	$self->{post_alloc_hook}{$id} = $cb;
		2850	}
		2851
2142	sub draw {	2852	sub draw {
2143	my ($self) = @_;	2853	my ($self) = @_;
2144		2854
2145	while (my $rcb = delete $self->{refresh_hook}) {	2855	while ($self->{refresh_hook}) {
2146	$_->() for values %$rcb;	2856	$_->()
		2857	for values %{delete $self->{refresh_hook}};
		2858	}
		2859
		2860	if ($self->{check_size}) {
		2861	my @queue = ([], []);
		2862
		2863	for (;;) {
		2864	if ($self->{check_size}) {
		2865	# heuristic: check containers last
		2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2867	for values %{delete $self->{check_size}}
		2868	}
		2869
		2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2871
		2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2873	? @$widget{qw(user_w user_h)}
		2874	: $widget->size_request;
		2875
		2876	if (delete $widget->{force_alloc}
		2877	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2878	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2879
		2880	$widget->{req_w} = $w;
		2881	$widget->{req_h} = $h;
		2882
		2883	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2884
		2885	$widget->{parent}->check_size
		2886	if $widget->{parent};
		2887	}
		2888	}
		2889	}
		2890
		2891	while ($self->{size_alloc}) {
		2892	for (values %{delete $self->{size_alloc}}) {
		2893	my ($widget, $w, $h) = @$_;
		2894
		2895	$w = 0 if $w < 0;
		2896	$h = 0 if $h < 0;
		2897
		2898	$widget->{w} = $w;
		2899	$widget->{h} = $h;
		2900	$widget->size_allocate ($w, $h);
		2901	$widget->emit (size_allocate => $w, $h);
		2902	}
		2903	}
		2904
		2905	while ($self->{post_alloc_hook}) {
		2906	$_->()
		2907	for values %{delete $self->{post_alloc_hook}};
2147	}	2908	}
2148		2909
2149	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2910	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2150	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2151	glClear GL_COLOR_BUFFER_BIT;	2912	glClear GL_COLOR_BUFFER_BIT;
…		…
2162	#############################################################################	2923	#############################################################################
2163		2924
2164	package CFClient::UI;	2925	package CFClient::UI;
2165		2926
2166	$ROOT = new CFClient::UI::Root;	2927	$ROOT = new CFClient::UI::Root;
		2928	$TOOLTIP = new CFClient::UI::Tooltip;
2167		2929
2168	1	2930	1
2169		2931

Diff Legend

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