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.134 by root, Wed Apr 19 06:06:45 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC

…		…
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (length $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_markup ($widget->{tooltip});
		29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
		30	$TOOLTIP->show;
		31	}
		32
		33	return;
		34	}
		35	}
		36	}
		37
		38	$TOOLTIP->hide;
		39	delete $TOOLTIP->{owner};
		40	}
14		41
15	# class methods for events	42	# class methods for events
16	sub feed_sdl_key_down_event {	43	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	44	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		45	if $FOCUS;
18	}	46	}
19		47
20	sub feed_sdl_key_up_event {	48	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	49	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		50	if $FOCUS;
22	}	51	}
23		52
24	sub feed_sdl_button_down_event {	53	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	54	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	55	my ($x, $y) = ($ev->{x}, $ev->{y});
27		56
28	if (!$BUTTON_STATE) {	57	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	58	my $widget = $ROOT->find_widget ($x, $y);
30		59
31	$GRAB = $widget;	60	$GRAB = $widget;
32	$GRAB->update if $GRAB;	61	$GRAB->update if $GRAB;
33	}
34		62
		63	check_tooltip;
		64	}
		65
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	66	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		67
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	68	if ($GRAB) {
		69	($x, $y) = $GRAB->coord2local ($x, $y);
		70	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		71	}
38	}	72	}
39		73
40	sub feed_sdl_button_up_event {	74	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	75	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	76	my ($x, $y) = ($ev->{x}, $ev->{y});
43		77
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	78	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		79
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	80	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		81
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	82	if ($GRAB) {
		83	($x, $y) = $GRAB->coord2local ($x, $y);
		84	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		85	}
49		86
50	if (!$BUTTON_STATE) {	87	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	88	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	89	$grab->update if $grab;
53	$GRAB->update if $GRAB;	90	$GRAB->update if $GRAB;
		91
		92	check_tooltip;
54	}	93	}
55	}	94	}
56		95
57	sub feed_sdl_motion_event {	96	sub feed_sdl_motion_event {
58	my ($ev) = @_;	97	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	98	my ($x, $y) = ($ev->{x}, $ev->{y});
60		99
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		101
63	if ($widget != $HOVER) {	102	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	103	my $hover = $HOVER; $HOVER = $widget;
65		104
66	$hover->update if $hover && $hover->{can_hover};	105	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	106	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		107
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	108	check_tooltip;
		109	}
		110
		111	if ($HOVER) {
		112	($x, $y) = $HOVER->coord2local ($x, $y);
		113	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		114	}
71	}	115	}
72		116
73	# convert position array to integers	117	# convert position array to integers
74	sub harmonize {	118	sub harmonize {
75	my ($vals) = @_;	119	my ($vals) = @_;
…		…
87		131
88	package CFClient::UI::Base;	132	package CFClient::UI::Base;
89		133
90	use strict;	134	use strict;
91		135
92	use SDL::OpenGL;	136	use CFClient::OpenGL;
93		137
94	sub new {	138	sub new {
95	my $class = shift;	139	my $class = shift;
96		140
97	my $self = bless {	141	my $self = bless {
98	x => 0,	142	x => 0,
99	y => 0,	143	y => 0,
100	z => 0,	144	z => 0,
		145	can_events => 1,
101	@_	146	@_
102	}, $class;	147	}, $class;
103		148
104	for (keys %$self) {	149	for (keys %$self) {
105	if (/^connect_(.*)$/) {	150	if (/^connect_(.*)$/) {
…		…
108	}	153	}
109		154
110	$self	155	$self
111	}	156	}
112		157
		158	sub destroy {
		159	my ($self) = @_;
		160
		161	$self->hide;
		162	%$self = ();
		163	}
		164
113	sub show {	165	sub show {
114	my ($self) = @_;	166	my ($self) = @_;
115		167
116	return if $self->{parent};	168	return if $self->{parent};
117		169
…		…
119	}	171	}
120		172
121	sub hide {	173	sub hide {
122	my ($self) = @_;	174	my ($self) = @_;
123		175
124	return unless $self->{parent};	176	undef $GRAB if $GRAB == $self;
		177	undef $HOVER if $HOVER == $self;
125		178
126	$self->{parent}->remove ($self);	179	$self->{parent}->remove ($self)
		180	if $self->{parent};
127	}	181	}
128		182
129	sub move {	183	sub move {
130	my ($self, $x, $y, $z) = @_;	184	my ($self, $x, $y, $z) = @_;
131		185
…		…
134	$self->{z} = $z if defined $z;	188	$self->{z} = $z if defined $z;
135		189
136	$self->update;	190	$self->update;
137	}	191	}
138		192
139	sub needs_redraw {	193	sub set_size {
140	0	194	my ($self, $w, $h) = @_;
		195
		196	$self->{user_w} = $w;
		197	$self->{user_h} = $h;
		198
		199	$self->check_size;
141	}	200	}
142		201
143	sub size_request {	202	sub size_request {
144	require Carp;	203	require Carp;
145	Carp::confess "size_request is abtract";	204	Carp::confess "size_request is abstract";
146	}	205	}
147		206
148	sub configure {	207	sub configure {
149	my ($self, $x, $y, $w, $h) = @_;	208	my ($self, $x, $y, $w, $h) = @_;
150		209
		210	if ($self->{aspect}) {
		211	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		212	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		213
		214	# use alignment to adjust x, y
		215
		216	$x += int +($w - $w2) * 0.5;
		217	$y += int +($h - $h2) * 0.5;
		218
		219	($w, $h) = ($w2, $h2);
		220	}
		221
		222	if ($self->{x} != $x || $self->{y} != $y) {
151	$self->{x} = $x;	223	$self->{x} = $x;
152	$self->{y} = $y;	224	$self->{y} = $y;
		225	$self->update;
		226	}
153		227
154	return unless $self->{w} != $w || $self->{h} != $h;	228	if ($self->{w} != $w || $self->{h} != $h) {
155
156	$self->{w} = $w;	229	$self->{w} = $w;
157	$self->{h} = $h;	230	$self->{h} = $h;
158		231
159	$self->size_allocate ($w, $h);	232	$self->size_allocate ($w, $h);
160	$self->update;	233	$self->update;
		234	}
161	}	235	}
162		236
163	sub size_allocate {	237	sub size_allocate {
164	# nothing to be done	238	# nothing to be done
		239	}
		240
		241	sub set_max_size {
		242	my ($self, $w, $h) = @_;
		243
		244	delete $self->{max_w}; $self->{max_w} = $w if $w;
		245	delete $self->{max_h}; $self->{max_h} = $h if $h;
165	}	246	}
166		247
167	# return top left coordinates	248	# return top left coordinates
168	sub _topleft {	249	sub _topleft {
169	my ($self, $x, $y) = @_;	250	my ($self, $x, $y) = @_;
…		…
252	glVertex $x + $self->{w}, $y + $self->{h};	333	glVertex $x + $self->{w}, $y + $self->{h};
253	glVertex $x , $y + $self->{h};	334	glVertex $x , $y + $self->{h};
254	glEnd;	335	glEnd;
255	glDisable GL_BLEND;	336	glDisable GL_BLEND;
256	}	337	}
		338
		339	if ($ENV{PCLIENT_DEBUG}) {
		340	glPushMatrix;
		341	glColor 1, 1, 0, 1;
		342	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		343	glBegin GL_LINE_LOOP;
		344	glVertex 0 , 0;
		345	glVertex $self->{w}, 0;
		346	glVertex $self->{w}, $self->{h};
		347	glVertex 0 , $self->{h};
		348	glEnd;
		349	glPopMatrix;
		350	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		351	}
257	}	352	}
258		353
259	sub _draw {	354	sub _draw {
260	my ($self) = @_;	355	my ($self) = @_;
261		356
262	warn "no draw defined for $self\n";	357	warn "no draw defined for $self\n";
263	}	358	}
264		359
265	sub find_widget {	360	sub find_widget {
266	my ($self, $x, $y) = @_;	361	my ($self, $x, $y) = @_;
		362
		363	return () unless $self->{can_events};
267		364
268	return $self	365	return $self
269	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	366	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	367	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
271		368
…		…
279	}	376	}
280		377
281	sub check_size {	378	sub check_size {
282	my ($self) = @_;	379	my ($self) = @_;
283		380
284	my ($w, $h) = $self->size_request;	381	$self->{parent}
		382	or return 1;
285		383
		384	my ($w, $h) = $self->{user_w} && $self->{user_h}
		385	? @$self{qw(user_w user_h)}
		386	: $self->size_request;
		387
286	if ($w != $self->{req_w} || $h != $self->{req_h}) {	388	if ($w != $self->{req_w} || $h != $self->{req_h}) {
287	$self->{req_w} = $w;	389	$self->{req_w} = $w;
288	$self->{req_h} = $h;	390	$self->{req_h} = $h;
289		391
290	$self->{parent}->check_size	392	$self->{parent}->check_size
291	if $self->{parent};	393	or $self->size_allocate (
		394	(List::Util::max $self->{w}, $w),
		395	(List::Util::max $self->{h}, $h),
		396	);
		397
		398	1
		399	} else {
		400	0
292	}	401	}
293	}	402	}
294		403
295	sub update {	404	sub update {
296	my ($self) = @_;	405	my ($self) = @_;
…		…
306	}	415	}
307		416
308	sub emit {	417	sub emit {
309	my ($self, $signal, @args) = @_;	418	my ($self, $signal, @args) = @_;
310		419
311	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	420	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312	$cb->($self, @args);
313	}
314	}	421	}
315		422
316	sub DESTROY {	423	sub DESTROY {
317	my ($self) = @_;	424	my ($self) = @_;
318		425
…		…
324	package CFClient::UI::DrawBG;	431	package CFClient::UI::DrawBG;
325		432
326	our @ISA = CFClient::UI::Base::;	433	our @ISA = CFClient::UI::Base::;
327		434
328	use strict;	435	use strict;
329	use SDL::OpenGL;	436	use CFClient::OpenGL;
330		437
331	sub new {	438	sub new {
332	my $class = shift;	439	my $class = shift;
333		440
334	# range [value, low, high, page]	441	# range [value, low, high, page]
…		…
363		470
364	package CFClient::UI::Empty;	471	package CFClient::UI::Empty;
365		472
366	our @ISA = CFClient::UI::Base::;	473	our @ISA = CFClient::UI::Base::;
367		474
		475	sub new {
		476	my ($class, %arg) = @_;
		477	$class->SUPER::new (can_events => 0, %arg);
		478	}
		479
368	sub size_request {	480	sub size_request {
369	(0, 0)	481	(0, 0)
370	}	482	}
371		483
372	sub draw { }	484	sub draw { }
…		…
380	sub new {	492	sub new {
381	my ($class, %arg) = @_;	493	my ($class, %arg) = @_;
382		494
383	my $children = delete $arg{children} || [];	495	my $children = delete $arg{children} || [];
384		496
385	my $self = $class->SUPER::new (children => [], %arg);	497	my $self = $class->SUPER::new (
		498	children => [],
		499	can_events => 0,
		500	%arg,
		501	);
386	$self->add ($_) for @$children;	502	$self->add ($_) for @$children;
387		503
388	$self	504	$self
389	}	505	}
390		506
…		…
405		521
406	sub remove {	522	sub remove {
407	my ($self, $child) = @_;	523	my ($self, $child) = @_;
408		524
409	delete $child->{parent};	525	delete $child->{parent};
		526	$child->hide;
410		527
411	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412		529
413	$self->check_size;	530	$self->check_size;
		531	$self->update;
		532	}
		533
		534	sub clear {
		535	my ($self) = @_;
		536
		537	my $children = delete $self->{children};
		538	$self->{children} = [];
		539
		540	for (@$children) {
		541	delete $_->{parent};
		542	$_->hide;
		543	}
414	}	544	}
415		545
416	sub find_widget {	546	sub find_widget {
417	my ($self, $x, $y) = @_;	547	my ($self, $x, $y) = @_;
418		548
…		…
482		612
483	package CFClient::UI::Window;	613	package CFClient::UI::Window;
484		614
485	our @ISA = CFClient::UI::Bin::;	615	our @ISA = CFClient::UI::Bin::;
486		616
487	use SDL::OpenGL;	617	use CFClient::OpenGL;
488		618
489	sub new {	619	sub new {
490	my ($class, %arg) = @_;	620	my ($class, %arg) = @_;
491		621
492	my $self = $class->SUPER::new (%arg);	622	my $self = $class->SUPER::new (%arg);
…		…
546	sub new { die }	676	sub new { die }
547		677
548	sub size_request {	678	sub size_request {
549	my ($self) = @_;	679	my ($self) = @_;
550		680
551	@$self{qw(child_w child_h)} = $self->child->size_request;	681	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
552	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	682	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553		683
554	@$self{qw(child_w child_h)}	684	@$self{qw(child_w child_h)}
555	}	685	}
556		686
…		…
565		695
566	package CFClient::UI::Frame;	696	package CFClient::UI::Frame;
567		697
568	our @ISA = CFClient::UI::Bin::;	698	our @ISA = CFClient::UI::Bin::;
569		699
570	use SDL::OpenGL;	700	use CFClient::OpenGL;
571
572	sub size_request {
573	my ($self) = @_;
574	my $chld = $self->child
575	or return (0, 0);
576
577	$chld->move (2, 2);
578
579	map { $_ + 4 } $chld->size_request;
580	}
581
582	sub size_allocate {
583	my ($self, $x, $y, $w, $h) = @_;
584
585	$self->child->configure (2, 2, $w - 4, $h - 4);
586	}
587
588	sub _draw {
589	my ($self) = @_;
590
591	my $chld = $self->child;
592
593	my ($w, $h) = $chld->size_request;
594
595	glBegin GL_QUADS;
596	glColor 0, 0, 0;
597	glVertex 0 , 0;
598	glVertex 0 , $h + 4;
599	glVertex $w + 4 , $h + 4;
600	glVertex $w + 4 , 0;
601	glEnd;
602
603	$chld->draw;
604	}
605
606	#############################################################################
607
608	package CFClient::UI::FancyFrame;
609
610	our @ISA = CFClient::UI::Bin::;
611
612	use SDL::OpenGL;
613
614	my @tex =
615	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
616	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617		701
618	sub new {	702	sub new {
619	my $class = shift;	703	my $class = shift;
620		704
621	# TODO: user_x, user_y, overwrite moveto?
622
623	$class->SUPER::new (	705	my $self = $class->SUPER::new (
624	bg => [1, 1, 1, 1],	706	bg => [1, 1, 1, 1],
625	border_bg => [1, 1, 1, 1],	707	border_bg => [1, 1, 1, 1],
626	border => 0.8,	708	border => 0.8,
627	@_	709	@_
628	)	710	);
		711
		712	$self
		713	}
		714
		715	sub _draw {
		716	my ($self) = @_;
		717
		718	my ($w, $h) = ($self->{w}, $self->{h});
		719
		720	glEnable GL_BLEND;
		721	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		722	glEnable GL_TEXTURE_2D;
		723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		724
		725	# glBegin GL_QUADS;
		726	# glColor 0, 0, 0, 0;
		727	# glVertex 0 , 0;
		728	# glVertex 0 , $h;
		729	# glVertex $w, $h;
		730	# glVertex $w, 0;
		731	# glEnd;
		732
		733
		734	$self->child->draw;
		735	glDisable GL_BLEND;
		736	glDisable GL_TEXTURE_2D;
		737	}
		738
		739	#############################################################################
		740
		741	package CFClient::UI::FancyFrame;
		742
		743	our @ISA = CFClient::UI::Bin::;
		744
		745	use CFClient::OpenGL;
		746
		747	my @tex =
		748	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		749	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		750
		751	sub new {
		752	my $class = shift;
		753
		754	# TODO: user_x, user_y, overwrite moveto?
		755
		756	my $self = $class->SUPER::new (
		757	bg => [1, 1, 1, 1],
		758	border_bg => [1, 1, 1, 1],
		759	border => 0.8,
		760	can_events => 1,
		761	@_
		762	);
		763
		764	$self->{title} &&= new CFClient::UI::Label
		765	align => 0,
		766	valign => 1,
		767	text => $self->{title},
		768	fontsize => 1;
		769
		770	$self
629	}	771	}
630		772
631	sub border {	773	sub border {
632	int $_[0]{border} * $::FONTSIZE	774	int $_[0]{border} * $::FONTSIZE
633	}	775	}
634		776
635	sub size_request {	777	sub size_request {
636	my ($self) = @_;	778	my ($self) = @_;
637
638	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639		779
640	my ($w, $h) = $self->SUPER::size_request;	780	my ($w, $h) = $self->SUPER::size_request;
641		781
642	(	782	(
643	$w + $self->border * 2,	783	$w + $self->border * 2,
…		…
649	my ($self, $w, $h) = @_;	789	my ($self, $w, $h) = @_;
650		790
651	$h -= List::Util::max 0, $self->border * 2;	791	$h -= List::Util::max 0, $self->border * 2;
652	$w -= List::Util::max 0, $self->border * 2;	792	$w -= List::Util::max 0, $self->border * 2;
653		793
		794	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		795	if $self->{title};
		796
654	$self->child->configure ($self->border, $self->border, $w, $h);	797	$self->child->configure ($self->border, $self->border, $w, $h);
655	}	798	}
656		799
657	sub button_down {	800	sub button_down {
658	my ($self, $ev, $x, $y) = @_;	801	my ($self, $ev, $x, $y) = @_;
…		…
660	my $border = $self->border;	803	my $border = $self->border;
661		804
662	if ($x < $self->{w} && $x >= $self->{w} - $border	805	if ($x < $self->{w} && $x >= $self->{w} - $border
663	&& $y < $self->{h} && $y >= $self->{h} - $border) {	806	&& $y < $self->{h} && $y >= $self->{h} - $border) {
664		807
665	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	808	my ($ox, $oy) = ($ev->{x}, $ev->{y});
666	my ($bw, $bh) = ($self->{w}, $self->{h});	809	my ($bw, $bh) = ($self->{w}, $self->{h});
667		810
668	$self->{motion} = sub {	811	$self->{motion} = sub {
669	my ($ev, $x, $y) = @_;	812	my ($ev, $x, $y) = @_;
670		813
671	($x, $y) = ($ev->motion_x, $ev->motion_y);	814	($x, $y) = ($ev->{x}, $ev->{y});
672		815
673	$self->{user_w} = $bw + $x - $ox;	816	$self->{user_w} = $bw + $x - $ox;
674	$self->{user_h} = $bh + $y - $oy;	817	$self->{user_h} = $bh + $y - $oy;
675	$self->check_size;	818	$self->check_size;
676	};	819	};
677		820
678	} elsif ($x >= 0 && $x < $self->{w}	821	} elsif ($x >= 0 && $x < $self->{w}
679	&& $y >= 0 && $y < $border) {	822	&& $y >= 0 && $y < $border) {
680		823
681	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	824	my ($ox, $oy) = ($ev->{x}, $ev->{y});
682	my ($bx, $by) = ($self->{x}, $self->{y});	825	my ($bx, $by) = ($self->{x}, $self->{y});
683		826
684	$self->{motion} = sub {	827	$self->{motion} = sub {
685	my ($ev, $x, $y) = @_;	828	my ($ev, $x, $y) = @_;
686		829
687	($x, $y) = ($ev->motion_x, $ev->motion_y);	830	($x, $y) = ($ev->{x}, $ev->{y});
688		831
689	$self->move ($bx + $x - $ox, $by + $y - $oy);	832	$self->move ($bx + $x - $ox, $by + $y - $oy);
690	$self->update;	833	$self->update;
691	};	834	};
692	}	835	}
…		…
737	$bg->draw_quad ($border, $border, $cw, $ch);	880	$bg->draw_quad ($border, $border, $cw, $ch);
738		881
739	glDisable GL_TEXTURE_2D;	882	glDisable GL_TEXTURE_2D;
740	glDisable GL_BLEND;	883	glDisable GL_BLEND;
741		884
		885	$self->{title}->draw if $self->{title};
742	$self->child->draw;	886	$self->child->draw;
743	}	887	}
744		888
745	#############################################################################	889	#############################################################################
746		890
…		…
748		892
749	our @ISA = CFClient::UI::Base::;	893	our @ISA = CFClient::UI::Base::;
750		894
751	use List::Util qw(max sum);	895	use List::Util qw(max sum);
752		896
753	use SDL::OpenGL;	897	use CFClient::OpenGL;
754		898
755	sub new {	899	sub new {
756	my $class = shift;	900	my $class = shift;
757		901
758	$class->SUPER::new (	902	$class->SUPER::new (
…		…
772		916
773	# TODO: move to container class maybe? send childs a signal on removal?	917	# TODO: move to container class maybe? send childs a signal on removal?
774	sub clear {	918	sub clear {
775	my ($self) = @_;	919	my ($self) = @_;
776		920
777	delete $self->{children};	921	my $children = delete $self->{children};
		922
		923	for (grep $_, map @$_, grep $_, @$children) {
		924	delete $_->{parent};
		925	$_->hide;
		926	}
		927
778	$self->update;	928	$self->update;
779	}	929	}
780		930
781	sub get_wh {	931	sub get_wh {
782	my ($self) = @_;	932	my ($self) = @_;
…		…
788	or next;	938	or next;
789		939
790	for my $x (0 .. $#$row) {	940	for my $x (0 .. $#$row) {
791	my $widget = $row->[$x]	941	my $widget = $row->[$x]
792	or next;	942	or next;
793	my ($w, $h) = $widget->size_request;	943	my ($w, $h) = @$widget{qw(req_w req_h)};
794		944
795	$w[$x] = max $w[$x], $w;	945	$w[$x] = max $w[$x], $w;
796	$h[$y] = max $h[$y], $h;	946	$h[$y] = max $h[$y], $h;
797	}	947	}
798	}	948	}
…		…
903		1053
904	($h, $w) = ($w, $h);	1054	($h, $w) = ($w, $h);
905		1055
906	my $children = $self->{children};	1056	my $children = $self->{children};
907		1057
908	my @h = map +($_->size_request)[0], @$children;	1058	my @h = map $_->{req_w}, @$children;
909		1059
910	my $req_h = List::Util::sum @h;	1060	my $req_h = List::Util::sum @h;
911		1061
912	if ($req_h > $h) {	1062	if ($req_h > $h) {
913	# ah well, not enough space	1063	# ah well, not enough space
…		…
961	sub size_allocate {	1111	sub size_allocate {
962	my ($self, $w, $h) = @_;	1112	my ($self, $w, $h) = @_;
963		1113
964	my $children = $self->{children};	1114	my $children = $self->{children};
965		1115
966	my @h = map +($_->size_request)[1], @$children;	1116	my @h = map $_->{req_h}, @$children;
967		1117
968	my $req_h = List::Util::sum @h;	1118	my $req_h = List::Util::sum @h;
969		1119
970	if ($req_h > $h) {	1120	if ($req_h > $h) {
971	# ah well, not enough space	1121	# ah well, not enough space
…		…
999		1149
1000	package CFClient::UI::Label;	1150	package CFClient::UI::Label;
1001		1151
1002	our @ISA = CFClient::UI::Base::;	1152	our @ISA = CFClient::UI::Base::;
1003		1153
1004	use SDL::OpenGL;	1154	use CFClient::OpenGL;
1005		1155
1006	sub new {	1156	sub new {
1007	my ($class, %arg) = @_;	1157	my ($class, %arg) = @_;
1008		1158
1009	my $self = $class->SUPER::new (	1159	my $self = $class->SUPER::new (
1010	fg => [1, 1, 1],	1160	fg => [1, 1, 1],
		1161	#font => default_font
1011	fontsize => 1,	1162	fontsize => 1,
1012	text => "",	1163	text => "",
1013	align => -1,	1164	align => -1,
1014	valign => -1,	1165	valign => -1,
1015	padding => 2,	1166	padding => 2,
1016	layout => new CFClient::Layout,	1167	layout => new CFClient::Layout,
		1168	can_events => 0,
1017	%arg	1169	%arg
1018	);	1170	);
1019		1171
1020	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1172	if (exists $self->{template}) {
		1173	my $layout = new CFClient::Layout;
		1174	$layout->set_text (delete $self->{template});
		1175	$self->{template} = $layout;
		1176	}
1021		1177
1022	$self->set_text (delete $self->{text}) if exists $self->{text};	1178	$self->set_text (delete $self->{text}) if exists $self->{text};
1023	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1179	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1024		1180
1025	$self	1181	$self
1026	}	1182	}
1027		1183
1028	sub escape_text {	1184	sub escape {
1029	local $_ = $_[1];	1185	local $_ = $_[1];
1030		1186
1031	s/&/&amp;/g;	1187	s/&/&amp;/g;
1032	s/>/&gt;/g;	1188	s/>/&gt;/g;
1033	s/</&lt;/g;	1189	s/</&lt;/g;
…		…
1039	my ($self, $text) = @_;	1195	my ($self, $text) = @_;
1040		1196
1041	$self->{layout}->set_text ($text);	1197	$self->{layout}->set_text ($text);
1042		1198
1043	delete $self->{texture};	1199	delete $self->{texture};
		1200	$self->check_size;
1044	$self->update;	1201	$self->update;
1045	}	1202	}
1046		1203
1047	sub set_markup {	1204	sub set_markup {
1048	my ($self, $markup) = @_;	1205	my ($self, $markup) = @_;
1049		1206
1050	$self->{layout}->set_markup ($markup);	1207	$self->{layout}->set_markup ($markup);
1051		1208
1052	delete $self->{texture};	1209	delete $self->{texture};
		1210	$self->check_size;
1053	$self->update;	1211	$self->update;
1054	}	1212	}
1055		1213
1056	sub size_request {	1214	sub size_request {
1057	my ($self) = @_;	1215	my ($self) = @_;
1058		1216
1059	$self->{layout}->set_width;	1217	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1218	$self->{layout}->set_width ($self->{max_w} || -1);
1060	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1219	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061		1220
1062	my ($w, $h) = $self->{layout}->size;	1221	my ($w, $h) = $self->{layout}->size;
		1222
		1223	if (exists $self->{template}) {
		1224	$self->{template}->set_font ($self->{font}) if $self->{font};
		1225	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1226
		1227	my ($w2, $h2) = $self->{template}->size;
		1228
		1229	$w = List::Util::max $w, $w2;
		1230	$h = List::Util::max $h, $h2;
		1231	}
1063		1232
1064	(	1233	(
1065	$w + $self->{padding} * 2,	1234	$w + $self->{padding} * 2,
1066	$h + $self->{padding} * 2,	1235	$h + $self->{padding} * 2,
1067	)	1236	)
…		…
1071	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h) = @_;
1072		1241
1073	delete $self->{texture};	1242	delete $self->{texture};
1074	}	1243	}
1075		1244
		1245	sub set_fontsize {
		1246	my ($self, $fontsize) = @_;
		1247
		1248	$self->{fontsize} = $fontsize;
		1249	delete $self->{texture};
		1250	$self->check_size;
		1251	$self->update;
		1252	}
		1253
1076	sub _draw {	1254	sub _draw {
1077	my ($self) = @_;	1255	my ($self) = @_;
1078		1256
1079	my $tex = $self->{texture} ||= do {	1257	my $tex = $self->{texture} ||= do {
		1258	$self->{layout}->set_font ($self->{font}) if $self->{font};
1080	$self->{layout}->set_width ($self->{w});	1259	$self->{layout}->set_width ($self->{w});
1081	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1082	new_from_layout CFClient::Texture $self->{layout}	1261	new_from_layout CFClient::Texture $self->{layout}
1083	};	1262	};
1084		1263
…		…
1111		1290
1112	package CFClient::UI::EntryBase;	1291	package CFClient::UI::EntryBase;
1113		1292
1114	our @ISA = CFClient::UI::Label::;	1293	our @ISA = CFClient::UI::Label::;
1115		1294
1116	use SDL;	1295	use CFClient::OpenGL;
1117	use SDL::OpenGL;
1118		1296
1119	sub new {	1297	sub new {
1120	my $class = shift;	1298	my $class = shift;
1121		1299
1122	$class->SUPER::new (	1300	$class->SUPER::new (
1123	fg => [1, 1, 1],	1301	fg => [1, 1, 1],
1124	bg => [0, 0, 0, 0.2],	1302	bg => [0, 0, 0, 0.2],
1125	active_bg => [1, 1, 1, 0.5],	1303	active_bg => [1, 1, 1, 0.5],
1126	active_fg => [0, 0, 0],	1304	active_fg => [0, 0, 0],
1127	can_hover => 1,	1305	can_hover => 1,
1128	can_focus => 1,	1306	can_focus => 1,
1129	valign => 0,	1307	valign => 0,
		1308	can_events => 1,
1130	@_	1309	@_
1131	)	1310	)
1132	}	1311	}
1133		1312
1134	sub _set_text {	1313	sub _set_text {
…		…
1162	}	1341	}
1163		1342
1164	sub size_allocate {	1343	sub size_allocate {
1165	my ($self, $w, $h) = @_;	1344	my ($self, $w, $h) = @_;
1166		1345
1167	$self->_set_text ($self->{text});	1346	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1168	}	1347	}
1169		1348
1170	sub set_text {	1349	sub set_text {
1171	my ($self, $text) = @_;	1350	my ($self, $text) = @_;
1172		1351
…		…
1176	}	1355	}
1177		1356
1178	sub key_down {	1357	sub key_down {
1179	my ($self, $ev) = @_;	1358	my ($self, $ev) = @_;
1180		1359
1181	my $mod = $ev->key_mod;	1360	my $mod = $ev->{mod};
1182	my $sym = $ev->key_sym;	1361	my $sym = $ev->{sym};
1183
1184	my $uni = $ev->key_unicode;	1362	my $uni = $ev->{unicode};
1185		1363
1186	my $text = $self->get_text;	1364	my $text = $self->get_text;
1187		1365
1188	if ($sym == SDLK_BACKSPACE) {	1366	if ($sym == 8) {
1189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1367	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1190	} elsif ($sym == SDLK_DELETE) {	1368	} elsif ($sym == 127) {
1191	substr $text, $self->{cursor}, 1, "";	1369	substr $text, $self->{cursor}, 1, "";
1192	} elsif ($sym == SDLK_LEFT) {	1370	} elsif ($sym == CFClient::SDLK_LEFT) {
1193	--$self->{cursor} if $self->{cursor};	1371	--$self->{cursor} if $self->{cursor};
1194	} elsif ($sym == SDLK_RIGHT) {	1372	} elsif ($sym == CFClient::SDLK_RIGHT) {
1195	++$self->{cursor} if $self->{cursor} < length $self->{text};	1373	++$self->{cursor} if $self->{cursor} < length $self->{text};
1196	} elsif ($sym == SDLK_HOME) {	1374	} elsif ($sym == CFClient::SDLK_HOME) {
1197	$self->{cursor} = 0;	1375	$self->{cursor} = 0;
1198	} elsif ($sym == SDLK_END) {	1376	} elsif ($sym == CFClient::SDLK_END) {
1199	$self->{cursor} = length $text;	1377	$self->{cursor} = length $text;
1200	} elsif ($sym == SDLK_ESCAPE) {	1378	} elsif ($sym == 27) {
1201	$self->emit ('escape');	1379	$self->emit ('escape');
1202	} elsif ($uni) {	1380	} elsif ($uni) {
1203	substr $text, $self->{cursor}++, 0, chr $uni;	1381	substr $text, $self->{cursor}++, 0, chr $uni;
1204	}	1382	}
1205		1383
…		…
1280		1458
1281	package CFClient::UI::Entry;	1459	package CFClient::UI::Entry;
1282		1460
1283	our @ISA = CFClient::UI::EntryBase::;	1461	our @ISA = CFClient::UI::EntryBase::;
1284		1462
1285	use SDL;	1463	use CFClient::OpenGL;
1286	use SDL::OpenGL;
1287		1464
1288	sub key_down {	1465	sub key_down {
1289	my ($self, $ev) = @_;	1466	my ($self, $ev) = @_;
1290		1467
1291	my $sym = $ev->key_sym;	1468	my $sym = $ev->{sym};
1292		1469
1293	if ($sym == SDLK_RETURN) {	1470	if ($sym == 13) {
		1471	unshift @{$self->{history}},
		1472	my $txt = $self->get_text;
		1473	$self->{history_pointer} = -1;
1294	$self->emit (activate => $self->get_text);	1474	$self->emit (activate => $txt);
1295	$self->update;	1475	$self->update;
		1476
		1477	} elsif ($sym == CFClient::SDLK_UP) {
		1478	if ($self->{history_pointer} < 0) {
		1479	$self->{history_saveback} = $self->get_text;
		1480	}
		1481	$self->{history_pointer}++;
		1482	if ($self->{history_pointer} >= @{$self->{history}}) {
		1483	$self->{history_pointer} = @{$self->{history}} - 1;
		1484	}
		1485	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1486
		1487	} elsif ($sym == CFClient::SDLK_DOWN) {
		1488	$self->{history_pointer}--;
		1489	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1490
		1491	if ($self->{history_pointer} >= 0) {
		1492	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1493	} else {
		1494	$self->set_text ($self->{history_saveback});
		1495	}
1296		1496
1297	} else {	1497	} else {
1298	$self->SUPER::key_down ($ev);	1498	$self->SUPER::key_down ($ev);
1299	}	1499	}
1300		1500
…		…
1304		1504
1305	package CFClient::UI::Button;	1505	package CFClient::UI::Button;
1306		1506
1307	our @ISA = CFClient::UI::Label::;	1507	our @ISA = CFClient::UI::Label::;
1308		1508
1309	use SDL;	1509	use CFClient::OpenGL;
1310	use SDL::OpenGL;
1311		1510
1312	my @tex =	1511	my @tex =
1313	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1512	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314	qw(b1_button_active.png);	1513	qw(b1_button_active.png);
1315		1514
1316	sub new {	1515	sub new {
1317	my $class = shift;	1516	my $class = shift;
1318		1517
1319	$class->SUPER::new (	1518	$class->SUPER::new (
1320	padding => 4,	1519	padding => 4,
1321	fg => [1, 1, 1],	1520	fg => [1, 1, 1],
1322	bg => [1, 1, 1, 0.2],	1521	bg => [1, 1, 1, 0.2],
1323	active_fg => [0, 0, 1],	1522	active_fg => [0, 0, 1],
1324	can_hover => 1,	1523	can_hover => 1,
1325	align => 0,	1524	align => 0,
1326	valign => 0,	1525	valign => 0,
		1526	can_events => 1,
1327	@_	1527	@_
1328	)	1528	)
1329	}	1529	}
1330		1530
1331	sub button_up {	1531	sub button_up {
…		…
1365	package CFClient::UI::CheckBox;	1565	package CFClient::UI::CheckBox;
1366		1566
1367	our @ISA = CFClient::UI::DrawBG::;	1567	our @ISA = CFClient::UI::DrawBG::;
1368		1568
1369	my @tex =	1569	my @tex =
1370	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1570	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1371	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1571	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1372		1572
1373	use SDL;	1573	use CFClient::OpenGL;
1374	use SDL::OpenGL;
1375		1574
1376	sub new {	1575	sub new {
1377	my $class = shift;	1576	my $class = shift;
1378		1577
1379	$class->SUPER::new (	1578	$class->SUPER::new (
…		…
1425	glDisable GL_BLEND;	1624	glDisable GL_BLEND;
1426	}	1625	}
1427		1626
1428	#############################################################################	1627	#############################################################################
1429		1628
1430	package CFClient::UI::VGauge;	1629	package CFClient::UI::Image;
1431		1630
1432	our @ISA = CFClient::UI::Base::;	1631	our @ISA = CFClient::UI::Base::;
1433		1632
1434	use SDL::OpenGL;	1633	use CFClient::OpenGL;
		1634	use Carp qw/confess/;
1435		1635
1436	my %tex = (	1636	our %loaded_images;
1437	food => [
1438	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440	],
1441	grace => [
1442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444	],
1445	hp => [
1446	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448	],
1449	mana => [
1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452	],
1453	);
1454		1637
1455	# eg. VGauge->new (gauge => 'food'), default gauge: food
1456	sub new {	1638	sub new {
1457	my $class = shift;	1639	my $class = shift;
1458		1640
1459	my $self = $class->SUPER::new (gauge => 'food', @_);	1641	my $self = $class->SUPER::new (can_events => 0, @_);
		1642
		1643	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1644
		1645	$loaded_images{$self->{image}} ||=
		1646	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1647
		1648	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1649
		1650	Scalar::Util::weaken $loaded_images{$self->{image}};
		1651
		1652	$self->{aspect} = $tex->{w} / $tex->{h};
1460		1653
1461	$self	1654	$self
1462	}	1655	}
1463		1656
1464	sub size_request {	1657	sub size_request {
1465	my ($self) = @_;	1658	my ($self) = @_;
1466		1659
1467	my $tex = $tex{$self->{gauge}}[0];	1660	($self->{tex}->{w}, $self->{tex}->{h})
1468
1469	@$tex{qw(w h)}
1470	}
1471
1472	sub set_max {
1473	my ($self, $max) = @_;
1474
1475	$self->{max_val} = $max;
1476	}
1477
1478	sub set_value {
1479	my ($self, $val, $max) = @_;
1480
1481	$self->set_max ($max)
1482	if defined $max;
1483
1484	$max = $self->{max_val};
1485	$self->{val} = $val;
1486
1487	$self->update;
1488	}	1661	}
1489		1662
1490	sub _draw {	1663	sub _draw {
1491	my ($self) = @_;	1664	my ($self) = @_;
1492		1665
1493	my $tex = $tex{$self->{gauge}};	1666	my $tex = $self->{tex};
1494		1667
1495	my ($w, $h) = ($self->{w}, $self->{h});	1668	my ($w, $h) = ($self->{w}, $self->{h});
1496		1669
1497	my $ycut = $self->{val} / ($self->{max_val} || 1);	1670	if ($self->{rot90}) {
1498	$ycut = 1 if $self->{val} > $self->{max_val};	1671	glRotate 90, 0, 0, 1;
		1672	glTranslate 0, -$self->{w}, 0;
1499		1673
1500	my $t1 = $tex->[0];	1674	($w, $h) = ($h, $w);
1501	my $t2 = $tex->[1];	1675	}
1502		1676
1503	glEnable GL_BLEND;	1677	glEnable GL_BLEND;
1504	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1505	glEnable GL_TEXTURE_2D;	1679	glEnable GL_TEXTURE_2D;
1506	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1507		1681
		1682	$tex->draw_quad (0, 0, $w, $h);
		1683
		1684	glDisable GL_BLEND;
		1685	glDisable GL_TEXTURE_2D;
		1686	}
		1687
		1688	#############################################################################
		1689
		1690	package CFClient::UI::VGauge;
		1691
		1692	our @ISA = CFClient::UI::Base::;
		1693
		1694	use List::Util qw(min max);
		1695
		1696	use CFClient::OpenGL;
		1697
		1698	my %tex = (
		1699	food => [
		1700	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1701	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1702	],
		1703	grace => [
		1704	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1705	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1706	],
		1707	hp => [
		1708	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1709	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1710	],
		1711	mana => [
		1712	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1713	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1714	],
		1715	);
		1716
		1717	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1718	sub new {
		1719	my $class = shift;
		1720
		1721	my $self = $class->SUPER::new (
		1722	type => 'food',
		1723	@_
		1724	);
		1725
		1726	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1727
		1728	$self
		1729	}
		1730
		1731	sub size_request {
		1732	my ($self) = @_;
		1733
		1734	#my $tex = $tex{$self->{type}}[0];
		1735	#@$tex{qw(w h)}
		1736	(0, 0)
		1737	}
		1738
		1739	sub set_max {
		1740	my ($self, $max) = @_;
		1741
		1742	$self->{max_val} = $max;
		1743	}
		1744
		1745	sub set_value {
		1746	my ($self, $val, $max) = @_;
		1747
		1748	$self->set_max ($max)
		1749	if defined $max;
		1750
		1751	$max = $self->{max_val};
		1752	$self->{val} = $val;
		1753
		1754	$self->update;
		1755	}
		1756
		1757	sub _draw {
		1758	my ($self) = @_;
		1759
		1760	my $tex = $tex{$self->{type}};
		1761	my ($t1, $t2, $t3) = @$tex;
		1762
		1763	my ($w, $h) = ($self->{w}, $self->{h});
		1764
		1765	if ($self->{vertical}) {
		1766	glRotate 90, 0, 0, 1;
		1767	glTranslate 0, -$self->{w}, 0;
		1768
		1769	($w, $h) = ($h, $w);
		1770	}
		1771
		1772	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1773
		1774	my $ycut1 = max 0, min 1, $ycut;
		1775	my $ycut2 = max 0, min 1, $ycut - 1;
		1776
1508	my $h1 = $self->{h} - $ycut * $self->{h};	1777	my $h1 = $self->{h} * (1 - $ycut1);
1509	my $h2 = $ycut * $self->{h};	1778	my $h2 = $self->{h} * (1 - $ycut2);
1510		1779
1511	my $yp = 0;	1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1782	glEnable GL_TEXTURE_2D;
		1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512		1784
1513	glBindTexture GL_TEXTURE_2D, $t1->{name};	1785	glBindTexture GL_TEXTURE_2D, $t1->{name};
1514	glBegin GL_QUADS;	1786	glBegin GL_QUADS;
1515	glTexCoord 0 , 0; glVertex 0 , $yp;	1787	glTexCoord 0 , 0; glVertex 0 , 0;
1516	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1788	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1517	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1789	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1518	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1790	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1519	glEnd;	1791	glEnd;
1520		1792
1521	$yp += $h1;	1793	my $ycut1 = List::Util::min 1, $ycut;
1522
1523	glBindTexture GL_TEXTURE_2D, $t2->{name};	1794	glBindTexture GL_TEXTURE_2D, $t2->{name};
1524	glBegin GL_QUADS;	1795	glBegin GL_QUADS;
1525	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1796	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1526	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1797	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1527	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1528	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;	1798	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1799	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1529	glEnd;	1800	glEnd;
		1801
		1802	if ($t3) {
		1803	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1804	glBegin GL_QUADS;
		1805	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1806	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1807	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1808	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1809	glEnd;
		1810	}
1530		1811
1531	glDisable GL_BLEND;	1812	glDisable GL_BLEND;
1532	glDisable GL_TEXTURE_2D;	1813	glDisable GL_TEXTURE_2D;
1533	}	1814	}
1534		1815
1535	#############################################################################	1816	#############################################################################
1536		1817
		1818	package CFClient::UI::Gauge;
		1819
		1820	our @ISA = CFClient::UI::VBox::;
		1821
		1822	sub new {
		1823	my ($class, %arg) = @_;
		1824
		1825	my $self = $class->SUPER::new (
		1826	tooltip => $arg{type},
		1827	can_hover => 1,
		1828	%arg,
		1829	);
		1830
		1831	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1832	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1833	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1834
		1835	$self
		1836	}
		1837
		1838	sub set_fontsize {
		1839	my ($self, $fsize) = @_;
		1840
		1841	$self->{value}->set_fontsize ($fsize);
		1842	$self->{max} ->set_fontsize ($fsize);
		1843	}
		1844
		1845	sub set_value {
		1846	my ($self, $val, $max) = @_;
		1847
		1848	$self->set_max ($max)
		1849	if defined $max;
		1850
		1851	$self->{gauge}->set_value ($val, $max);
		1852	$self->{value}->set_text ($val);
		1853	}
		1854
		1855	sub set_max {
		1856	my ($self, $max) = @_;
		1857
		1858	$self->{gauge}->set_max ($max);
		1859	$self->{max}->set_text ($max);
		1860	}
		1861
		1862	#############################################################################
		1863
1537	package CFClient::UI::Slider;	1864	package CFClient::UI::Slider;
1538		1865
1539	use strict;	1866	use strict;
1540		1867
1541	use SDL::OpenGL;	1868	use CFClient::OpenGL;
1542		1869
1543	our @ISA = CFClient::UI::DrawBG::;	1870	our @ISA = CFClient::UI::DrawBG::;
1544		1871
1545	my @tex =	1872	my @tex =
1546	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1873	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1671		1998
1672	package CFClient::UI::TextView;	1999	package CFClient::UI::TextView;
1673		2000
1674	our @ISA = CFClient::UI::HBox::;	2001	our @ISA = CFClient::UI::HBox::;
1675		2002
1676	use SDL::OpenGL;	2003	use CFClient::OpenGL;
1677		2004
1678	sub new {	2005	sub new {
1679	my $class = shift;	2006	my $class = shift;
1680		2007
1681	my $self = $class->SUPER::new (	2008	my $self = $class->SUPER::new (
1682	fontsize => 1,	2009	fontsize => 1,
		2010	can_events => 0,
		2011	#font => default_font
1683	@_,	2012	@_,
1684		2013
1685	layout => (new CFClient::Layout),	2014	layout => (new CFClient::Layout),
1686	par => [],	2015	par => [],
1687	height => 0,	2016	height => 0,
1688	children => [	2017	children => [
1689	(new CFClient::UI::Empty expand => 1),	2018	(new CFClient::UI::Empty expand => 1),
1690	(new CFClient::UI::Slider vertical => 1),	2019	(new CFClient::UI::Slider vertical => 1),
1691	],	2020	],
1692	);	2021	);
1693		2022
…		…
1727	sub size_allocate {	2056	sub size_allocate {
1728	my ($self, $w, $h) = @_;	2057	my ($self, $w, $h) = @_;
1729		2058
1730	$self->SUPER::size_allocate ($w, $h);	2059	$self->SUPER::size_allocate ($w, $h);
1731		2060
		2061	$self->{layout}->set_font ($self->{font}) if $self->{font};
1732	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2062	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1733	$self->{layout}->set_width ($self->{children}[0]{w});	2063	$self->{layout}->set_width ($self->{children}[0]{w});
1734		2064
1735	$self->reflow;	2065	$self->reflow;
1736	}	2066	}
…		…
1788	my $y1 = $top + $self->{h};	2118	my $y1 = $top + $self->{h};
1789		2119
1790	my $y = 0;	2120	my $y = 0;
1791		2121
1792	my $layout = $self->{layout};	2122	my $layout = $self->{layout};
		2123
		2124	$layout->set_font ($self->{font}) if $self->{font};
1793		2125
1794	for my $par (@{$self->{par}}) {	2126	for my $par (@{$self->{par}}) {
1795	my $h = $par->[0];	2127	my $h = $par->[0];
1796		2128
1797	if ($y0 < $y + $h && $y < $y1) {	2129	if ($y0 < $y + $h && $y < $y1) {
…		…
1825		2157
1826	}	2158	}
1827		2159
1828	#############################################################################	2160	#############################################################################
1829		2161
1830	package CFClient::UI::MapWidget;
1831
1832	use strict;
1833
1834	use List::Util qw(min max);
1835
1836	use SDL;
1837	use SDL::OpenGL;
1838
1839	our @ISA = CFClient::UI::Base::;
1840
1841	sub new {
1842	my $class = shift;
1843
1844	$class->SUPER::new (
1845	z => -1,
1846	can_focus => 1,
1847	list => (glGenLists 1),
1848	@_
1849	)
1850	}
1851
1852	sub key_down {
1853	print "MAPKEYDOWN\n";
1854	}
1855
1856	sub key_up {
1857	}
1858
1859	sub button_down {
1860	my ($self, $ev, $x, $y) = @_;
1861
1862	$self->focus_in;
1863
1864	if ($ev->button == 2) {
1865	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1866	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1867
1868	$self->{motion} = sub {
1869	my ($ev, $x, $y) = @_;
1870
1871	($x, $y) = ($ev->motion_x, $ev->motion_y);
1872
1873	$::CFG->{map_shift_x} = $bw + $x - $ox;
1874	$::CFG->{map_shift_y} = $bh + $y - $oy;
1875
1876	$self->update;
1877	};
1878	}
1879	}
1880
1881	sub button_up {
1882	my ($self, $ev, $x, $y) = @_;
1883
1884	delete $self->{motion};
1885	}
1886
1887	sub mouse_motion {
1888	my ($self, $ev, $x, $y) = @_;
1889
1890	$self->{motion}->($ev, $x, $y) if $self->{motion};
1891	}
1892
1893	sub size_request {
1894	(
1895	1 + 32 * int $::WIDTH / 32,
1896	1 + 32 * int $::HEIGHT / 32,
1897	)
1898	}
1899
1900	sub update {
1901	my ($self) = @_;
1902
1903	$self->{need_update} = 1;
1904	$self->SUPER::update;
1905	}
1906
1907	sub draw {
1908	my ($self) = @_;
1909
1910	if (delete $self->{need_update}) {
1911	glNewList $self->{list}, GL_COMPILE;
1912
1913	if ($::MAP) {
1914	my $sw = int $::WIDTH / 32;
1915	my $sh = int $::HEIGHT / 32;
1916
1917	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1918	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1919
1920	glTranslate $sx0 - 32, $sy0 - 32, 0;
1921
1922	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1923
1924	if ($::CFG->{fow_enable}) {
1925	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1926	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1927	glConvolutionFilter2D (
1928	GL_CONVOLUTION_2D,
1929	GL_ALPHA,
1930	3, 3,
1931	GL_ALPHA, GL_FLOAT,
1932	pack "f*",
1933	0.1, 0.1, 0.1,
1934	0.1, 0.2, 0.1,
1935	0.1, 0.1, 0.1,
1936	);
1937	glEnable GL_CONVOLUTION_2D;
1938	}
1939
1940	$self->{fow_texture} = new CFClient::Texture
1941	w => $w,
1942	h => $h,
1943	data => $data,
1944	internalformat => GL_ALPHA,
1945	format => GL_ALPHA;
1946
1947	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1948
1949	glEnable GL_BLEND;
1950	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1951	glEnable GL_TEXTURE_2D;
1952	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1953
1954	glColor +($::CFG->{fow_intensity}) x 3, 1;
1955	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1956
1957	glDisable GL_TEXTURE_2D;
1958	glDisable GL_BLEND;
1959	}
1960
1961	# HACK BEGIN
1962	{
1963	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1964	my ($w, $h) = (250, 250);
1965
1966	glEnable GL_BLEND;
1967	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1968	glEnable GL_TEXTURE_2D;
1969	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1970
1971	$self->{mapmap_texture} =
1972	new CFClient::Texture
1973	w => $w,
1974	h => $h,
1975	data => $::MAP->mapmap ($w, $h),
1976	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1977
1978	$self->{mapmap_texture}->draw_quad (100, 100);
1979
1980	glDisable GL_TEXTURE_2D;
1981	glDisable GL_BLEND;
1982	}
1983	# HACK END
1984	}
1985
1986	glEndList;
1987	}
1988
1989	glPushMatrix;
1990	glCallList $self->{list};
1991	glPopMatrix;
1992
1993	if ($FOCUS != $self) {
1994	glColor 64/255, 64/255, 64/255;
1995	glLogicOp GL_AND;
1996	glEnable GL_COLOR_LOGIC_OP;
1997	glBegin GL_QUADS;
1998	glVertex 0, 0;
1999	glVertex 0, $::HEIGHT;
2000	glVertex $::WIDTH, $::HEIGHT;
2001	glVertex $::WIDTH, 0;
2002	glEnd;
2003	glDisable GL_COLOR_LOGIC_OP;
2004	}
2005	}
2006
2007	my %DIR = (
2008	SDLK_KP8, [1, "north"],
2009	SDLK_KP9, [2, "northeast"],
2010	SDLK_KP6, [3, "east"],
2011	SDLK_KP3, [4, "southeast"],
2012	SDLK_KP2, [5, "south"],
2013	SDLK_KP1, [6, "southwest"],
2014	SDLK_KP4, [7, "west"],
2015	SDLK_KP7, [8, "northwest"],
2016
2017	SDLK_UP, [1, "north"],
2018	SDLK_RIGHT, [3, "east"],
2019	SDLK_DOWN, [5, "south"],
2020	SDLK_LEFT, [7, "west"],
2021	);
2022
2023	sub key_down {
2024	my ($self, $ev) = @_;
2025
2026	my $mod = $ev->key_mod;
2027	my $sym = $ev->key_sym;
2028
2029	if ($sym == SDLK_KP5) {
2030	$::CONN->user_send ("stay fire");
2031	} elsif ($sym == SDLK_a) {
2032	$::CONN->user_send ("apply");
2033	} elsif ($sym == SDLK_QUOTE) {
2034	$self->emit ('activate_console');
2035	} elsif ($sym == SDLK_SLASH) {
2036	$self->emit ('activate_console' => '/');
2037	} elsif (exists $DIR{$sym}) {
2038	if ($mod & KMOD_SHIFT) {
2039	$self->{shft}++;
2040	$::CONN->user_send ("fire $DIR{$sym}[0]");
2041	} elsif ($mod & KMOD_CTRL) {
2042	$self->{ctrl}++;
2043	$::CONN->user_send ("run $DIR{$sym}[0]");
2044	} else {
2045	$::CONN->user_send ("$DIR{$sym}[1]");
2046	}
2047	}
2048	}
2049
2050	sub key_up {
2051	my ($self, $ev) = @_;
2052
2053	my $mod = $ev->key_mod;
2054	my $sym = $ev->key_sym;
2055
2056	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2057	$::CONN->user_send ("fire_stop");
2058	}
2059	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2060	$::CONN->user_send ("run_stop");
2061	}
2062	}
2063
2064	#############################################################################
2065
2066	package CFClient::UI::Animator;	2162	package CFClient::UI::Animator;
2067		2163
2068	use SDL::OpenGL;	2164	use CFClient::OpenGL;
2069		2165
2070	our @ISA = CFClient::UI::Bin::;	2166	our @ISA = CFClient::UI::Bin::;
2071		2167
2072	sub moveto {	2168	sub moveto {
2073	my ($self, $x, $y) = @_;	2169	my ($self, $x, $y) = @_;
…		…
2111		2207
2112	sub new {	2208	sub new {
2113	my $class = shift;	2209	my $class = shift;
2114		2210
2115	my $self = $class->SUPER::new (	2211	my $self = $class->SUPER::new (
2116	state => 0,	2212	state => 0,
2117	connect_activate => \&toggle_flopper,	2213	connect_activate => \&toggle_flopper,
2118	@_	2214	@_
2119	);	2215	);
2120		2216
2121	if ($self->{state}) {	2217	if ($self->{state}) {
…		…
2142	$self->emit (changed => $self->{state});	2238	$self->emit (changed => $self->{state});
2143	}	2239	}
2144		2240
2145	#############################################################################	2241	#############################################################################
2146		2242
		2243	package CFClient::UI::Tooltip;
		2244
		2245	our @ISA = CFClient::UI::Bin::;
		2246
		2247	use CFClient::OpenGL;
		2248
		2249	sub new {
		2250	my $class = shift;
		2251
		2252	$class->SUPER::new (
		2253	@_,
		2254	can_events => 0,
		2255	)
		2256	}
		2257
		2258	sub set_markup {
		2259	my ($self, $text) = @_;
		2260
		2261	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2262	$self->{label}->set_markup ($text);
		2263	$self->add ($self->{label});
		2264	}
		2265
		2266	sub size_request {
		2267	my ($self) = @_;
		2268
		2269	$self->child->set_max_size ($::WIDTH * 0.3);
		2270
		2271	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2272
		2273	($w + 4, $h + 4)
		2274	}
		2275
		2276	sub size_allocate {
		2277	my ($self, $w, $h) = @_;
		2278
		2279	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2280	}
		2281
		2282	sub _draw {
		2283	my ($self) = @_;
		2284
		2285	glPushMatrix;
		2286	glTranslate 0.375, 0.375;
		2287
		2288	my ($w, $h) = @$self{qw(w h)};
		2289
		2290	glColor 1, 0.8, 0.4;
		2291	glBegin GL_QUADS;
		2292	glVertex 0 , 0;
		2293	glVertex 0 , $h;
		2294	glVertex $w, $h;
		2295	glVertex $w, 0;
		2296	glEnd;
		2297
		2298	glColor 0, 0, 0;
		2299	glBegin GL_LINE_LOOP;
		2300	glVertex 0 , 0;
		2301	glVertex 0 , $h;
		2302	glVertex $w, $h;
		2303	glVertex $w, 0;
		2304	glEnd;
		2305
		2306	glPopMatrix;
		2307
		2308	glTranslate 2, 2;
		2309	$self->SUPER::_draw;
		2310	}
		2311
		2312	#############################################################################
		2313
		2314	package CFClient::UI::Face;
		2315
		2316	our @ISA = CFClient::UI::Base::;
		2317
		2318	use CFClient::OpenGL;
		2319
		2320	sub new {
		2321	my $class = shift;
		2322
		2323	$class->SUPER::new (
		2324	aspect => 1,
		2325	@_,
		2326	)
		2327	}
		2328
		2329	sub size_request {
		2330	(32, 8)
		2331	}
		2332
		2333	sub draw {
		2334	my ($self) = @_;
		2335
		2336	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2337
		2338	if ($tex) {
		2339	glEnable GL_BLEND;
		2340	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2341	glEnable GL_TEXTURE_2D;
		2342	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2343	glColor 1, 1, 1, 1;
		2344	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2345	glDisable GL_TEXTURE_2D;
		2346	glDisable GL_BLEND;
		2347	}
		2348	}
		2349
		2350	#############################################################################
		2351
2147	package CFClient::UI::Root;	2352	package CFClient::UI::Root;
2148		2353
2149	our @ISA = CFClient::UI::Container::;	2354	our @ISA = CFClient::UI::Container::;
2150		2355
2151	use SDL::OpenGL;	2356	use CFClient::OpenGL;
2152		2357
2153	sub check_size {	2358	sub check_size {
2154	my ($self) = @_;	2359	my ($self) = @_;
2155		2360
2156	$self->configure (0, 0, $::WITH, $::HEIGHT);	2361	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2157	}	2362	}
2158		2363
2159	sub size_request {	2364	sub size_request {
2160	($::WIDTH, $::HEIGHT)	2365	($::WIDTH, $::HEIGHT)
2161	}	2366	}
…		…
2163	sub configure {	2368	sub configure {
2164	my ($self, $x, $y, $w, $h) = @_;	2369	my ($self, $x, $y, $w, $h) = @_;
2165		2370
2166	$self->SUPER::configure ($x, $y, $w, $h);	2371	$self->SUPER::configure ($x, $y, $w, $h);
2167		2372
2168	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2169	for @{$self->{children}};	2373	for my $child (@{$self->{children}}) {
		2374	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2375
		2376	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2377	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2378	$child->configure ($X, $Y, $W,$H);
		2379	}
2170	}	2380	}
2171		2381
2172	sub _topleft {	2382	sub _topleft {
2173	my ($self, $x, $y) = @_;	2383	my ($self, $x, $y) = @_;
2174		2384
…		…
2182	::refresh ();	2392	::refresh ();
2183	}	2393	}
2184		2394
2185	sub add {	2395	sub add {
2186	my ($self, $child) = @_;	2396	my ($self, $child) = @_;
		2397
		2398	# integerize window positions
		2399	$child->{x} = int $child->{x};
		2400	$child->{y} = int $child->{y};
2187		2401
2188	$self->SUPER::add ($child);	2402	$self->SUPER::add ($child);
2189	}	2403	}
2190		2404
2191	sub on_refresh {	2405	sub on_refresh {
…		…
2217	#############################################################################	2431	#############################################################################
2218		2432
2219	package CFClient::UI;	2433	package CFClient::UI;
2220		2434
2221	$ROOT = new CFClient::UI::Root;	2435	$ROOT = new CFClient::UI::Root;
		2436	$TOOLTIP = new CFClient::UI::Tooltip;
2222		2437
2223	1	2438	1
2224		2439

Diff Legend

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