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

Diff Legend

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