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.190 by root, Mon May 8 22:17:38 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
		30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	}
14		49
15	# class methods for events	50	# class methods for events
16	sub feed_sdl_key_down_event {	51	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		53	if $FOCUS;
18	}	54	}
19		55
20	sub feed_sdl_key_up_event {	56	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		58	if $FOCUS;
22	}	59	}
23		60
24	sub feed_sdl_button_down_event {	61	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	62	my ($ev) = @_;
26	my ($x, $y) = ($ev->{x}, $ev->{y});	63	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
28	if (!$BUTTON_STATE) {	65	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	66	my $widget = $ROOT->find_widget ($x, $y);
30		67
31	$GRAB = $widget;	68	$GRAB = $widget;
32	$GRAB->update if $GRAB;	69	$GRAB->update if $GRAB;
		70
		71	check_tooltip;
33	}	72	}
34		73
35	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		75
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	76	if ($GRAB) {
		77	($x, $y) = $GRAB->coord2local ($x, $y);
		78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		79	}
38	}	80	}
39		81
40	sub feed_sdl_button_up_event {	82	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	83	my ($ev) = @_;
42	my ($x, $y) = ($ev->{x}, $ev->{y});	84	my ($x, $y) = ($ev->{x}, $ev->{y});
43		85
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		87
46	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		89
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	90	if ($GRAB) {
		91	($x, $y) = $GRAB->coord2local ($x, $y);
		92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		93	}
49		94
50	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	97	$grab->update if $grab;
53	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
		99
		100	check_tooltip;
54	}	101	}
55	}	102	}
56		103
57	sub feed_sdl_motion_event {	104	sub feed_sdl_motion_event {
58	my ($ev) = @_;	105	my ($ev) = @_;
…		…
63	if ($widget != $HOVER) {	110	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	111	my $hover = $HOVER; $HOVER = $widget;
65		112
66	$hover->update if $hover && $hover->{can_hover};	113	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		115
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	116	check_tooltip;
		117	}
		118
		119	if ($HOVER) {
		120	($x, $y) = $HOVER->coord2local ($x, $y);
		121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		122	}
71	}	123	}
72		124
73	# convert position array to integers	125	# convert position array to integers
74	sub harmonize {	126	sub harmonize {
75	my ($vals) = @_;	127	my ($vals) = @_;
…		…
93		145
94	sub new {	146	sub new {
95	my $class = shift;	147	my $class = shift;
96		148
97	my $self = bless {	149	my $self = bless {
98	x => 0,	150	x => 0,
99	y => 0,	151	y => 0,
100	z => 0,	152	z => 0,
		153	can_events => 1,
101	@_	154	@_
102	}, $class;	155	}, $class;
103		156
104	for (keys %$self) {	157	for (keys %$self) {
105	if (/^connect_(.*)$/) {	158	if (/^connect_(.*)$/) {
…		…
108	}	161	}
109		162
110	$self	163	$self
111	}	164	}
112		165
		166	sub destroy {
		167	my ($self) = @_;
		168
		169	$self->hide;
		170	%$self = ();
		171	}
		172
113	sub show {	173	sub show {
114	my ($self) = @_;	174	my ($self) = @_;
115		175
116	return if $self->{parent};	176	return if $self->{parent};
117		177
…		…
119	}	179	}
120		180
121	sub hide {	181	sub hide {
122	my ($self) = @_;	182	my ($self) = @_;
123		183
124	return unless $self->{parent};	184	undef $GRAB if $GRAB == $self;
		185	undef $HOVER if $HOVER == $self;
125		186
126	$self->{parent}->remove ($self);	187	$self->{parent}->remove ($self)
		188	if $self->{parent};
127	}	189	}
128		190
129	sub move {	191	sub move {
130	my ($self, $x, $y, $z) = @_;	192	my ($self, $x, $y, $z) = @_;
131		193
…		…
134	$self->{z} = $z if defined $z;	196	$self->{z} = $z if defined $z;
135		197
136	$self->update;	198	$self->update;
137	}	199	}
138		200
139	sub needs_redraw {	201	sub set_size {
140	0	202	my ($self, $w, $h) = @_;
		203
		204	$self->{user_w} = $w;
		205	$self->{user_h} = $h;
		206
		207	$self->check_size;
141	}	208	}
142		209
143	sub size_request {	210	sub size_request {
144	require Carp;	211	require Carp;
145	Carp::confess "size_request is abstract";	212	Carp::confess "size_request is abstract";
…		…
170	$self->{w} = $w;	237	$self->{w} = $w;
171	$self->{h} = $h;	238	$self->{h} = $h;
172		239
173	$self->size_allocate ($w, $h);	240	$self->size_allocate ($w, $h);
174	$self->update;	241	$self->update;
		242	$self->emit (size_allocate => $w, $h);
175	}	243	}
176	}	244	}
177		245
178	sub size_allocate {	246	sub size_allocate {
179	# nothing to be done	247	# nothing to be done
		248	}
		249
		250	sub children {
		251	}
		252
		253	# call when resolution changes etc.
		254	sub reconfigure {
		255	my ($self) = @_;
		256
		257	$_->reconfigure
		258	for $self->children;
		259
		260	$self->check_size;
		261	$self->size_allocate ($self->{w}, $self->{h});
		262	$self->update;
		263	}
		264
		265	sub set_max_size {
		266	my ($self, $w, $h) = @_;
		267
		268	delete $self->{max_w}; $self->{max_w} = $w if $w;
		269	delete $self->{max_h}; $self->{max_h} = $h if $h;
180	}	270	}
181		271
182	# return top left coordinates	272	# return top left coordinates
183	sub _topleft {	273	sub _topleft {
184	my ($self, $x, $y) = @_;	274	my ($self, $x, $y) = @_;
		275
		276	$self->{parent}
		277	or Carp::confess "no parent widget in _topleft\n";#d#
185		278
186	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
187	}	280	}
188		281
189	# translate global coordinates to local coordinate system	282	# translate global coordinates to local coordinate system
…		…
267	glVertex $x + $self->{w}, $y + $self->{h};	360	glVertex $x + $self->{w}, $y + $self->{h};
268	glVertex $x , $y + $self->{h};	361	glVertex $x , $y + $self->{h};
269	glEnd;	362	glEnd;
270	glDisable GL_BLEND;	363	glDisable GL_BLEND;
271	}	364	}
		365
		366	if ($ENV{PCLIENT_DEBUG}) {
		367	glPushMatrix;
		368	glColor 1, 1, 0, 1;
		369	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		370	glBegin GL_LINE_LOOP;
		371	glVertex 0 , 0;
		372	glVertex $self->{w}, 0;
		373	glVertex $self->{w}, $self->{h};
		374	glVertex 0 , $self->{h};
		375	glEnd;
		376	glPopMatrix;
		377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		378	}
272	}	379	}
273		380
274	sub _draw {	381	sub _draw {
275	my ($self) = @_;	382	my ($self) = @_;
276		383
277	warn "no draw defined for $self\n";	384	warn "no draw defined for $self\n";
278	}	385	}
279		386
280	sub find_widget {	387	sub find_widget {
281	my ($self, $x, $y) = @_;	388	my ($self, $x, $y) = @_;
		389
		390	return () unless $self->{can_events};
282		391
283	return $self	392	return $self
284	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	393	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	394	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
286		395
…		…
294	}	403	}
295		404
296	sub check_size {	405	sub check_size {
297	my ($self) = @_;	406	my ($self) = @_;
298		407
299	my ($w, $h) = $self->size_request;	408	$self->_check_size;
		409	return;
		410	#TODO: but needs a vastly more difficult algorithm
		411	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
300		412
		413	$check_size->{$self} = $self;
		414
		415	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
		416	while (%$check_size) {
		417	my @widgets = values %$check_size;
		418	$_->_check_size
		419	for @widgets;
		420	}
		421	});
		422	}
		423
		424	sub _check_size {
		425	my ($self) = @_;
		426
		427	delete $CFClient::UI::ROOT->{_check_size}{$self};
		428
		429	$self->{parent}
		430	or return 1;
		431
		432	my ($w, $h) = $self->{user_w} && $self->{user_h}
		433	? @$self{qw(user_w user_h)}
		434	: $self->size_request;
		435
301	if ($w != $self->{req_w} || $h != $self->{req_h}) {	436	if ($w != $self->{req_w} || $h != $self->{req_h}) {
302	$self->{req_w} = $w;	437	$self->{req_w} = $w;
303	$self->{req_h} = $h;	438	$self->{req_h} = $h;
304		439
305	$self->{parent}->check_size	440	$self->{parent}->_check_size
306	if $self->{parent};	441	or $self->size_allocate (
		442	(List::Util::max $self->{w}, $w),
		443	(List::Util::max $self->{h}, $h),
		444	);
		445
		446	1
		447	} else {
		448	0
307	}	449	}
308	}	450	}
309		451
310	sub update {	452	sub update {
311	my ($self) = @_;	453	my ($self) = @_;
312		454
313	$self->{parent}->update	455	my $update = $CFClient::UI::ROOT->{_update} ||= {};
314	if $self->{parent};	456
		457	$update->{$self} = $self;
		458
		459	$CFClient::UI::ROOT->on_refresh (_update => sub {
		460	while (%$update) {
		461	my @widgets = values %$update;
		462	%$update = ();
		463
		464	$_->{parent} && $_->{parent}->update
		465	for @widgets;
		466	}
		467	});
315	}	468	}
316		469
317	sub connect {	470	sub connect {
318	my ($self, $signal, $cb) = @_;	471	my ($self, $signal, $cb) = @_;
319		472
…		…
321	}	474	}
322		475
323	sub emit {	476	sub emit {
324	my ($self, $signal, @args) = @_;	477	my ($self, $signal, @args) = @_;
325		478
326	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327	$cb->($self, @args);
328	}
329	}	480	}
330		481
331	sub DESTROY {	482	sub DESTROY {
332	my ($self) = @_;	483	my ($self) = @_;
333		484
…		…
378		529
379	package CFClient::UI::Empty;	530	package CFClient::UI::Empty;
380		531
381	our @ISA = CFClient::UI::Base::;	532	our @ISA = CFClient::UI::Base::;
382		533
		534	sub new {
		535	my ($class, %arg) = @_;
		536	$class->SUPER::new (can_events => 0, %arg);
		537	}
		538
383	sub size_request {	539	sub size_request {
384	(0, 0)	540	(0, 0)
385	}	541	}
386		542
387	sub draw { }	543	sub draw { }
…		…
395	sub new {	551	sub new {
396	my ($class, %arg) = @_;	552	my ($class, %arg) = @_;
397		553
398	my $children = delete $arg{children} || [];	554	my $children = delete $arg{children} || [];
399		555
400	my $self = $class->SUPER::new (children => [], %arg);	556	my $self = $class->SUPER::new (
		557	children => [],
		558	can_events => 0,
		559	%arg,
		560	);
401	$self->add ($_) for @$children;	561	$self->add ($_) for @$children;
402		562
403	$self	563	$self
404	}	564	}
405		565
406	sub add {	566	sub add {
407	my ($self, $child) = @_;	567	my ($self, @widgets) = @_;
408		568
409	$child->set_parent ($self);	569	$_->set_parent ($self)
		570	for @widgets;
410		571
411	use sort 'stable';	572	use sort 'stable';
412		573
413	$self->{children} = [	574	$self->{children} = [
414	sort { $a->{z} <=> $b->{z} }	575	sort { $a->{z} <=> $b->{z} }
415	@{$self->{children}}, $child	576	@{$self->{children}}, @widgets
416	];	577	];
417		578
418	$child->check_size;	579	$_->check_size
		580	for @widgets;
		581
		582	$self->update;
		583	}
		584
		585	sub children {
		586	@{ $_[0]{children} }
419	}	587	}
420		588
421	sub remove {	589	sub remove {
422	my ($self, $child) = @_;	590	my ($self, $child) = @_;
423		591
424	delete $child->{parent};	592	delete $child->{parent};
		593	$child->hide;
425		594
426	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	595	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427		596
428	$self->check_size;	597	$self->check_size;
		598	$self->update;
		599	}
		600
		601	sub clear {
		602	my ($self) = @_;
		603
		604	my $children = delete $self->{children};
		605	$self->{children} = [];
		606
		607	for (@$children) {
		608	delete $_->{parent};
		609	$_->hide;
		610	}
		611
		612	$self->check_size;
		613	$self->update;
429	}	614	}
430		615
431	sub find_widget {	616	sub find_widget {
432	my ($self, $x, $y) = @_;	617	my ($self, $x, $y) = @_;
433		618
…		…
508	}	693	}
509		694
510	sub update {	695	sub update {
511	my ($self) = @_;	696	my ($self) = @_;
512		697
513	# we want to do this delayed...	698	$ROOT->on_refresh ($self => sub { $self->render_child });
514	$self->render_chld;
515	$self->SUPER::update;	699	$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	}	700	}
527		701
528	sub size_allocate {	702	sub size_allocate {
529	my ($self, $w, $h) = @_;	703	my ($self, $w, $h) = @_;
530		704
531	$self->child->configure (0, 0, $w, $h);	705	$self->SUPER::size_allocate ($w, $h);
		706	$self->update;
		707	}
532		708
		709	sub _render {
		710	$_[0]{children}[0]->draw;
		711	}
		712
		713	sub render_child {
		714	my ($self) = @_;
		715
		716	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		717	glClearColor 0, 0, 0, 0;
		718	glClear GL_COLOR_BUFFER_BIT;
		719
533	$self->render_chld;	720	$self->_render;
		721	# glColorMask 1, 1, 1, 0;
		722	# glEnable GL_BLEND;
		723	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		724	# glRasterPos 0, 0;
		725	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		726	# glDisable GL_BLEND;
		727	# glColorMask 1, 1, 1, 1;
		728	};
534	}	729	}
535		730
536	sub _draw {	731	sub _draw {
537	my ($self) = @_;	732	my ($self) = @_;
538		733
…		…
540		735
541	my $tex = $self->{texture}	736	my $tex = $self->{texture}
542	or return;	737	or return;
543		738
544	glEnable GL_BLEND;	739	glEnable GL_BLEND;
545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	740	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546	glEnable GL_TEXTURE_2D;	741	glEnable GL_TEXTURE_2D;
547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	742	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		743	glColor 0, 0, 0, 1;
548		744
549	$tex->draw_quad (0, 0, $w, $h);	745	$tex->draw_quad (0, 0, $w, $h);
550		746
551	glDisable GL_BLEND;	747	glDisable GL_BLEND;
552	glDisable GL_TEXTURE_2D;	748	glDisable GL_TEXTURE_2D;
…		…
556		752
557	package CFClient::UI::ViewPort;	753	package CFClient::UI::ViewPort;
558		754
559	our @ISA = CFClient::UI::Window::;	755	our @ISA = CFClient::UI::Window::;
560		756
561	sub new { die }
562
563	sub size_request {	757	sub size_request {
564	my ($self) = @_;	758	my ($self) = @_;
565		759
566	@$self{qw(child_w child_h)} = $self->child->size_request;	760	@$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)});	761	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
568		762
569	@$self{qw(child_w child_h)}	763	@$self{qw(child_w child_h)}
570	}	764	}
571		765
572	sub _draw {	766	sub size_allocate {
573	my ($self) = @_;	767	my ($self, $w, $h) = @_;
574		768
575	$self->{children}[1]->draw;	769	$self->update;
576	}	770	}
577		771
		772	sub set_offset {
		773	my ($self, $x, $y) = @_;
		774
		775	$self->{view_x} = int $x;
		776	$self->{view_y} = int $y;
		777
		778	$self->update;
		779	}
		780
		781	# hmm, this does not work for topleft of $self... but we should not aks for that
		782	sub _topleft {
		783	my ($self, $x, $y) = @_;
		784
		785	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
		786	}
		787
		788	sub find_widget {
		789	my ($self, $x, $y) = @_;
		790
		791	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		792	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		793	) {
		794	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		795	} else {
		796	$self->CFClient::UI::Base::find_widget ($x, $y)
		797	}
		798	}
		799
		800	sub _render {
		801	my ($self) = @_;
		802
		803	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		804
		805	$self->SUPER::_render;
		806	}
		807
		808	#############################################################################
		809
		810	package CFClient::UI::ScrolledWindow;
		811
		812	our @ISA = CFClient::UI::HBox::;
		813
		814	sub new {
		815	my $class = shift;
		816
		817	my $self;
		818
		819	my $slider = new CFClient::UI::Slider
		820	vertical => 1,
		821	range => [0, 0, 1, 0.01], # HACK fix
		822	connect_changed => sub {
		823	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		824	},
		825	;
		826
		827	$self = $class->SUPER::new (
		828	vp => (new CFClient::UI::ViewPort),
		829	slider => $slider,
		830	@_,
		831	);
		832
		833	$self->{vp}->add ($self->{scrolled});
		834	$self->add ($self->{vp});
		835	$self->add ($self->{slider});
		836
		837	$self
		838	}
		839
		840	#TODO# update range on size_allocate depeneing on child
		841	# update viewport offset on scroll
578		842
579	#############################################################################	843	#############################################################################
580		844
581	package CFClient::UI::Frame;	845	package CFClient::UI::Frame;
582		846
…		…
593	border => 0.8,	857	border => 0.8,
594	@_	858	@_
595	);	859	);
596		860
597	$self	861	$self
598	}
599
600	sub set_size {
601	my ($self, $w, $h) = @_;
602	$self->{req_w} = $w;
603	$self->{req_h} = $h;
604	$self->check_size;
605	}
606
607	sub size_request {
608	my ($self) = @_;
609	($self->{req_w}, $self->{req_h})
610	}
611
612	sub size_allocate {
613	my ($self, $w, $h) = @_;
614	$self->{w} = $w;
615	$self->{h} = $h;
616	$self->child->configure (0, 0, $w, $h);
617	}	862	}
618		863
619	sub _draw {	864	sub _draw {
620	my ($self) = @_;	865	my ($self) = @_;
621		866
…		…
656	my $class = shift;	901	my $class = shift;
657		902
658	# TODO: user_x, user_y, overwrite moveto?	903	# TODO: user_x, user_y, overwrite moveto?
659		904
660	my $self = $class->SUPER::new (	905	my $self = $class->SUPER::new (
661	bg => [1, 1, 1, 1],	906	bg => [1, 1, 1, 1],
662	border_bg => [1, 1, 1, 1],	907	border_bg => [1, 1, 1, 1],
663	border => 0.8,	908	border => 0.6,
		909	can_events => 1,
664	@_	910	@_
665	);	911	);
666		912
667	$self->{title} &&= new CFClient::UI::Label	913	$self->{title} &&= new CFClient::UI::Label
668	align => 0,	914	align => 0,
669	valign => 1,	915	valign => 1,
670	text => $self->{title},	916	text => $self->{title},
671	fontsize => 1;	917	fontsize => $self->{border};
672		918
673	$self	919	$self
674	}	920	}
675		921
676	sub border {	922	sub border {
677	int $_[0]{border} * $::FONTSIZE	923	int $_[0]{border} * $::FONTSIZE
678	}	924	}
679		925
680	sub size_request {	926	sub size_request {
681	my ($self) = @_;	927	my ($self) = @_;
682
683	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684		928
685	my ($w, $h) = $self->SUPER::size_request;	929	my ($w, $h) = $self->SUPER::size_request;
686		930
687	(	931	(
688	$w + $self->border * 2,	932	$w + $self->border * 2,
…		…
703	}	947	}
704		948
705	sub button_down {	949	sub button_down {
706	my ($self, $ev, $x, $y) = @_;	950	my ($self, $ev, $x, $y) = @_;
707		951
		952	my ($w, $h) = @$self{qw(w h)};
708	my $border = $self->border;	953	my $border = $self->border;
709		954
710	if ($x < $self->{w} && $x >= $self->{w} - $border	955	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711	&& $y < $self->{h} && $y >= $self->{h} - $border) {	956	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712		957
		958	if ($lr & $td) {
		959	my ($wx, $wy) = ($self->{x}, $self->{y});
713	my ($ox, $oy) = ($ev->{x}, $ev->{y});	960	my ($ox, $oy) = ($ev->{x}, $ev->{y});
714	my ($bw, $bh) = ($self->{w}, $self->{h});	961	my ($bw, $bh) = ($self->{w}, $self->{h});
715		962
		963	my $mx = $x < $border;
		964	my $my = $y < $border;
		965
716	$self->{motion} = sub {	966	$self->{motion} = sub {
717	my ($ev, $x, $y) = @_;	967	my ($ev, $x, $y) = @_;
718		968
719	($x, $y) = ($ev->{x}, $ev->{y});	969	my $dx = $ev->{x} - $ox;
		970	my $dy = $ev->{y} - $oy;
720		971
721	$self->{user_w} = $bw + $x - $ox;	972	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
722	$self->{user_h} = $bh + $y - $oy;	973	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		974	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
723	$self->check_size;	975	$self->check_size;
724	};	976	};
725		977
726	} elsif ($x >= 0 && $x < $self->{w}	978	} elsif ($lr ^ $td) {
727	&& $y >= 0 && $y < $border) {
728
729	my ($ox, $oy) = ($ev->{x}, $ev->{y});	979	my ($ox, $oy) = ($ev->{x}, $ev->{y});
730	my ($bx, $by) = ($self->{x}, $self->{y});	980	my ($bx, $by) = ($self->{x}, $self->{y});
731		981
732	$self->{motion} = sub {	982	$self->{motion} = sub {
733	my ($ev, $x, $y) = @_;	983	my ($ev, $x, $y) = @_;
…		…
769	$tex[1]->draw_quad (0, 0, $w, $border);	1019	$tex[1]->draw_quad (0, 0, $w, $border);
770	$tex[3]->draw_quad (0, $border, $border, $ch);	1020	$tex[3]->draw_quad (0, $border, $border, $ch);
771	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1021	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
772	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1022	$tex[4]->draw_quad (0, $h - $border, $w, $border);
773		1023
		1024	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
774	my $bg = $tex[0];	1025	my $bg = $tex[0];
775		1026
776	# TODO: repeat texture not scale	1027	# TODO: repeat texture not scale
777	my $rep_x = $cw / $bg->{w};	1028	my $rep_x = $cw / $bg->{w};
778	my $rep_y = $ch / $bg->{h};	1029	my $rep_y = $ch / $bg->{h};
779		1030
780	glColor @{ $self->{bg} };	1031	glColor @{ $self->{bg} };
781		1032
782	$bg->{s} = $rep_x;	1033	$bg->{s} = $rep_x;
783	$bg->{t} = $rep_y;	1034	$bg->{t} = $rep_y;
784	$bg->{wrap_mode} = 1;	1035	$bg->{wrap_mode} = 1;
785	$bg->draw_quad ($border, $border, $cw, $ch);	1036	$bg->draw_quad ($border, $border, $cw, $ch);
786		1037
787	glDisable GL_TEXTURE_2D;	1038	glDisable GL_TEXTURE_2D;
788	glDisable GL_BLEND;	1039	glDisable GL_BLEND;
		1040	}
789		1041
790	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
		1043
791	$self->child->draw;	1044	$self->child->draw;
792	}	1045	}
793		1046
794	#############################################################################	1047	#############################################################################
795		1048
…		…
817	$self->{children}[$y][$x] = $child;	1070	$self->{children}[$y][$x] = $child;
818		1071
819	$child->check_size;	1072	$child->check_size;
820	}	1073	}
821		1074
		1075	sub children {
		1076	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1077	}
		1078
822	# TODO: move to container class maybe? send childs a signal on removal?	1079	# TODO: move to container class maybe? send childs a signal on removal?
823	sub clear {	1080	sub clear {
824	my ($self) = @_;	1081	my ($self) = @_;
825		1082
		1083	my @children = $self->children;
826	delete $self->{children};	1084	delete $self->{children};
		1085
		1086	for (@children) {
		1087	delete $_->{parent};
		1088	$_->hide;
		1089	}
		1090
827	$self->update;	1091	$self->update;
828	}	1092	}
829		1093
830	sub get_wh {	1094	sub get_wh {
831	my ($self) = @_;	1095	my ($self) = @_;
…		…
837	or next;	1101	or next;
838		1102
839	for my $x (0 .. $#$row) {	1103	for my $x (0 .. $#$row) {
840	my $widget = $row->[$x]	1104	my $widget = $row->[$x]
841	or next;	1105	or next;
842	my ($w, $h) = $widget->size_request;	1106	my ($w, $h) = @$widget{qw(req_w req_h)};
843		1107
844	$w[$x] = max $w[$x], $w;	1108	$w[$x] = max $w[$x], $w;
845	$h[$y] = max $h[$y], $h;	1109	$h[$y] = max $h[$y], $h;
846	}	1110	}
847	}	1111	}
…		…
952		1216
953	($h, $w) = ($w, $h);	1217	($h, $w) = ($w, $h);
954		1218
955	my $children = $self->{children};	1219	my $children = $self->{children};
956		1220
957	my @h = map +($_->size_request)[0], @$children;	1221	my @h = map $_->{req_w}, @$children;
958		1222
959	my $req_h = List::Util::sum @h;	1223	my $req_h = List::Util::sum @h;
960		1224
961	if ($req_h > $h) {	1225	if ($req_h > $h) {
962	# ah well, not enough space	1226	# ah well, not enough space
…		…
1010	sub size_allocate {	1274	sub size_allocate {
1011	my ($self, $w, $h) = @_;	1275	my ($self, $w, $h) = @_;
1012		1276
1013	my $children = $self->{children};	1277	my $children = $self->{children};
1014		1278
1015	my @h = map +($_->size_request)[1], @$children;	1279	my @h = map $_->{req_h}, @$children;
1016		1280
1017	my $req_h = List::Util::sum @h;	1281	my $req_h = List::Util::sum @h;
1018		1282
1019	if ($req_h > $h) {	1283	if ($req_h > $h) {
1020	# ah well, not enough space	1284	# ah well, not enough space
…		…
1054		1318
1055	sub new {	1319	sub new {
1056	my ($class, %arg) = @_;	1320	my ($class, %arg) = @_;
1057		1321
1058	my $self = $class->SUPER::new (	1322	my $self = $class->SUPER::new (
1059	fg => [1, 1, 1],	1323	fg => [1, 1, 1],
		1324	#font => default_font
1060	fontsize => 1,	1325	fontsize => 1,
1061	text => "",	1326	text => "",
1062	align => -1,	1327	align => -1,
1063	valign => -1,	1328	valign => -1,
1064	padding => 2,	1329	padding => 2,
1065	layout => new CFClient::Layout,	1330	layout => new CFClient::Layout,
		1331	can_events => 0,
1066	%arg	1332	%arg
1067	);	1333	);
1068		1334
1069	if (exists $self->{template}) {	1335	if (exists $self->{template}) {
1070	my $layout = new CFClient::Layout;	1336	my $layout = new CFClient::Layout;
…		…
1076	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1342	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1077		1343
1078	$self	1344	$self
1079	}	1345	}
1080		1346
1081	sub escape_text {	1347	sub escape {
1082	local $_ = $_[1];	1348	local $_ = $_[1];
1083		1349
1084	s/&/&amp;/g;	1350	s/&/&amp;/g;
1085	s/>/&gt;/g;	1351	s/>/&gt;/g;
1086	s/</&lt;/g;	1352	s/</&lt;/g;
1087		1353
1088	$_[1]	1354	$_[1]
1089	}	1355	}
1090		1356
		1357	sub update {
		1358	my ($self) = @_;
		1359
		1360	delete $self->{texture};
		1361	$self->SUPER::update;
		1362	}
		1363
1091	sub set_text {	1364	sub set_text {
1092	my ($self, $text) = @_;	1365	my ($self, $text) = @_;
1093		1366
		1367	return if $self->{text} eq "T$text";
		1368	$self->{text} = "T$text";
		1369
1094	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1095		1371
1096	delete $self->{texture};	1372	delete $self->{texture};
1097	$self->update;	1373	$self->update;
		1374	$self->check_size;
1098	}	1375	}
1099		1376
1100	sub set_markup {	1377	sub set_markup {
1101	my ($self, $markup) = @_;	1378	my ($self, $markup) = @_;
1102		1379
		1380	return if $self->{text} eq "M$markup";
		1381	$self->{text} = "M$markup";
		1382
1103	$self->{layout}->set_markup ($markup);	1383	$self->{layout}->set_markup ($markup);
1104		1384
1105	delete $self->{texture};	1385	delete $self->{texture};
1106	$self->update;	1386	$self->update;
		1387	$self->check_size;
1107	}	1388	}
1108		1389
1109	sub size_request {	1390	sub size_request {
1110	my ($self) = @_;	1391	my ($self) = @_;
1111		1392
1112	$self->{layout}->set_width;	1393	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1394	$self->{layout}->set_width ($self->{max_w} || -1);
1113	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1395	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114		1396
1115	my ($w, $h) = $self->{layout}->size;	1397	my ($w, $h) = $self->{layout}->size;
1116		1398
1117	if (exists $self->{template}) {	1399	if (exists $self->{template}) {
		1400	$self->{template}->set_font ($self->{font}) if $self->{font};
1118	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1401	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119		1402
1120	my ($w2, $h2) = $self->{template}->size;	1403	my ($w2, $h2) = $self->{template}->size;
1121		1404
1122	$w = List::Util::max $w, $w2;	1405	$w = List::Util::max $w, $w2;
…		…
1137		1420
1138	sub set_fontsize {	1421	sub set_fontsize {
1139	my ($self, $fontsize) = @_;	1422	my ($self, $fontsize) = @_;
1140		1423
1141	$self->{fontsize} = $fontsize;	1424	$self->{fontsize} = $fontsize;
		1425	delete $self->{texture};
		1426
		1427	$self->update;
1142	$self->check_size;	1428	$self->check_size;
1143	}	1429	}
1144		1430
1145	sub _draw {	1431	sub _draw {
1146	my ($self) = @_;	1432	my ($self) = @_;
1147		1433
1148	my $tex = $self->{texture} ||= do {	1434	my $tex = $self->{texture} ||= do {
		1435	$self->{layout}->set_font ($self->{font}) if $self->{font};
1149	$self->{layout}->set_width ($self->{w});	1436	$self->{layout}->set_width ($self->{w});
1150	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1437	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1151	new_from_layout CFClient::Texture $self->{layout}	1438	new_from_layout CFClient::Texture $self->{layout}
1152	};	1439	};
1153		1440
…		…
1186		1473
1187	sub new {	1474	sub new {
1188	my $class = shift;	1475	my $class = shift;
1189		1476
1190	$class->SUPER::new (	1477	$class->SUPER::new (
1191	fg => [1, 1, 1],	1478	fg => [1, 1, 1],
1192	bg => [0, 0, 0, 0.2],	1479	bg => [0, 0, 0, 0.2],
1193	active_bg => [1, 1, 1, 0.5],	1480	active_bg => [1, 1, 1, 0.5],
1194	active_fg => [0, 0, 0],	1481	active_fg => [0, 0, 0],
1195	can_hover => 1,	1482	can_hover => 1,
1196	can_focus => 1,	1483	can_focus => 1,
1197	valign => 0,	1484	valign => 0,
		1485	can_events => 1,
1198	@_	1486	@_
1199	)	1487	)
1200	}	1488	}
1201		1489
1202	sub _set_text {	1490	sub _set_text {
…		…
1230	}	1518	}
1231		1519
1232	sub size_allocate {	1520	sub size_allocate {
1233	my ($self, $w, $h) = @_;	1521	my ($self, $w, $h) = @_;
1234		1522
1235	$self->_set_text ($self->{text});	1523	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1236	}	1524	}
1237		1525
1238	sub set_text {	1526	sub set_text {
1239	my ($self, $text) = @_;	1527	my ($self, $text) = @_;
1240		1528
…		…
1355	my ($self, $ev) = @_;	1643	my ($self, $ev) = @_;
1356		1644
1357	my $sym = $ev->{sym};	1645	my $sym = $ev->{sym};
1358		1646
1359	if ($sym == 13) {	1647	if ($sym == 13) {
		1648	unshift @{$self->{history}},
		1649	my $txt = $self->get_text;
		1650	$self->{history_pointer} = -1;
		1651	$self->{history_saveback} = '';
1360	$self->emit (activate => $self->get_text);	1652	$self->emit (activate => $txt);
1361	$self->update;	1653	$self->update;
		1654
		1655	} elsif ($sym == CFClient::SDLK_UP) {
		1656	if ($self->{history_pointer} < 0) {
		1657	$self->{history_saveback} = $self->get_text;
		1658	}
		1659	if (@{$self->{history} || []} > 0) {
		1660	$self->{history_pointer}++;
		1661	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1662	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1663	}
		1664	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1665	}
		1666
		1667	} elsif ($sym == CFClient::SDLK_DOWN) {
		1668	$self->{history_pointer}--;
		1669	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1670
		1671	if ($self->{history_pointer} >= 0) {
		1672	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1673	} else {
		1674	$self->set_text ($self->{history_saveback});
		1675	}
1362		1676
1363	} else {	1677	} else {
1364	$self->SUPER::key_down ($ev);	1678	$self->SUPER::key_down ($ev);
1365	}	1679	}
1366		1680
…		…
1380		1694
1381	sub new {	1695	sub new {
1382	my $class = shift;	1696	my $class = shift;
1383		1697
1384	$class->SUPER::new (	1698	$class->SUPER::new (
1385	padding => 4,	1699	padding => 4,
1386	fg => [1, 1, 1],	1700	fg => [1, 1, 1],
1387	bg => [1, 1, 1, 0.2],	1701	bg => [1, 1, 1, 0.2],
1388	active_fg => [0, 0, 1],	1702	active_fg => [0, 0, 1],
1389	can_hover => 1,	1703	can_hover => 1,
1390	align => 0,	1704	align => 0,
1391	valign => 0,	1705	valign => 0,
		1706	can_events => 1,
1392	@_	1707	@_
1393	)	1708	)
1394	}	1709	}
1395		1710
1396	sub button_up {	1711	sub button_up {
…		…
1501	our %loaded_images;	1816	our %loaded_images;
1502		1817
1503	sub new {	1818	sub new {
1504	my $class = shift;	1819	my $class = shift;
1505		1820
1506	my $self = $class->SUPER::new (@_);	1821	my $self = $class->SUPER::new (can_events => 0, @_);
1507		1822
1508	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	1823	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509		1824
1510	$loaded_images{$self->{image}} ||=	1825	$loaded_images{$self->{image}} ||=
1511	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	1826	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
…		…
1553	#############################################################################	1868	#############################################################################
1554		1869
1555	package CFClient::UI::VGauge;	1870	package CFClient::UI::VGauge;
1556		1871
1557	our @ISA = CFClient::UI::Base::;	1872	our @ISA = CFClient::UI::Base::;
		1873
		1874	use List::Util qw(min max);
1558		1875
1559	use CFClient::OpenGL;	1876	use CFClient::OpenGL;
1560		1877
1561	my %tex = (	1878	my %tex = (
1562	food => [	1879	food => [
1563	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1880	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1881	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565	],	1882	],
1566	grace => [	1883	grace => [
1567	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1884	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1885	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569	],	1886	],
1570	hp => [	1887	hp => [
1571	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1888	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1889	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573	],	1890	],
1574	mana => [	1891	mana => [
1575	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1892	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1893	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577	],	1894	],
1578	);	1895	);
1579		1896
1580	# eg. VGauge->new (gauge => 'food'), default gauge: food	1897	# eg. VGauge->new (gauge => 'food'), default gauge: food
1581	sub new {	1898	sub new {
…		…
1600	}	1917	}
1601		1918
1602	sub set_max {	1919	sub set_max {
1603	my ($self, $max) = @_;	1920	my ($self, $max) = @_;
1604		1921
		1922	return if $self->{max_val} == $max;
		1923
1605	$self->{max_val} = $max;	1924	$self->{max_val} = $max;
		1925	$self->update;
1606	}	1926	}
1607		1927
1608	sub set_value {	1928	sub set_value {
1609	my ($self, $val, $max) = @_;	1929	my ($self, $val, $max) = @_;
1610		1930
1611	$self->set_max ($max)	1931	$self->set_max ($max)
1612	if defined $max;	1932	if defined $max;
1613		1933
1614	$max = $self->{max_val};	1934	return if $self->{val} == $val;
		1935
1615	$self->{val} = $val;	1936	$self->{val} = $val;
1616
1617	$self->update;	1937	$self->update;
1618	}	1938	}
1619		1939
1620	sub _draw {	1940	sub _draw {
1621	my ($self) = @_;	1941	my ($self) = @_;
1622		1942
1623	my $tex = $tex{$self->{type}};	1943	my $tex = $tex{$self->{type}};
		1944	my ($t1, $t2, $t3) = @$tex;
1624		1945
1625	my ($w, $h) = ($self->{w}, $self->{h});	1946	my ($w, $h) = ($self->{w}, $self->{h});
1626		1947
1627	if ($self->{vertical}) {	1948	if ($self->{vertical}) {
1628	glRotate 90, 0, 0, 1;	1949	glRotate 90, 0, 0, 1;
…		…
1630		1951
1631	($w, $h) = ($h, $w);	1952	($w, $h) = ($h, $w);
1632	}	1953	}
1633		1954
1634	my $ycut = $self->{val} / ($self->{max_val} || 1);	1955	my $ycut = $self->{val} / ($self->{max_val} || 1);
1635	$ycut = 1 if $self->{val} > $self->{max_val};
1636		1956
1637	my $t1 = $tex->[0];	1957	my $ycut1 = max 0, min 1, $ycut;
1638	my $t2 = $tex->[1];	1958	my $ycut2 = max 0, min 1, $ycut - 1;
		1959
		1960	my $h1 = $self->{h} * (1 - $ycut1);
		1961	my $h2 = $self->{h} * (1 - $ycut2);
1639		1962
1640	glEnable GL_BLEND;	1963	glEnable GL_BLEND;
1641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1964	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642	glEnable GL_TEXTURE_2D;	1965	glEnable GL_TEXTURE_2D;
1643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1966	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644		1967
1645	my $h1 = $self->{h} - $ycut * $self->{h};
1646	my $h2 = $ycut * $self->{h};
1647
1648	glBindTexture GL_TEXTURE_2D, $t1->{name};	1968	glBindTexture GL_TEXTURE_2D, $t1->{name};
1649	glBegin GL_QUADS;	1969	glBegin GL_QUADS;
1650	glTexCoord 0 , 0; glVertex 0 , 0;	1970	glTexCoord 0 , 0; glVertex 0 , 0;
1651	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;	1971	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;	1972	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653	glTexCoord $t1->{s}, 0; glVertex $w, 0;	1973	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654	glEnd;	1974	glEnd;
1655		1975
		1976	my $ycut1 = List::Util::min 1, $ycut;
1656	glBindTexture GL_TEXTURE_2D, $t2->{name};	1977	glBindTexture GL_TEXTURE_2D, $t2->{name};
1657	glBegin GL_QUADS;	1978	glBegin GL_QUADS;
1658	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;	1979	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;	1980	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;	1981	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;	1982	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662	glEnd;	1983	glEnd;
		1984
		1985	if ($t3) {
		1986	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1987	glBegin GL_QUADS;
		1988	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1989	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1990	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1991	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1992	glEnd;
		1993	}
1663		1994
1664	glDisable GL_BLEND;	1995	glDisable GL_BLEND;
1665	glDisable GL_TEXTURE_2D;	1996	glDisable GL_TEXTURE_2D;
1666	}	1997	}
1667		1998
…		…
1670	package CFClient::UI::Gauge;	2001	package CFClient::UI::Gauge;
1671		2002
1672	our @ISA = CFClient::UI::VBox::;	2003	our @ISA = CFClient::UI::VBox::;
1673		2004
1674	sub new {	2005	sub new {
1675	my ($class, %arg) = shift;	2006	my ($class, %arg) = @_;
1676		2007
1677	my $self = $class->SUPER::new (	2008	my $self = $class->SUPER::new (
1678	@_,	2009	tooltip => $arg{type},
		2010	can_hover => 1,
		2011	can_events => 1,
		2012	%arg,
1679	);	2013	);
1680		2014
1681	$self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");	2015	$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);	2016	$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");	2017	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684		2018
1685	$self	2019	$self
1686	}	2020	}
1687		2021
1688	sub set_fontsize {	2022	sub set_fontsize {
…		…
1690		2024
1691	$self->{value}->set_fontsize ($fsize);	2025	$self->{value}->set_fontsize ($fsize);
1692	$self->{max} ->set_fontsize ($fsize);	2026	$self->{max} ->set_fontsize ($fsize);
1693	}	2027	}
1694		2028
		2029	sub set_max {
		2030	my ($self, $max) = @_;
		2031
		2032	$self->{gauge}->set_max ($max);
		2033	$self->{max}->set_text ($max);
		2034	}
		2035
1695	sub set_value {	2036	sub set_value {
1696	my ($self, $val, $max) = @_;	2037	my ($self, $val, $max) = @_;
1697		2038
1698	$self->set_max ($max)	2039	$self->set_max ($max)
1699	if defined $max;	2040	if defined $max;
1700		2041
1701	$self->{gauge}->set_value ($val, $max);	2042	$self->{gauge}->set_value ($val, $max);
1702	$self->{value}->set_text ($val);	2043	$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	}	2044	}
1711		2045
1712	#############################################################################	2046	#############################################################################
1713		2047
1714	package CFClient::UI::Slider;	2048	package CFClient::UI::Slider;
…		…
1733	# TODO: calculations are off	2067	# TODO: calculations are off
1734	my $self = $class->SUPER::new (	2068	my $self = $class->SUPER::new (
1735	fg => [1, 1, 1],	2069	fg => [1, 1, 1],
1736	active_fg => [0, 0, 0],	2070	active_fg => [0, 0, 0],
1737	range => [0, 0, 100, 10],	2071	range => [0, 0, 100, 10],
1738	req_w => 20,	2072	req_w => $::WIDTH / 80,
1739	req_h => 20,	2073	req_h => $::WIDTH / 80,
1740	vertical => 0,	2074	vertical => 0,
1741	can_hover => 1,	2075	can_hover => 1,
1742	inner_pad => 5,	2076	inner_pad => 5,
1743	@_	2077	@_
1744	);	2078	);
…		…
1854		2188
1855	sub new {	2189	sub new {
1856	my $class = shift;	2190	my $class = shift;
1857		2191
1858	my $self = $class->SUPER::new (	2192	my $self = $class->SUPER::new (
1859	fontsize => 1,	2193	fontsize => 1,
		2194	can_events => 0,
		2195	#font => default_font
1860	@_,	2196	@_,
1861		2197
1862	layout => (new CFClient::Layout),	2198	layout => (new CFClient::Layout),
1863	par => [],	2199	par => [],
1864	height => 0,	2200	height => 0,
1865	children => [	2201	children => [
1866	(new CFClient::UI::Empty expand => 1),	2202	(new CFClient::UI::Empty expand => 1),
1867	(new CFClient::UI::Slider vertical => 1),	2203	(new CFClient::UI::Slider vertical => 1),
1868	],	2204	],
1869	);	2205	);
1870		2206
1871	$self->{children}[1]->connect (changed => sub {	2207	$self->{children}[1]->connect (changed => sub { $self->update });
1872	$self->update;
1873	});
1874		2208
1875	$self	2209	$self
1876	}	2210	}
1877		2211
1878	sub set_fontsize {	2212	sub set_fontsize {
…		…
1886	my ($self, $text) = @_;	2220	my ($self, $text) = @_;
1887		2221
1888	my $layout = $self->{layout};	2222	my $layout = $self->{layout};
1889		2223
1890	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891	$layout->set_width ($self->{w});	2225	$layout->set_width ($self->{children}[0]{w});
1892	$layout->set_text ($text);	2226	$layout->set_text ($text);
1893		2227
1894	($layout->size)[1]	2228	($layout->size)[1]
1895	}	2229	}
1896		2230
…		…
1904	sub size_allocate {	2238	sub size_allocate {
1905	my ($self, $w, $h) = @_;	2239	my ($self, $w, $h) = @_;
1906		2240
1907	$self->SUPER::size_allocate ($w, $h);	2241	$self->SUPER::size_allocate ($w, $h);
1908		2242
		2243	$self->{layout}->set_font ($self->{font}) if $self->{font};
1909	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2244	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1910	$self->{layout}->set_width ($self->{children}[0]{w});	2245	$self->{layout}->set_width ($self->{children}[0]{w});
1911		2246
1912	$self->reflow;	2247	$self->reflow;
1913	}	2248	}
…		…
1948	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1949		2284
1950	delete $self->{texture};	2285	delete $self->{texture};
1951	}	2286	}
1952		2287
1953	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1954	glClearColor 0, 0, 0, 1;	2289	glClearColor 0, 0, 0, 0;
1955	glClear GL_COLOR_BUFFER_BIT;	2290	glClear GL_COLOR_BUFFER_BIT;
1956		2291
1957	glEnable GL_BLEND;	2292	glEnable GL_BLEND;
1958	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1959	glEnable GL_TEXTURE_2D;	2294	glEnable GL_TEXTURE_2D;
…		…
1966		2301
1967	my $y = 0;	2302	my $y = 0;
1968		2303
1969	my $layout = $self->{layout};	2304	my $layout = $self->{layout};
1970		2305
		2306	$layout->set_font ($self->{font}) if $self->{font};
		2307
1971	for my $par (@{$self->{par}}) {	2308	for my $par (@{$self->{par}}) {
1972	my $h = $par->[0];	2309	my $h = $par->[0];
1973		2310
1974	if ($y0 < $y + $h && $y < $y1) {	2311	if ($y0 < $y + $h && $y < $y1) {
1975	$layout->set_text ($par->[2]);	2312	$layout->set_text ($par->[2]);
…		…
1989	}	2326	}
1990		2327
1991	sub _draw {	2328	sub _draw {
1992	my ($self) = @_;	2329	my ($self) = @_;
1993		2330
1994	if ($self->{texture}) {	2331	glEnable GL_BLEND;
		2332	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995	glEnable GL_TEXTURE_2D;	2333	glEnable GL_TEXTURE_2D;
1996	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2335	glColor 1, 1, 1, 1;
1997	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2336	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1998	glDisable GL_TEXTURE_2D;	2337	glDisable GL_TEXTURE_2D;
1999	}	2338	glDisable GL_BLEND;
2000		2339
2001	$self->{children}[1]->draw;	2340	$self->{children}[1]->draw;
2002		2341
2003	}	2342	}
2004		2343
…		…
2052		2391
2053	sub new {	2392	sub new {
2054	my $class = shift;	2393	my $class = shift;
2055		2394
2056	my $self = $class->SUPER::new (	2395	my $self = $class->SUPER::new (
2057	state => 0,	2396	state => 0,
2058	connect_activate => \&toggle_flopper,	2397	connect_activate => \&toggle_flopper,
2059	@_	2398	@_
2060	);	2399	);
2061		2400
2062	if ($self->{state}) {	2401	if ($self->{state}) {
…		…
2083	$self->emit (changed => $self->{state});	2422	$self->emit (changed => $self->{state});
2084	}	2423	}
2085		2424
2086	#############################################################################	2425	#############################################################################
2087		2426
		2427	package CFClient::UI::Tooltip;
		2428
		2429	our @ISA = CFClient::UI::Bin::;
		2430
		2431	use CFClient::OpenGL;
		2432
		2433	sub new {
		2434	my $class = shift;
		2435
		2436	$class->SUPER::new (
		2437	@_,
		2438	can_events => 0,
		2439	)
		2440	}
		2441
		2442	sub set_markup {
		2443	my ($self, $text) = @_;
		2444
		2445	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2446	$self->{label}->set_markup ($text);
		2447	$self->add ($self->{label});
		2448	}
		2449
		2450	sub size_request {
		2451	my ($self) = @_;
		2452
		2453	$self->child->set_max_size ($::WIDTH * 0.3);
		2454
		2455	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2456
		2457	($w + 4, $h + 4)
		2458	}
		2459
		2460	sub size_allocate {
		2461	my ($self, $w, $h) = @_;
		2462
		2463	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2464	}
		2465
		2466	sub _draw {
		2467	my ($self) = @_;
		2468
		2469	glPushMatrix;
		2470	glTranslate 0.375, 0.375;
		2471
		2472	my ($w, $h) = @$self{qw(w h)};
		2473
		2474	glColor 1, 0.8, 0.4;
		2475	glBegin GL_QUADS;
		2476	glVertex 0 , 0;
		2477	glVertex 0 , $h;
		2478	glVertex $w, $h;
		2479	glVertex $w, 0;
		2480	glEnd;
		2481
		2482	glColor 0, 0, 0;
		2483	glBegin GL_LINE_LOOP;
		2484	glVertex 0 , 0;
		2485	glVertex 0 , $h;
		2486	glVertex $w, $h;
		2487	glVertex $w, 0;
		2488	glEnd;
		2489
		2490	glPopMatrix;
		2491
		2492	glTranslate 2, 2;
		2493	$self->SUPER::_draw;
		2494	}
		2495
		2496	#############################################################################
		2497
		2498	package CFClient::UI::Face;
		2499
		2500	our @ISA = CFClient::UI::Base::;
		2501
		2502	use CFClient::OpenGL;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	$class->SUPER::new (
		2508	aspect => 1,
		2509	@_,
		2510	)
		2511	}
		2512
		2513	sub size_request {
		2514	(32, 8)
		2515	}
		2516
		2517	sub _draw {
		2518	my ($self) = @_;
		2519
		2520	return unless $::CONN;#d# manage and cache textures differently
		2521	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2522
		2523	# TODO animation
		2524	if ($tex) {
		2525	glEnable GL_BLEND;
		2526	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2527	glEnable GL_TEXTURE_2D;
		2528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2529	glColor 1, 1, 1, 1;
		2530	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2531	glDisable GL_TEXTURE_2D;
		2532	glDisable GL_BLEND;
		2533	}
		2534	}
		2535
		2536	#############################################################################
		2537
		2538	package CFClient::UI::InventoryItem;
		2539
		2540	our @ISA = CFClient::UI::HBox::;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my %args = @_;
		2546
		2547	my $item = $args{item};
		2548
		2549	my $desc = $item->{nrof} < 2
		2550	? $item->{name}
		2551	: "$item->{nrof} $item->{name_pl}";
		2552
		2553
		2554	my $self = $class->SUPER::new (
		2555	can_hover => 1,
		2556	can_events => 1,
		2557	tooltip => (CFClient::UI::Label->escape ($desc)
		2558	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2559	connect_button_down => sub {
		2560	my ($self, $ev, $x, $y) = @_;
		2561
		2562	# todo: maybe put examine on 1? but should just be a tooltip :(
		2563	if ($ev->{button} == 1) {
		2564	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2565	} elsif ($ev->{button} == 2) {
		2566	$::CONN->send ("apply $item->{tag}");
		2567	} elsif ($ev->{button} == 3) {
		2568	CFClient::UI::Menu->new (
		2569	items => [
		2570	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2571	[
		2572	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2573	sub { $::CONN->send ("lock $item->{tag}") },
		2574	],
		2575	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2576	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2577	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2578	],
		2579	)->popup ($ev);
		2580	}
		2581
		2582	1
		2583	},
		2584	%args
		2585	);
		2586	$self->add(new CFClient::UI::Face
		2587	can_events => 0,
		2588	face => $item->{face},
		2589	anim => $item->{anim},
		2590	animspeed => $item->{animspeed});
		2591	$self->add(new CFClient::UI::Label
		2592	can_events => 0,
		2593	text => $desc);
		2594
		2595	$self
		2596	}
		2597
		2598	#############################################################################
		2599
		2600	package CFClient::UI::Inventory;
		2601
		2602	our @ISA = CFClient::UI::ScrolledWindow::;
		2603
		2604	sub new {
		2605	my $class = shift;
		2606
		2607	my $self = $class->SUPER::new (
		2608	scrolled => (new CFClient::UI::VBox),
		2609	@_,
		2610	);
		2611
		2612	$self
		2613	}
		2614
		2615	sub set_items {
		2616	my ($self, $items) = @_;
		2617
		2618	$self->{scrolled}->clear;
		2619	return unless $items;
		2620
		2621	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2622
		2623	$self->{real_items} = \@items;
		2624
		2625	for my $item (@items) {
		2626	my $desc = $item->{nrof} < 2
		2627	? $item->{name}
		2628	: "$item->{nrof} $item->{name_pl}";
		2629
		2630	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2631	}
		2632
		2633	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2634	}
		2635
		2636	sub size_request {
		2637	my ($self) = @_;
		2638	($self->{req_w}, $self->{req_h});
		2639	}
		2640
		2641	#############################################################################
		2642
		2643	package CFClient::UI::Menu;
		2644
		2645	our @ISA = CFClient::UI::FancyFrame::;
		2646
		2647	use CFClient::OpenGL;
		2648
		2649	sub new {
		2650	my $class = shift;
		2651
		2652	my $self = $class->SUPER::new (
		2653	items => [],
		2654	z => 100,
		2655	@_,
		2656	);
		2657
		2658	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2659
		2660	for my $item (@{ $self->{items} }) {
		2661	my ($widget, $cb) = @$item;
		2662
		2663	# handle various types of items, only text for now
		2664	if (!ref $widget) {
		2665	$widget = new CFClient::UI::Label
		2666	can_hover => 1,
		2667	can_events => 1,
		2668	text => $widget;
		2669	}
		2670
		2671	$self->{item}{$widget} = $item;
		2672
		2673	$self->{vbox}->add ($widget);
		2674	}
		2675
		2676	$self
		2677	}
		2678
		2679	# popup given the event (must be a mouse button down event currently)
		2680	sub popup {
		2681	my ($self, $ev) = @_;
		2682
		2683	$self->emit ("popdown");
		2684
		2685	# maybe save $GRAB? must be careful about events...
		2686	$GRAB = $self;
		2687	$self->{button} = $ev->{button};
		2688
		2689	$self->show;
		2690	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2691	}
		2692
		2693	sub mouse_motion {
		2694	my ($self, $ev, $x, $y) = @_;
		2695
		2696	# TODO: should use vbox->find_widget or so
		2697	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2698	$self->{hover} = $self->{item}{$HOVER};
		2699	}
		2700
		2701	sub button_up {
		2702	my ($self, $ev, $x, $y) = @_;
		2703
		2704	if ($ev->{button} == $self->{button}) {
		2705	undef $GRAB;
		2706	$self->hide;
		2707
		2708	$self->emit ("popdown");
		2709	$self->{hover}[1]->() if $self->{hover};
		2710	}
		2711	}
		2712
		2713	#############################################################################
		2714
2088	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2089		2716
2090	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2091		2718
2092	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2093		2720
2094	sub check_size {	2721	sub check_size {
2095	my ($self) = @_;	2722	my ($self) = @_;
2096		2723
2097	$self->configure (0, 0, $::WITH, $::HEIGHT);	2724	$self->configure (0, 0, $self->{w}, $self->{h});
2098	}	2725	}
2099		2726
2100	sub size_request {	2727	sub size_request {
2101	($::WIDTH, $::HEIGHT)	2728	my ($self) = @_;
		2729
		2730	($self->{w}, $self->{h})
		2731	}
		2732
		2733	sub size_allocate {
		2734	my ($self, $w, $h) = @_;
		2735
		2736	my $old_w = $self->{old_w};
		2737	my $old_h = $self->{old_h};
		2738
		2739	if ($old_w && $old_h) {
		2740	for my $child ($self->children) {
		2741	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2742	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2743	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2744	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2745	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2746	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2747	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2748	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2749	}
		2750	}
		2751
		2752	$self->{old_w} = $w;
		2753	$self->{old_h} = $h;
2102	}	2754	}
2103		2755
2104	sub configure {	2756	sub configure {
2105	my ($self, $x, $y, $w, $h) = @_;	2757	my ($self, $x, $y, $w, $h) = @_;
2106		2758
2107	$self->SUPER::configure ($x, $y, $w, $h);	2759	$self->SUPER::configure ($x, $y, $w, $h);
2108		2760
2109	$_->configure ($_->{x}, $_->{y}, $_->size_request)	2761	for my $child ($self->children) {
2110	for @{$self->{children}};	2762	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2763
		2764	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2765	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2766	$child->configure ($X, $Y, $W, $H);
		2767	}
2111	}	2768	}
2112		2769
2113	sub _topleft {	2770	sub _topleft {
2114	my ($self, $x, $y) = @_;	2771	my ($self, $x, $y) = @_;
2115		2772
…		…
2162	#############################################################################	2819	#############################################################################
2163		2820
2164	package CFClient::UI;	2821	package CFClient::UI;
2165		2822
2166	$ROOT = new CFClient::UI::Root;	2823	$ROOT = new CFClient::UI::Root;
		2824	$TOOLTIP = new CFClient::UI::Tooltip;
2167		2825
2168	1	2826	1
2169		2827

Diff Legend

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