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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.188 by root, Mon May 8 21:16:09 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->motion_x, $ev->motion_y);	63	my ($x, $y) = ($ev->{x}, $ev->{y});
27		64
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;
33	}
34		70
		71	check_tooltip;
		72	}
		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->motion_x, $ev->motion_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) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	106	my ($x, $y) = ($ev->{x}, $ev->{y});
60		107
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	108	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		109
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) = @_;
…		…
87		139
88	package CFClient::UI::Base;	140	package CFClient::UI::Base;
89		141
90	use strict;	142	use strict;
91		143
92	use SDL::OpenGL;	144	use CFClient::OpenGL;
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,
101	w => -1,	153	can_events => 1,
102	h => -1,
103	@_	154	@_
104	}, $class;	155	}, $class;
105		156
106	for (keys %$self) {	157	for (keys %$self) {
107	if (/^connect_(.*)$/) {	158	if (/^connect_(.*)$/) {
…		…
110	}	161	}
111		162
112	$self	163	$self
113	}	164	}
114		165
		166	sub destroy {
		167	my ($self) = @_;
		168
		169	$self->hide;
		170	%$self = ();
		171	}
		172
		173	sub show {
		174	my ($self) = @_;
		175
		176	return if $self->{parent};
		177
		178	$CFClient::UI::ROOT->add ($self);
		179	}
		180
		181	sub hide {
		182	my ($self) = @_;
		183
		184	undef $GRAB if $GRAB == $self;
		185	undef $HOVER if $HOVER == $self;
		186
		187	$self->{parent}->remove ($self)
		188	if $self->{parent};
		189	}
		190
115	sub move {	191	sub move {
116	my ($self, $x, $y, $z) = @_;	192	my ($self, $x, $y, $z) = @_;
117		193
118	$self->{x} = int $x;	194	$self->{x} = int $x;
119	$self->{y} = int $y;	195	$self->{y} = int $y;
120	$self->{z} = $z if defined $z;	196	$self->{z} = $z if defined $z;
121		197
122	$self->update;	198	$self->update;
123	}	199	}
124		200
125	sub needs_redraw {	201	sub set_size {
126	0	202	my ($self, $w, $h) = @_;
		203
		204	$self->{user_w} = $w;
		205	$self->{user_h} = $h;
		206
		207	$self->check_size;
127	}	208	}
128		209
129	sub size_request {	210	sub size_request {
130	require Carp;	211	require Carp;
131	Carp::confess "size_request is abtract";	212	Carp::confess "size_request is abstract";
132	}	213	}
133		214
134	sub configure {	215	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	216	my ($self, $x, $y, $w, $h) = @_;
136		217
		218	if ($self->{aspect}) {
		219	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		220	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		221
		222	# use alignment to adjust x, y
		223
		224	$x += int +($w - $w2) * 0.5;
		225	$y += int +($h - $h2) * 0.5;
		226
		227	($w, $h) = ($w2, $h2);
		228	}
		229
		230	if ($self->{x} != $x || $self->{y} != $y) {
137	$self->{x} = $x;	231	$self->{x} = $x;
138	$self->{y} = $y;	232	$self->{y} = $y;
		233	$self->update;
		234	}
139		235
140	return unless $self->{w} != $w || $self->{h} != $h;	236	if ($self->{w} != $w || $self->{h} != $h) {
141
142	$self->{w} = $w;	237	$self->{w} = $w;
143	$self->{h} = $h;	238	$self->{h} = $h;
144		239
145	$self->size_allocate ($w, $h);	240	$self->size_allocate ($w, $h);
		241	$self->update;
		242	$self->emit (size_allocate => $w, $h);
		243	}
146	}	244	}
147		245
148	sub size_allocate {	246	sub size_allocate {
149	# 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;
150	}	270	}
151		271
152	# return top left coordinates	272	# return top left coordinates
153	sub _topleft {	273	sub _topleft {
154	my ($self, $x, $y) = @_;	274	my ($self, $x, $y) = @_;
		275
		276	$self->{parent}
		277	or Carp::confess "no parent widget in _topleft\n";#d#
155		278
156	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
157	}	280	}
158		281
159	# translate global coordinates to local coordinate system	282	# translate global coordinates to local coordinate system
…		…
237	glVertex $x + $self->{w}, $y + $self->{h};	360	glVertex $x + $self->{w}, $y + $self->{h};
238	glVertex $x , $y + $self->{h};	361	glVertex $x , $y + $self->{h};
239	glEnd;	362	glEnd;
240	glDisable GL_BLEND;	363	glDisable GL_BLEND;
241	}	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	}
242	}	379	}
243		380
244	sub _draw {	381	sub _draw {
245	my ($self) = @_;	382	my ($self) = @_;
246		383
247	warn "no draw defined for $self\n";	384	warn "no draw defined for $self\n";
248	}	385	}
249		386
250	sub find_widget {	387	sub find_widget {
251	my ($self, $x, $y) = @_;	388	my ($self, $x, $y) = @_;
		389
		390	return () unless $self->{can_events};
252		391
253	return $self	392	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	393	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	394	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		395
…		…
264	}	403	}
265		404
266	sub check_size {	405	sub check_size {
267	my ($self) = @_;	406	my ($self) = @_;
268		407
269	my ($w, $h) = $self->size_request;	408	$self->{parent}
		409	or return 1;
270		410
		411	my ($w, $h) = $self->{user_w} && $self->{user_h}
		412	? @$self{qw(user_w user_h)}
		413	: $self->size_request;
		414
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {	415	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;	416	$self->{req_w} = $w;
273	$self->{req_h} = $h;	417	$self->{req_h} = $h;
274		418
275	$self->{parent}->check_size	419	$self->{parent}->check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);	420	or $self->size_allocate (
279	$self->update;	421	(List::Util::max $self->{w}, $w),
		422	(List::Util::max $self->{h}, $h),
		423	);
		424
		425	1
		426	} else {
		427	0
280	}	428	}
281	}	429	}
282		430
283	sub update {	431	sub update {
284	my ($self) = @_;	432	my ($self) = @_;
…		…
294	}	442	}
295		443
296	sub emit {	444	sub emit {
297	my ($self, $signal, @args) = @_;	445	my ($self, $signal, @args) = @_;
298		446
299	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	447	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300	$cb->($self, @args);
301	}
302	}	448	}
303		449
304	sub DESTROY {	450	sub DESTROY {
305	my ($self) = @_;	451	my ($self) = @_;
306		452
…		…
312	package CFClient::UI::DrawBG;	458	package CFClient::UI::DrawBG;
313		459
314	our @ISA = CFClient::UI::Base::;	460	our @ISA = CFClient::UI::Base::;
315		461
316	use strict;	462	use strict;
317	use SDL::OpenGL;	463	use CFClient::OpenGL;
318		464
319	sub new {	465	sub new {
320	my $class = shift;	466	my $class = shift;
321		467
322	# range [value, low, high, page]	468	# range [value, low, high, page]
…		…
351		497
352	package CFClient::UI::Empty;	498	package CFClient::UI::Empty;
353		499
354	our @ISA = CFClient::UI::Base::;	500	our @ISA = CFClient::UI::Base::;
355		501
		502	sub new {
		503	my ($class, %arg) = @_;
		504	$class->SUPER::new (can_events => 0, %arg);
		505	}
		506
356	sub size_request {	507	sub size_request {
357	(0, 0)	508	(0, 0)
358	}	509	}
359		510
360	sub draw { }	511	sub draw { }
…		…
368	sub new {	519	sub new {
369	my ($class, %arg) = @_;	520	my ($class, %arg) = @_;
370		521
371	my $children = delete $arg{children} || [];	522	my $children = delete $arg{children} || [];
372		523
373	my $self = $class->SUPER::new (children => [], %arg);	524	my $self = $class->SUPER::new (
		525	children => [],
		526	can_events => 0,
		527	%arg,
		528	);
374	$self->add ($_) for @$children;	529	$self->add ($_) for @$children;
375		530
376	$self	531	$self
377	}	532	}
378		533
379	sub add {	534	sub add {
380	my ($self, $child) = @_;	535	my ($self, @widgets) = @_;
381		536
382	$child->set_parent ($self);	537	$_->set_parent ($self)
		538	for @widgets;
383		539
384	use sort 'stable';	540	use sort 'stable';
385		541
386	$self->{children} = [	542	$self->{children} = [
387	sort { $a->{z} <=> $b->{z} }	543	sort { $a->{z} <=> $b->{z} }
388	@{$self->{children}}, $child	544	@{$self->{children}}, @widgets
389	];	545	];
390		546
391	$self->{w} = $self->{h} = -1;
392
393	$child->check_size;	547	$_->check_size
		548	for @widgets;
		549
		550	$self->update;
		551	}
		552
		553	sub children {
		554	@{ $_[0]{children} }
394	}	555	}
395		556
396	sub remove {	557	sub remove {
397	my ($self, $widget) = @_;	558	my ($self, $child) = @_;
398		559
		560	delete $child->{parent};
		561	$child->hide;
		562
399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	563	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400		564
401	$self->check_size;	565	$self->check_size;
		566	$self->update;
		567	}
		568
		569	sub clear {
		570	my ($self) = @_;
		571
		572	my $children = delete $self->{children};
		573	$self->{children} = [];
		574
		575	for (@$children) {
		576	delete $_->{parent};
		577	$_->hide;
		578	}
		579
		580	$self->check_size;
		581	$self->update;
402	}	582	}
403		583
404	sub find_widget {	584	sub find_widget {
405	my ($self, $x, $y) = @_;	585	my ($self, $x, $y) = @_;
406		586
…		…
436		616
437	$class->SUPER::new (children => [$child], %arg)	617	$class->SUPER::new (children => [$child], %arg)
438	}	618	}
439		619
440	sub add {	620	sub add {
441	my ($self, $widget) = @_;	621	my ($self, $child) = @_;
442		622
443	$self->{children} = [];	623	$self->{children} = [];
444		624
445	$self->SUPER::add ($widget);	625	$self->SUPER::add ($child);
446	}	626	}
447		627
448	sub remove {	628	sub remove {
449	my ($self, $widget) = @_;	629	my ($self, $widget) = @_;
450		630
…		…
470		650
471	package CFClient::UI::Window;	651	package CFClient::UI::Window;
472		652
473	our @ISA = CFClient::UI::Bin::;	653	our @ISA = CFClient::UI::Bin::;
474		654
475	use SDL::OpenGL;	655	use CFClient::OpenGL;
476		656
477	sub new {	657	sub new {
478	my ($class, %arg) = @_;	658	my ($class, %arg) = @_;
479		659
480	my $self = $class->SUPER::new (%arg);	660	my $self = $class->SUPER::new (%arg);
481	}	661	}
482		662
483	sub update {	663	sub update {
484	my ($self) = @_;	664	my ($self) = @_;
485		665
486	# we want to do this delayed...	666	$ROOT->on_refresh ($self => sub { $self->render_child });
487	$self->render_chld;
488	$self->SUPER::update;	667	$self->SUPER::update;
489	}
490
491	sub render_chld {
492	my ($self) = @_;
493
494	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
495	glClearColor 0, 0, 0, 1;
496	glClear GL_COLOR_BUFFER_BIT;
497	$self->child->draw;
498	};
499	}	668	}
500		669
501	sub size_allocate {	670	sub size_allocate {
502	my ($self, $w, $h) = @_;	671	my ($self, $w, $h) = @_;
503		672
504	$self->child->configure (0, 0, $w, $h);	673	$self->SUPER::size_allocate ($w, $h);
		674	$self->update;
		675	}
505		676
		677	sub _render {
		678	$_[0]{children}[0]->draw;
		679	}
		680
		681	sub render_child {
		682	my ($self) = @_;
		683
		684	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		685	glClearColor 0, 0, 0, 0;
		686	glClear GL_COLOR_BUFFER_BIT;
		687
506	$self->render_chld;	688	$self->_render;
		689	# glColorMask 1, 1, 1, 0;
		690	# glEnable GL_BLEND;
		691	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		692	# glRasterPos 0, 0;
		693	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		694	# glDisable GL_BLEND;
		695	# glColorMask 1, 1, 1, 1;
		696	};
507	}	697	}
508		698
509	sub _draw {	699	sub _draw {
510	my ($self) = @_;	700	my ($self) = @_;
511		701
512	my ($w, $h) = ($self->w, $self->h);	702	my ($w, $h) = ($self->w, $self->h);
513		703
514	my $tex = $self->{texture}	704	my $tex = $self->{texture}
515	or return;	705	or return;
		706
		707	glEnable GL_BLEND;
		708	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		709	glEnable GL_TEXTURE_2D;
		710	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		711	glColor 0, 0, 0, 1;
		712
		713	$tex->draw_quad (0, 0, $w, $h);
		714
		715	glDisable GL_BLEND;
		716	glDisable GL_TEXTURE_2D;
		717	}
		718
		719	#############################################################################
		720
		721	package CFClient::UI::ViewPort;
		722
		723	our @ISA = CFClient::UI::Window::;
		724
		725	sub size_request {
		726	my ($self) = @_;
		727
		728	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		729	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
		730
		731	@$self{qw(child_w child_h)}
		732	}
		733
		734	sub size_allocate {
		735	my ($self, $w, $h) = @_;
		736
		737	$self->update;
		738	}
		739
		740	sub set_offset {
		741	my ($self, $x, $y) = @_;
		742
		743	$self->{view_x} = int $x;
		744	$self->{view_y} = int $y;
		745
		746	$self->update;
		747	}
		748
		749	# hmm, this does not work for topleft of $self... but we should not aks for that
		750	sub _topleft {
		751	my ($self, $x, $y) = @_;
		752
		753	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
		754	}
		755
		756	sub find_widget {
		757	my ($self, $x, $y) = @_;
		758
		759	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		760	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		761	) {
		762	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		763	} else {
		764	$self->CFClient::UI::Base::find_widget ($x, $y)
		765	}
		766	}
		767
		768	sub _render {
		769	my ($self) = @_;
		770
		771	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		772
		773	$self->SUPER::_render;
		774	}
		775
		776	#############################################################################
		777
		778	package CFClient::UI::ScrolledWindow;
		779
		780	our @ISA = CFClient::UI::HBox::;
		781
		782	sub new {
		783	my $class = shift;
		784
		785	my $self;
		786
		787	my $slider = new CFClient::UI::Slider
		788	vertical => 1,
		789	range => [0, 0, 1, 0.01], # HACK fix
		790	connect_changed => sub {
		791	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		792	},
		793	;
		794
		795	$self = $class->SUPER::new (
		796	vp => (new CFClient::UI::ViewPort),
		797	slider => $slider,
		798	@_,
		799	);
		800
		801	$self->{vp}->add ($self->{scrolled});
		802	$self->add ($self->{vp});
		803	$self->add ($self->{slider});
		804
		805	$self
		806	}
		807
		808	#TODO# update range on size_allocate depeneing on child
		809	# update viewport offset on scroll
		810
		811	#############################################################################
		812
		813	package CFClient::UI::Frame;
		814
		815	our @ISA = CFClient::UI::Bin::;
		816
		817	use CFClient::OpenGL;
		818
		819	sub new {
		820	my $class = shift;
		821
		822	my $self = $class->SUPER::new (
		823	bg => [1, 1, 1, 1],
		824	border_bg => [1, 1, 1, 1],
		825	border => 0.8,
		826	@_
		827	);
		828
		829	$self
		830	}
		831
		832	sub _draw {
		833	my ($self) = @_;
		834
		835	my ($w, $h) = ($self->{w}, $self->{h});
516		836
517	glEnable GL_BLEND;	837	glEnable GL_BLEND;
518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519	glEnable GL_TEXTURE_2D;	839	glEnable GL_TEXTURE_2D;
520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
521		841
522	$tex->draw_quad (0, 0, $w, $h);	842	# glBegin GL_QUADS;
		843	# glColor 0, 0, 0, 0;
		844	# glVertex 0 , 0;
		845	# glVertex 0 , $h;
		846	# glVertex $w, $h;
		847	# glVertex $w, 0;
		848	# glEnd;
523		849
		850
		851	$self->child->draw;
524	glDisable GL_BLEND;	852	glDisable GL_BLEND;
525	glDisable GL_TEXTURE_2D;	853	glDisable GL_TEXTURE_2D;
526	}	854	}
527		855
528	#############################################################################	856	#############################################################################
529		857
530	package CFClient::UI::ViewPort;
531
532	our @ISA = CFClient::UI::Window::;
533
534	sub new { die }
535
536	sub size_request {
537	my ($self) = @_;
538
539	@$self{qw(child_w child_h)} = $self->child->size_request;
540	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541
542	@$self{qw(child_w child_h)}
543	}
544
545	sub _draw {
546	my ($self) = @_;
547
548	$self->{children}[1]->draw;
549	}
550
551
552	#############################################################################
553
554	package CFClient::UI::Frame;	858	package CFClient::UI::FancyFrame;
555		859
556	our @ISA = CFClient::UI::Bin::;	860	our @ISA = CFClient::UI::Bin::;
557		861
558	use SDL::OpenGL;	862	use CFClient::OpenGL;
559
560	sub size_request {
561	my ($self) = @_;
562	my $chld = $self->child
563	or return (0, 0);
564
565	$chld->move (2, 2);
566
567	map { $_ + 4 } $chld->size_request;
568	}
569
570	sub size_allocate {
571	my ($self, $x, $y, $w, $h) = @_;
572
573	$self->child->configure (2, 2, $w - 4, $h - 4);
574	}
575
576	sub _draw {
577	my ($self) = @_;
578
579	my $chld = $self->child;
580
581	my ($w, $h) = $chld->size_request;
582
583	glBegin GL_QUADS;
584	glColor 0, 0, 0;
585	glVertex 0 , 0;
586	glVertex 0 , $h + 4;
587	glVertex $w + 4 , $h + 4;
588	glVertex $w + 4 , 0;
589	glEnd;
590
591	$chld->draw;
592	}
593
594	#############################################################################
595
596	package CFClient::UI::FancyFrame;
597
598	our @ISA = CFClient::UI::Bin::;
599
600	use SDL::OpenGL;
601		863
602	my @tex =	864	my @tex =
603	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	865	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
604	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	866	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605		867
606	sub new {	868	sub new {
607	my $class = shift;	869	my $class = shift;
608		870
609	# TODO: user_x, user_y, overwrite moveto?	871	# TODO: user_x, user_y, overwrite moveto?
610		872
611	$class->SUPER::new (	873	my $self = $class->SUPER::new (
612	bg => [1, 1, 1, 1],	874	bg => [1, 1, 1, 1],
613	border_bg => [1, 1, 1, 1],	875	border_bg => [1, 1, 1, 1],
614	border => int $::FONTSIZE * 0.8,	876	border => 0.6,
		877	can_events => 1,
615	@_	878	@_
616	)	879	);
		880
		881	$self->{title} &&= new CFClient::UI::Label
		882	align => 0,
		883	valign => 1,
		884	text => $self->{title},
		885	fontsize => $self->{border};
		886
		887	$self
		888	}
		889
		890	sub border {
		891	int $_[0]{border} * $::FONTSIZE
617	}	892	}
618		893
619	sub size_request {	894	sub size_request {
620	my ($self) = @_;	895	my ($self) = @_;
621		896
622	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624	my ($w, $h) = $self->SUPER::size_request;	897	my ($w, $h) = $self->SUPER::size_request;
625		898
626	(	899	(
627	$w + $self->{border} * 2,	900	$w + $self->border * 2,
628	$h + $self->{border} * 2,	901	$h + $self->border * 2,
629	)	902	)
630	}	903	}
631		904
632	sub size_allocate {	905	sub size_allocate {
633	my ($self, $w, $h) = @_;	906	my ($self, $w, $h) = @_;
634		907
635	$h -= List::Util::max 0, $self->{border} * 2;	908	$h -= List::Util::max 0, $self->border * 2;
636	$w -= List::Util::max 0, $self->{border} * 2;	909	$w -= List::Util::max 0, $self->border * 2;
637		910
		911	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		912	if $self->{title};
		913
638	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	914	$self->child->configure ($self->border, $self->border, $w, $h);
639	}	915	}
640		916
641	sub button_down {	917	sub button_down {
642	my ($self, $ev, $x, $y) = @_;	918	my ($self, $ev, $x, $y) = @_;
643		919
644	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	920	my ($w, $h) = @$self{qw(w h)};
645	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	921	my $border = $self->border;
646		922
		923	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
		924	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
		925
		926	if ($lr & $td) {
		927	my ($wx, $wy) = ($self->{x}, $self->{y});
647	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	928	my ($ox, $oy) = ($ev->{x}, $ev->{y});
648	my ($bw, $bh) = ($self->{w}, $self->{h});	929	my ($bw, $bh) = ($self->{w}, $self->{h});
		930
		931	my $mx = $x < $border;
		932	my $my = $y < $border;
649		933
650	$self->{motion} = sub {	934	$self->{motion} = sub {
651	my ($ev, $x, $y) = @_;	935	my ($ev, $x, $y) = @_;
652		936
653	($x, $y) = ($ev->motion_x, $ev->motion_y);	937	my $dx = $ev->{x} - $ox;
		938	my $dy = $ev->{y} - $oy;
654		939
655	$self->{user_w} = $bw + $x - $ox;	940	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
656	$self->{user_h} = $bh + $y - $oy;	941	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		942	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
657	$self->check_size;	943	$self->check_size;
658	};	944	};
659		945
660	} elsif ($x >= 0 && $x < $self->{w}	946	} elsif ($lr ^ $td) {
661	&& $y >= 0 && $y < $self->{border}) {
662
663	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	947	my ($ox, $oy) = ($ev->{x}, $ev->{y});
664	my ($bx, $by) = ($self->{x}, $self->{y});	948	my ($bx, $by) = ($self->{x}, $self->{y});
665		949
666	$self->{motion} = sub {	950	$self->{motion} = sub {
667	my ($ev, $x, $y) = @_;	951	my ($ev, $x, $y) = @_;
668		952
669	($x, $y) = ($ev->motion_x, $ev->motion_y);	953	($x, $y) = ($ev->{x}, $ev->{y});
670		954
671	$self->move ($bx + $x - $ox, $by + $y - $oy);	955	$self->move ($bx + $x - $ox, $by + $y - $oy);
672	$self->update;	956	$self->update;
673	};	957	};
674	}	958	}
…		…
695	glEnable GL_BLEND;	979	glEnable GL_BLEND;
696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	980	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697	glEnable GL_TEXTURE_2D;	981	glEnable GL_TEXTURE_2D;
698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699		983
		984	my $border = $self->border;
		985
700	glColor @{ $self->{border_bg} };	986	glColor @{ $self->{border_bg} };
701	$tex[1]->draw_quad (0, 0, $w, $self->{border});	987	$tex[1]->draw_quad (0, 0, $w, $border);
702	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	988	$tex[3]->draw_quad (0, $border, $border, $ch);
703	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	989	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	990	$tex[4]->draw_quad (0, $h - $border, $w, $border);
705		991
		992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
706	my $bg = $tex[0];	993	my $bg = $tex[0];
707		994
708	# TODO: repeat texture not scale	995	# TODO: repeat texture not scale
709	my $rep_x = $cw / $bg->{w};	996	my $rep_x = $cw / $bg->{w};
710	my $rep_y = $ch / $bg->{h};	997	my $rep_y = $ch / $bg->{h};
711		998
712	glColor @{ $self->{bg} };	999	glColor @{ $self->{bg} };
713		1000
714	$bg->{s} = $rep_x;	1001	$bg->{s} = $rep_x;
715	$bg->{t} = $rep_y;	1002	$bg->{t} = $rep_y;
716	$bg->{wrap_mode} = 1;	1003	$bg->{wrap_mode} = 1;
717	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	1004	$bg->draw_quad ($border, $border, $cw, $ch);
718		1005
719	glDisable GL_TEXTURE_2D;	1006	glDisable GL_TEXTURE_2D;
720	glDisable GL_BLEND;	1007	glDisable GL_BLEND;
		1008	}
		1009
		1010	$self->{title}->draw if $self->{title};
721		1011
722	$self->child->draw;	1012	$self->child->draw;
723	}	1013	}
724		1014
725	#############################################################################	1015	#############################################################################
…		…
728		1018
729	our @ISA = CFClient::UI::Base::;	1019	our @ISA = CFClient::UI::Base::;
730		1020
731	use List::Util qw(max sum);	1021	use List::Util qw(max sum);
732		1022
733	use SDL::OpenGL;	1023	use CFClient::OpenGL;
734		1024
735	sub new {	1025	sub new {
736	my $class = shift;	1026	my $class = shift;
737		1027
738	$class->SUPER::new (	1028	$class->SUPER::new (
…		…
745	my ($self, $x, $y, $child) = @_;	1035	my ($self, $x, $y, $child) = @_;
746		1036
747	$child->set_parent ($self);	1037	$child->set_parent ($self);
748	$self->{children}[$y][$x] = $child;	1038	$self->{children}[$y][$x] = $child;
749		1039
750	$self->{w} = $self->{h} = -1;
751
752	$child->check_size;	1040	$child->check_size;
		1041	}
		1042
		1043	sub children {
		1044	grep $_, map @$_, grep $_, @{ $_[0]{children} }
753	}	1045	}
754		1046
755	# TODO: move to container class maybe? send childs a signal on removal?	1047	# TODO: move to container class maybe? send childs a signal on removal?
756	sub clear {	1048	sub clear {
757	my ($self) = @_;	1049	my ($self) = @_;
758		1050
		1051	my @children = $self->children;
759	delete $self->{children};	1052	delete $self->{children};
		1053
		1054	for (@children) {
		1055	delete $_->{parent};
		1056	$_->hide;
		1057	}
		1058
760	$self->update;	1059	$self->update;
761	}	1060	}
762		1061
763	sub get_wh {	1062	sub get_wh {
764	my ($self) = @_;	1063	my ($self) = @_;
…		…
770	or next;	1069	or next;
771		1070
772	for my $x (0 .. $#$row) {	1071	for my $x (0 .. $#$row) {
773	my $widget = $row->[$x]	1072	my $widget = $row->[$x]
774	or next;	1073	or next;
775	my ($w, $h) = $widget->size_request;	1074	my ($w, $h) = @$widget{qw(req_w req_h)};
776		1075
777	$w[$x] = max $w[$x], $w;	1076	$w[$x] = max $w[$x], $w;
778	$h[$y] = max $h[$y], $h;	1077	$h[$y] = max $h[$y], $h;
779	}	1078	}
780	}	1079	}
…		…
885		1184
886	($h, $w) = ($w, $h);	1185	($h, $w) = ($w, $h);
887		1186
888	my $children = $self->{children};	1187	my $children = $self->{children};
889		1188
890	my @h = map +($_->size_request)[0], @$children;	1189	my @h = map $_->{req_w}, @$children;
891		1190
892	my $req_h = List::Util::sum @h;	1191	my $req_h = List::Util::sum @h;
893		1192
894	if ($req_h > $h) {	1193	if ($req_h > $h) {
895	# ah well, not enough space	1194	# ah well, not enough space
…		…
943	sub size_allocate {	1242	sub size_allocate {
944	my ($self, $w, $h) = @_;	1243	my ($self, $w, $h) = @_;
945		1244
946	my $children = $self->{children};	1245	my $children = $self->{children};
947		1246
948	my @h = map +($_->size_request)[1], @$children;	1247	my @h = map $_->{req_h}, @$children;
949		1248
950	my $req_h = List::Util::sum @h;	1249	my $req_h = List::Util::sum @h;
951		1250
952	if ($req_h > $h) {	1251	if ($req_h > $h) {
953	# ah well, not enough space	1252	# ah well, not enough space
…		…
981		1280
982	package CFClient::UI::Label;	1281	package CFClient::UI::Label;
983		1282
984	our @ISA = CFClient::UI::Base::;	1283	our @ISA = CFClient::UI::Base::;
985		1284
986	use SDL::OpenGL;	1285	use CFClient::OpenGL;
987		1286
988	sub new {	1287	sub new {
989	my ($class, %arg) = @_;	1288	my ($class, %arg) = @_;
990		1289
991	my $self = $class->SUPER::new (	1290	my $self = $class->SUPER::new (
992	fg => [1, 1, 1],	1291	fg => [1, 1, 1],
993	fontsize => $::FONTSIZE,	1292	#font => default_font
		1293	fontsize => 1,
994	text => "",	1294	text => "",
995	align => -1,	1295	align => -1,
996	valign => -1,	1296	valign => -1,
997	padding => 2,	1297	padding => 2,
998	layout => new CFClient::Layout,	1298	layout => new CFClient::Layout,
		1299	can_events => 0,
999	%arg	1300	%arg
1000	);	1301	);
1001		1302
1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1303	if (exists $self->{template}) {
		1304	my $layout = new CFClient::Layout;
		1305	$layout->set_text (delete $self->{template});
		1306	$self->{template} = $layout;
		1307	}
1003		1308
1004	$self->set_text (delete $self->{text}) if exists $self->{text};	1309	$self->set_text (delete $self->{text}) if exists $self->{text};
1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1310	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006		1311
1007	$self	1312	$self
1008	}	1313	}
1009		1314
1010	sub escape_text {	1315	sub escape {
1011	local $_ = $_[1];	1316	local $_ = $_[1];
1012		1317
1013	s/&/&amp;/g;	1318	s/&/&amp;/g;
1014	s/>/&gt;/g;	1319	s/>/&gt;/g;
1015	s/</&lt;/g;	1320	s/</&lt;/g;
1016		1321
1017	$_[1]	1322	$_[1]
1018	}	1323	}
1019		1324
		1325	sub update {
		1326	my ($self) = @_;
		1327
		1328	delete $self->{texture};
		1329	$self->SUPER::update;
		1330	}
		1331
1020	sub set_text {	1332	sub set_text {
1021	my ($self, $text) = @_;	1333	my ($self, $text) = @_;
1022		1334
		1335	return if $self->{text} eq "T$text";
		1336	$self->{text} = "T$text";
		1337
1023	$self->{layout}->set_text ($text);	1338	$self->{layout}->set_text ($text);
1024		1339
1025	delete $self->{texture};	1340	delete $self->{texture};
1026	$self->update;	1341	$self->update;
		1342	$self->check_size;
1027	}	1343	}
1028		1344
1029	sub set_markup {	1345	sub set_markup {
1030	my ($self, $markup) = @_;	1346	my ($self, $markup) = @_;
1031		1347
		1348	return if $self->{text} eq "M$markup";
		1349	$self->{text} = "M$markup";
		1350
1032	$self->{layout}->set_markup ($markup);	1351	$self->{layout}->set_markup ($markup);
1033		1352
1034	delete $self->{texture};	1353	delete $self->{texture};
1035	$self->update;	1354	$self->update;
		1355	$self->check_size;
1036	}	1356	}
1037		1357
1038	sub size_request {	1358	sub size_request {
1039	my ($self) = @_;	1359	my ($self) = @_;
1040		1360
1041	$self->{layout}->set_width;	1361	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1362	$self->{layout}->set_width ($self->{max_w} || -1);
1042	$self->{layout}->set_height ($self->{fontsize});	1363	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043		1364
1044	my ($w, $h) = $self->{layout}->size;	1365	my ($w, $h) = $self->{layout}->size;
		1366
		1367	if (exists $self->{template}) {
		1368	$self->{template}->set_font ($self->{font}) if $self->{font};
		1369	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1370
		1371	my ($w2, $h2) = $self->{template}->size;
		1372
		1373	$w = List::Util::max $w, $w2;
		1374	$h = List::Util::max $h, $h2;
		1375	}
1045		1376
1046	(	1377	(
1047	$w + $self->{padding} * 2,	1378	$w + $self->{padding} * 2,
1048	$h + $self->{padding} * 2,	1379	$h + $self->{padding} * 2,
1049	)	1380	)
…		…
1053	my ($self, $w, $h) = @_;	1384	my ($self, $w, $h) = @_;
1054		1385
1055	delete $self->{texture};	1386	delete $self->{texture};
1056	}	1387	}
1057		1388
1058	sub update {	1389	sub set_fontsize {
1059	my ($self) = @_;	1390	my ($self, $fontsize) = @_;
1060		1391
		1392	$self->{fontsize} = $fontsize;
1061	delete $self->{texture};	1393	delete $self->{texture};
		1394
1062	$self->SUPER::update;	1395	$self->update;
		1396	$self->check_size;
1063	}	1397	}
1064		1398
1065	sub _draw {	1399	sub _draw {
1066	my ($self) = @_;	1400	my ($self) = @_;
1067		1401
1068	my $tex = $self->{texture} ||= do {	1402	my $tex = $self->{texture} ||= do {
		1403	$self->{layout}->set_font ($self->{font}) if $self->{font};
1069	$self->{layout}->set_width ($self->{w});	1404	$self->{layout}->set_width ($self->{w});
1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071	new_from_layout CFClient::Texture $self->{layout}	1406	new_from_layout CFClient::Texture $self->{layout}
1072	};	1407	};
1073		1408
1074	glEnable GL_BLEND;	1409	glEnable GL_BLEND;
1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1100		1435
1101	package CFClient::UI::EntryBase;	1436	package CFClient::UI::EntryBase;
1102		1437
1103	our @ISA = CFClient::UI::Label::;	1438	our @ISA = CFClient::UI::Label::;
1104		1439
1105	use SDL;	1440	use CFClient::OpenGL;
1106	use SDL::OpenGL;
1107		1441
1108	sub new {	1442	sub new {
1109	my $class = shift;	1443	my $class = shift;
1110		1444
1111	$class->SUPER::new (	1445	$class->SUPER::new (
1112	fg => [1, 1, 1],	1446	fg => [1, 1, 1],
1113	bg => [0, 0, 0, 0.2],	1447	bg => [0, 0, 0, 0.2],
1114	active_bg => [1, 1, 1, 0.5],	1448	active_bg => [1, 1, 1, 0.5],
1115	active_fg => [0, 0, 0],	1449	active_fg => [0, 0, 0],
1116	can_hover => 1,	1450	can_hover => 1,
1117	can_focus => 1,	1451	can_focus => 1,
1118	valign => 0,	1452	valign => 0,
		1453	can_events => 1,
1119	@_	1454	@_
1120	)	1455	)
1121	}	1456	}
1122		1457
1123	sub _set_text {	1458	sub _set_text {
…		…
1125		1460
1126	delete $self->{cur_h};	1461	delete $self->{cur_h};
1127		1462
1128	return if $self->{text} eq $text;	1463	return if $self->{text} eq $text;
1129		1464
		1465	delete $self->{texture};
		1466
1130	$self->{last_activity} = $::NOW;	1467	$self->{last_activity} = $::NOW;
1131	$self->{text} = $text;	1468	$self->{text} = $text;
1132		1469
1133	$text =~ s/./*/g if $self->{hidden};	1470	$text =~ s/./*/g if $self->{hidden};
1134	$self->{layout}->set_text ("$text ");	1471	$self->{layout}->set_text ("$text ");
…		…
1149	}	1486	}
1150		1487
1151	sub size_allocate {	1488	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1489	my ($self, $w, $h) = @_;
1153		1490
1154	$self->_set_text ($self->{text});	1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155	}	1492	}
1156		1493
1157	sub set_text {	1494	sub set_text {
1158	my ($self, $text) = @_;	1495	my ($self, $text) = @_;
1159		1496
…		…
1163	}	1500	}
1164		1501
1165	sub key_down {	1502	sub key_down {
1166	my ($self, $ev) = @_;	1503	my ($self, $ev) = @_;
1167		1504
1168	my $mod = $ev->key_mod;	1505	my $mod = $ev->{mod};
1169	my $sym = $ev->key_sym;	1506	my $sym = $ev->{sym};
1170
1171	my $uni = $ev->key_unicode;	1507	my $uni = $ev->{unicode};
1172		1508
1173	my $text = $self->get_text;	1509	my $text = $self->get_text;
1174		1510
1175	if ($sym == SDLK_BACKSPACE) {	1511	if ($sym == 8) {
1176	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177	} elsif ($sym == SDLK_DELETE) {	1513	} elsif ($sym == 127) {
1178	substr $text, $self->{cursor}, 1, "";	1514	substr $text, $self->{cursor}, 1, "";
1179	} elsif ($sym == SDLK_LEFT) {	1515	} elsif ($sym == CFClient::SDLK_LEFT) {
1180	--$self->{cursor} if $self->{cursor};	1516	--$self->{cursor} if $self->{cursor};
1181	} elsif ($sym == SDLK_RIGHT) {	1517	} elsif ($sym == CFClient::SDLK_RIGHT) {
1182	++$self->{cursor} if $self->{cursor} < length $self->{text};	1518	++$self->{cursor} if $self->{cursor} < length $self->{text};
1183	} elsif ($sym == SDLK_HOME) {	1519	} elsif ($sym == CFClient::SDLK_HOME) {
1184	$self->{cursor} = 0;	1520	$self->{cursor} = 0;
1185	} elsif ($sym == SDLK_END) {	1521	} elsif ($sym == CFClient::SDLK_END) {
1186	$self->{cursor} = length $text;	1522	$self->{cursor} = length $text;
1187	} elsif ($sym == SDLK_ESCAPE) {	1523	} elsif ($sym == 27) {
1188	$self->emit ('escape');	1524	$self->emit ('escape');
1189	} elsif ($uni) {	1525	} elsif ($uni) {
1190	substr $text, $self->{cursor}++, 0, chr $uni;	1526	substr $text, $self->{cursor}++, 0, chr $uni;
1191	}	1527	}
1192		1528
…		…
1267		1603
1268	package CFClient::UI::Entry;	1604	package CFClient::UI::Entry;
1269		1605
1270	our @ISA = CFClient::UI::EntryBase::;	1606	our @ISA = CFClient::UI::EntryBase::;
1271		1607
1272	use SDL;	1608	use CFClient::OpenGL;
1273	use SDL::OpenGL;
1274		1609
1275	sub key_down {	1610	sub key_down {
1276	my ($self, $ev) = @_;	1611	my ($self, $ev) = @_;
1277		1612
1278	my $sym = $ev->key_sym;	1613	my $sym = $ev->{sym};
1279		1614
1280	if ($sym == SDLK_RETURN) {	1615	if ($sym == 13) {
		1616	unshift @{$self->{history}},
		1617	my $txt = $self->get_text;
		1618	$self->{history_pointer} = -1;
		1619	$self->{history_saveback} = '';
1281	$self->emit (activate => $self->get_text);	1620	$self->emit (activate => $txt);
1282	$self->update;	1621	$self->update;
		1622
		1623	} elsif ($sym == CFClient::SDLK_UP) {
		1624	if ($self->{history_pointer} < 0) {
		1625	$self->{history_saveback} = $self->get_text;
		1626	}
		1627	if (@{$self->{history} || []} > 0) {
		1628	$self->{history_pointer}++;
		1629	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1630	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1631	}
		1632	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1633	}
		1634
		1635	} elsif ($sym == CFClient::SDLK_DOWN) {
		1636	$self->{history_pointer}--;
		1637	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1638
		1639	if ($self->{history_pointer} >= 0) {
		1640	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1641	} else {
		1642	$self->set_text ($self->{history_saveback});
		1643	}
1283		1644
1284	} else {	1645	} else {
1285	$self->SUPER::key_down ($ev);	1646	$self->SUPER::key_down ($ev);
1286	}	1647	}
1287		1648
…		…
1291		1652
1292	package CFClient::UI::Button;	1653	package CFClient::UI::Button;
1293		1654
1294	our @ISA = CFClient::UI::Label::;	1655	our @ISA = CFClient::UI::Label::;
1295		1656
1296	use SDL;	1657	use CFClient::OpenGL;
1297	use SDL::OpenGL;
1298		1658
1299	my @tex =	1659	my @tex =
1300	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1660	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301	qw(b1_button_active.png);	1661	qw(b1_button_active.png);
1302		1662
1303	sub new {	1663	sub new {
1304	my $class = shift;	1664	my $class = shift;
1305		1665
1306	$class->SUPER::new (	1666	$class->SUPER::new (
1307	padding => 4,	1667	padding => 4,
1308	fg => [1, 1, 1],	1668	fg => [1, 1, 1],
1309	bg => [1, 1, 1, 0.2],	1669	bg => [1, 1, 1, 0.2],
1310	active_fg => [0, 0, 1],	1670	active_fg => [0, 0, 1],
1311	can_hover => 1,	1671	can_hover => 1,
1312	align => 0,	1672	align => 0,
1313	valign => 0,	1673	valign => 0,
		1674	can_events => 1,
1314	@_	1675	@_
1315	)	1676	)
1316	}	1677	}
1317		1678
1318	sub button_up {	1679	sub button_up {
…		…
1352	package CFClient::UI::CheckBox;	1713	package CFClient::UI::CheckBox;
1353		1714
1354	our @ISA = CFClient::UI::DrawBG::;	1715	our @ISA = CFClient::UI::DrawBG::;
1355		1716
1356	my @tex =	1717	my @tex =
1357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1718	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1719	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359		1720
1360	use SDL;	1721	use CFClient::OpenGL;
1361	use SDL::OpenGL;
1362		1722
1363	sub new {	1723	sub new {
1364	my $class = shift;	1724	my $class = shift;
1365		1725
1366	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1412	glDisable GL_BLEND;	1772	glDisable GL_BLEND;
1413	}	1773	}
1414		1774
1415	#############################################################################	1775	#############################################################################
1416		1776
1417	package CFClient::UI::VGauge;	1777	package CFClient::UI::Image;
1418		1778
1419	our @ISA = CFClient::UI::Base::;	1779	our @ISA = CFClient::UI::Base::;
1420		1780
1421	use SDL::OpenGL;	1781	use CFClient::OpenGL;
		1782	use Carp qw/confess/;
1422		1783
1423	my %tex = (	1784	our %loaded_images;
1424	food => [
1425	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427	],
1428	grace => [
1429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431	],
1432	hp => [
1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435	],
1436	mana => [
1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439	],
1440	);
1441		1785
1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
1443	sub new {	1786	sub new {
1444	my $class = shift;	1787	my $class = shift;
1445		1788
1446	my $self = $class->SUPER::new (gauge => 'food', @_);	1789	my $self = $class->SUPER::new (can_events => 0, @_);
		1790
		1791	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1792
		1793	$loaded_images{$self->{image}} ||=
		1794	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1795
		1796	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1797
		1798	Scalar::Util::weaken $loaded_images{$self->{image}};
		1799
		1800	$self->{aspect} = $tex->{w} / $tex->{h};
1447		1801
1448	$self	1802	$self
1449	}	1803	}
1450		1804
1451	sub size_request {	1805	sub size_request {
1452	my ($self) = @_;	1806	my ($self) = @_;
1453		1807
1454	my $tex = $tex{$self->{gauge}}[0];	1808	($self->{tex}->{w}, $self->{tex}->{h})
1455
1456	@$tex{qw(w h)}
1457	}
1458
1459	sub set_max {
1460	my ($self, $max) = @_;
1461
1462	$self->{max_val} = $max;
1463	}
1464
1465	sub set_value {
1466	my ($self, $val, $max) = @_;
1467
1468	$self->set_max ($max)
1469	if defined $max;
1470
1471	$max = $self->{max_val};
1472	$self->{val} = $val;
1473
1474	$self->update;
1475	}	1809	}
1476		1810
1477	sub _draw {	1811	sub _draw {
1478	my ($self) = @_;	1812	my ($self) = @_;
1479		1813
1480	my $tex = $tex{$self->{gauge}};	1814	my $tex = $self->{tex};
1481		1815
1482	my ($w, $h) = ($self->{w}, $self->{h});	1816	my ($w, $h) = ($self->{w}, $self->{h});
1483		1817
1484	my $ycut = $self->{val} / ($self->{max_val} || 1);	1818	if ($self->{rot90}) {
1485	$ycut = 1 if $self->{val} > $self->{max_val};	1819	glRotate 90, 0, 0, 1;
		1820	glTranslate 0, -$self->{w}, 0;
1486		1821
1487	my $t1 = $tex->[0];	1822	($w, $h) = ($h, $w);
1488	my $t2 = $tex->[1];	1823	}
1489		1824
1490	glEnable GL_BLEND;	1825	glEnable GL_BLEND;
1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492	glEnable GL_TEXTURE_2D;	1827	glEnable GL_TEXTURE_2D;
1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494		1829
		1830	$tex->draw_quad (0, 0, $w, $h);
		1831
		1832	glDisable GL_BLEND;
		1833	glDisable GL_TEXTURE_2D;
		1834	}
		1835
		1836	#############################################################################
		1837
		1838	package CFClient::UI::VGauge;
		1839
		1840	our @ISA = CFClient::UI::Base::;
		1841
		1842	use List::Util qw(min max);
		1843
		1844	use CFClient::OpenGL;
		1845
		1846	my %tex = (
		1847	food => [
		1848	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1849	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1850	],
		1851	grace => [
		1852	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1853	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1854	],
		1855	hp => [
		1856	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1857	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1858	],
		1859	mana => [
		1860	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1861	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1862	],
		1863	);
		1864
		1865	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1866	sub new {
		1867	my $class = shift;
		1868
		1869	my $self = $class->SUPER::new (
		1870	type => 'food',
		1871	@_
		1872	);
		1873
		1874	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1875
		1876	$self
		1877	}
		1878
		1879	sub size_request {
		1880	my ($self) = @_;
		1881
		1882	#my $tex = $tex{$self->{type}}[0];
		1883	#@$tex{qw(w h)}
		1884	(0, 0)
		1885	}
		1886
		1887	sub set_max {
		1888	my ($self, $max) = @_;
		1889
		1890	return if $self->{max_val} == $max;
		1891
		1892	$self->{max_val} = $max;
		1893	$self->update;
		1894	}
		1895
		1896	sub set_value {
		1897	my ($self, $val, $max) = @_;
		1898
		1899	$self->set_max ($max)
		1900	if defined $max;
		1901
		1902	return if $self->{val} == $val;
		1903
		1904	$self->{val} = $val;
		1905	$self->update;
		1906	}
		1907
		1908	sub _draw {
		1909	my ($self) = @_;
		1910
		1911	my $tex = $tex{$self->{type}};
		1912	my ($t1, $t2, $t3) = @$tex;
		1913
		1914	my ($w, $h) = ($self->{w}, $self->{h});
		1915
		1916	if ($self->{vertical}) {
		1917	glRotate 90, 0, 0, 1;
		1918	glTranslate 0, -$self->{w}, 0;
		1919
		1920	($w, $h) = ($h, $w);
		1921	}
		1922
		1923	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1924
		1925	my $ycut1 = max 0, min 1, $ycut;
		1926	my $ycut2 = max 0, min 1, $ycut - 1;
		1927
1495	my $h1 = $self->{h} - $ycut * $self->{h};	1928	my $h1 = $self->{h} * (1 - $ycut1);
1496	my $h2 = $ycut * $self->{h};	1929	my $h2 = $self->{h} * (1 - $ycut2);
1497		1930
1498	my $yp = 0;	1931	glEnable GL_BLEND;
		1932	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1933	glEnable GL_TEXTURE_2D;
		1934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499		1935
1500	glBindTexture GL_TEXTURE_2D, $t1->{name};	1936	glBindTexture GL_TEXTURE_2D, $t1->{name};
1501	glBegin GL_QUADS;	1937	glBegin GL_QUADS;
1502	glTexCoord 0 , 0; glVertex 0 , $yp;	1938	glTexCoord 0 , 0; glVertex 0 , 0;
1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1939	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1940	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1941	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506	glEnd;	1942	glEnd;
1507		1943
1508	$yp += $h1;	1944	my $ycut1 = List::Util::min 1, $ycut;
1509
1510	glBindTexture GL_TEXTURE_2D, $t2->{name};	1945	glBindTexture GL_TEXTURE_2D, $t2->{name};
1511	glBegin GL_QUADS;	1946	glBegin GL_QUADS;
1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1947	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1948	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;	1949	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1950	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516	glEnd;	1951	glEnd;
		1952
		1953	if ($t3) {
		1954	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1955	glBegin GL_QUADS;
		1956	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1957	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1958	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1959	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1960	glEnd;
		1961	}
1517		1962
1518	glDisable GL_BLEND;	1963	glDisable GL_BLEND;
1519	glDisable GL_TEXTURE_2D;	1964	glDisable GL_TEXTURE_2D;
1520	}	1965	}
1521		1966
1522	#############################################################################	1967	#############################################################################
1523		1968
		1969	package CFClient::UI::Gauge;
		1970
		1971	our @ISA = CFClient::UI::VBox::;
		1972
		1973	sub new {
		1974	my ($class, %arg) = @_;
		1975
		1976	my $self = $class->SUPER::new (
		1977	tooltip => $arg{type},
		1978	can_hover => 1,
		1979	can_events => 1,
		1980	%arg,
		1981	);
		1982
		1983	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1984	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1985	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1986
		1987	$self
		1988	}
		1989
		1990	sub set_fontsize {
		1991	my ($self, $fsize) = @_;
		1992
		1993	$self->{value}->set_fontsize ($fsize);
		1994	$self->{max} ->set_fontsize ($fsize);
		1995	}
		1996
		1997	sub set_max {
		1998	my ($self, $max) = @_;
		1999
		2000	$self->{gauge}->set_max ($max);
		2001	$self->{max}->set_text ($max);
		2002	}
		2003
		2004	sub set_value {
		2005	my ($self, $val, $max) = @_;
		2006
		2007	$self->set_max ($max)
		2008	if defined $max;
		2009
		2010	$self->{gauge}->set_value ($val, $max);
		2011	$self->{value}->set_text ($val);
		2012	}
		2013
		2014	#############################################################################
		2015
1524	package CFClient::UI::Slider;	2016	package CFClient::UI::Slider;
1525		2017
1526	use strict;	2018	use strict;
1527		2019
1528	use SDL::OpenGL;	2020	use CFClient::OpenGL;
1529		2021
1530	our @ISA = CFClient::UI::DrawBG::;	2022	our @ISA = CFClient::UI::DrawBG::;
1531		2023
1532	my @tex =	2024	my @tex =
1533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1543	# TODO: calculations are off	2035	# TODO: calculations are off
1544	my $self = $class->SUPER::new (	2036	my $self = $class->SUPER::new (
1545	fg => [1, 1, 1],	2037	fg => [1, 1, 1],
1546	active_fg => [0, 0, 0],	2038	active_fg => [0, 0, 0],
1547	range => [0, 0, 100, 10],	2039	range => [0, 0, 100, 10],
1548	req_w => 40,	2040	req_w => $::WIDTH / 80,
1549	req_h => 13,	2041	req_h => $::WIDTH / 80,
1550	vertical => 0,	2042	vertical => 0,
1551	can_hover => 1,	2043	can_hover => 1,
1552	inner_pad => 5,	2044	inner_pad => 5,
1553	@_	2045	@_
1554	);	2046	);
…		…
1658		2150
1659	package CFClient::UI::TextView;	2151	package CFClient::UI::TextView;
1660		2152
1661	our @ISA = CFClient::UI::HBox::;	2153	our @ISA = CFClient::UI::HBox::;
1662		2154
1663	use SDL::OpenGL;	2155	use CFClient::OpenGL;
1664		2156
1665	sub new {	2157	sub new {
1666	my $class = shift;	2158	my $class = shift;
1667		2159
1668	my $self = $class->SUPER::new (	2160	my $self = $class->SUPER::new (
1669	req_w => $::WIDTH / 6,	2161	fontsize => 1,
1670	req_h => $::HEIGHT / 6,	2162	can_events => 0,
1671	fontsize => $::FONTSIZE,	2163	#font => default_font
1672	@_,	2164	@_,
1673		2165
1674	layout => (new CFClient::Layout),	2166	layout => (new CFClient::Layout),
1675	par => [],	2167	par => [],
1676	height => 0,	2168	height => 0,
1677	children => [	2169	children => [
1678	(new CFClient::UI::Empty expand => 1),	2170	(new CFClient::UI::Empty expand => 1),
1679	(new CFClient::UI::Slider vertical => 1),	2171	(new CFClient::UI::Slider vertical => 1),
1680	],	2172	],
1681	);	2173	);
1682		2174
1683	$self->{children}[1]->connect (changed => sub {	2175	$self->{children}[1]->connect (changed => sub { $self->update });
1684	$self->update;
1685	});
1686		2176
1687	$self	2177	$self
1688	}	2178	}
1689		2179
1690	sub set_fontsize {	2180	sub set_fontsize {
…		…
1697	sub text_height {	2187	sub text_height {
1698	my ($self, $text) = @_;	2188	my ($self, $text) = @_;
1699		2189
1700	my $layout = $self->{layout};	2190	my $layout = $self->{layout};
1701		2191
1702	$layout->set_height ($self->{fontsize});	2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703	$layout->set_width ($self->{w});	2193	$layout->set_width ($self->{children}[0]{w});
1704	$layout->set_text ($text);	2194	$layout->set_text ($text);
1705		2195
1706	($layout->size)[1]	2196	($layout->size)[1]
1707	}	2197	}
1708		2198
…		…
1711		2201
1712	$self->{need_reflow}++;	2202	$self->{need_reflow}++;
1713	$self->update;	2203	$self->update;
1714	}	2204	}
1715		2205
1716	sub size_request {
1717	my ($self) = @_;
1718
1719	($self->{req_w}, $self->{req_h})
1720	}
1721
1722	sub size_allocate {	2206	sub size_allocate {
1723	my ($self, $w, $h) = @_;	2207	my ($self, $w, $h) = @_;
1724		2208
		2209	$self->SUPER::size_allocate ($w, $h);
		2210
		2211	$self->{layout}->set_font ($self->{font}) if $self->{font};
1725	$self->{layout}->set_height ($self->{fontsize});	2212	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726	$self->{layout}->set_width ($self->{w});	2213	$self->{layout}->set_width ($self->{children}[0]{w});
1727		2214
1728	$self->reflow;	2215	$self->reflow;
1729	$self->update;
1730	}	2216	}
1731		2217
1732	sub add_paragraph {	2218	sub add_paragraph {
1733	my ($self, $color, $text) = @_;	2219	my ($self, $color, $text) = @_;
1734		2220
…		…
1765	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766		2252
1767	delete $self->{texture};	2253	delete $self->{texture};
1768	}	2254	}
1769		2255
1770	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1771	glClearColor 0, 0, 0, 1;	2257	glClearColor 0, 0, 0, 0;
1772	glClear GL_COLOR_BUFFER_BIT;	2258	glClear GL_COLOR_BUFFER_BIT;
1773		2259
1774	glEnable GL_BLEND;	2260	glEnable GL_BLEND;
1775	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776	glEnable GL_TEXTURE_2D;	2262	glEnable GL_TEXTURE_2D;
…		…
1783		2269
1784	my $y = 0;	2270	my $y = 0;
1785		2271
1786	my $layout = $self->{layout};	2272	my $layout = $self->{layout};
1787		2273
		2274	$layout->set_font ($self->{font}) if $self->{font};
		2275
1788	for my $par (@{$self->{par}}) {	2276	for my $par (@{$self->{par}}) {
1789	my $h = $par->[0];	2277	my $h = $par->[0];
1790		2278
1791	if ($y0 < $y + $h && $y < $y1) {	2279	if ($y0 < $y + $h && $y < $y1) {
1792	$layout->set_text ($par->[2]);	2280	$layout->set_text ($par->[2]);
…		…
1806	}	2294	}
1807		2295
1808	sub _draw {	2296	sub _draw {
1809	my ($self) = @_;	2297	my ($self) = @_;
1810		2298
1811	if ($self->{texture}) {	2299	glEnable GL_BLEND;
		2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1812	glEnable GL_TEXTURE_2D;	2301	glEnable GL_TEXTURE_2D;
1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2303	glColor 1, 1, 1, 1;
1814	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1815	glDisable GL_TEXTURE_2D;	2305	glDisable GL_TEXTURE_2D;
1816	}	2306	glDisable GL_BLEND;
1817		2307
1818	$self->{children}[1]->draw;	2308	$self->{children}[1]->draw;
1819		2309
1820	}	2310	}
1821		2311
1822	#############################################################################	2312	#############################################################################
1823		2313
1824	package CFClient::UI::MapWidget;
1825
1826	use strict;
1827
1828	use List::Util qw(min max);
1829
1830	use SDL;
1831	use SDL::OpenGL;
1832
1833	our @ISA = CFClient::UI::Base::;
1834
1835	sub new {
1836	my $class = shift;
1837
1838	$class->SUPER::new (
1839	z => -1,
1840	can_focus => 1,
1841	list => (glGenLists 1),
1842	@_
1843	)
1844	}
1845
1846	sub key_down {
1847	print "MAPKEYDOWN\n";
1848	}
1849
1850	sub key_up {
1851	}
1852
1853	sub button_down {
1854	my ($self, $ev, $x, $y) = @_;
1855
1856	$self->focus_in;
1857
1858	if ($ev->button == 2) {
1859	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862	$self->{motion} = sub {
1863	my ($ev, $x, $y) = @_;
1864
1865	($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867	$::CFG->{map_shift_x} = $bw + $x - $ox;
1868	$::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870	$self->update;
1871	};
1872	}
1873	}
1874
1875	sub button_up {
1876	my ($self, $ev, $x, $y) = @_;
1877
1878	delete $self->{motion};
1879	}
1880
1881	sub mouse_motion {
1882	my ($self, $ev, $x, $y) = @_;
1883
1884	$self->{motion}->($ev, $x, $y) if $self->{motion};
1885	}
1886
1887	sub size_request {
1888	(
1889	1 + 32 * int $::WIDTH / 32,
1890	1 + 32 * int $::HEIGHT / 32,
1891	)
1892	}
1893
1894	sub update {
1895	my ($self) = @_;
1896
1897	$self->{need_update} = 1;
1898	$self->SUPER::update;
1899	}
1900
1901	sub draw {
1902	my ($self) = @_;
1903
1904	if (delete $self->{need_update}) {
1905	glNewList $self->{list}, GL_COMPILE;
1906
1907	if ($::MAP) {
1908	my $sw = int $::WIDTH / 32;
1909	my $sh = int $::HEIGHT / 32;
1910
1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918	if ($::CFG->{fow_enable}) {
1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921	glConvolutionFilter2D (
1922	GL_CONVOLUTION_2D,
1923	GL_ALPHA,
1924	3, 3,
1925	GL_ALPHA, GL_FLOAT,
1926	pack "f*",
1927	0.1, 0.1, 0.1,
1928	0.1, 0.2, 0.1,
1929	0.1, 0.1, 0.1,
1930	);
1931	glEnable GL_CONVOLUTION_2D;
1932	}
1933
1934	$self->{fow_texture} = new CFClient::Texture
1935	w => $w,
1936	h => $h,
1937	data => $data,
1938	internalformat => GL_ALPHA,
1939	format => GL_ALPHA;
1940
1941	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943	glEnable GL_BLEND;
1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945	glEnable GL_TEXTURE_2D;
1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951	glDisable GL_TEXTURE_2D;
1952	glDisable GL_BLEND;
1953	}
1954
1955	# HACK BEGIN
1956	{
1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958	my ($w, $h) = (250, 250);
1959
1960	glEnable GL_BLEND;
1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965	$self->{mapmap_texture} =
1966	new CFClient::Texture
1967	w => $w,
1968	h => $h,
1969	data => $::MAP->mapmap ($w, $h),
1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972	$self->{mapmap_texture}->draw_quad (100, 100);
1973
1974	glDisable GL_TEXTURE_2D;
1975	glDisable GL_BLEND;
1976	}
1977	# HACK END
1978	}
1979
1980	glEndList;
1981	}
1982
1983	glPushMatrix;
1984	glCallList $self->{list};
1985	glPopMatrix;
1986
1987	if ($FOCUS != $self) {
1988	glColor 64/255, 64/255, 64/255;
1989	glLogicOp GL_AND;
1990	glEnable GL_COLOR_LOGIC_OP;
1991	glBegin GL_QUADS;
1992	glVertex 0, 0;
1993	glVertex 0, $::HEIGHT;
1994	glVertex $::WIDTH, $::HEIGHT;
1995	glVertex $::WIDTH, 0;
1996	glEnd;
1997	glDisable GL_COLOR_LOGIC_OP;
1998	}
1999	}
2000
2001	my %DIR = (
2002	SDLK_KP8, [1, "north"],
2003	SDLK_KP9, [2, "northeast"],
2004	SDLK_KP6, [3, "east"],
2005	SDLK_KP3, [4, "southeast"],
2006	SDLK_KP2, [5, "south"],
2007	SDLK_KP1, [6, "southwest"],
2008	SDLK_KP4, [7, "west"],
2009	SDLK_KP7, [8, "northwest"],
2010
2011	SDLK_UP, [1, "north"],
2012	SDLK_RIGHT, [3, "east"],
2013	SDLK_DOWN, [5, "south"],
2014	SDLK_LEFT, [7, "west"],
2015	);
2016
2017	sub key_down {
2018	my ($self, $ev) = @_;
2019
2020	my $mod = $ev->key_mod;
2021	my $sym = $ev->key_sym;
2022
2023	if ($sym == SDLK_KP5) {
2024	$::CONN->user_send ("stay fire");
2025	} elsif ($sym == SDLK_a) {
2026	$::CONN->user_send ("apply");
2027	} elsif ($sym == SDLK_QUOTE) {
2028	$self->emit ('activate_console');
2029	} elsif ($sym == SDLK_SLASH) {
2030	$self->emit ('activate_console' => '/');
2031	} elsif (exists $DIR{$sym}) {
2032	if ($mod & KMOD_SHIFT) {
2033	$self->{shft}++;
2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
2035	} elsif ($mod & KMOD_CTRL) {
2036	$self->{ctrl}++;
2037	$::CONN->user_send ("run $DIR{$sym}[0]");
2038	} else {
2039	$::CONN->user_send ("$DIR{$sym}[1]");
2040	}
2041	}
2042	}
2043
2044	sub key_up {
2045	my ($self, $ev) = @_;
2046
2047	my $mod = $ev->key_mod;
2048	my $sym = $ev->key_sym;
2049
2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051	$::CONN->user_send ("fire_stop");
2052	}
2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054	$::CONN->user_send ("run_stop");
2055	}
2056	}
2057
2058	#############################################################################
2059
2060	package CFClient::UI::Animator;	2314	package CFClient::UI::Animator;
2061		2315
2062	use SDL::OpenGL;	2316	use CFClient::OpenGL;
2063		2317
2064	our @ISA = CFClient::UI::Bin::;	2318	our @ISA = CFClient::UI::Bin::;
2065		2319
2066	sub moveto {	2320	sub moveto {
2067	my ($self, $x, $y) = @_;	2321	my ($self, $x, $y) = @_;
…		…
2105		2359
2106	sub new {	2360	sub new {
2107	my $class = shift;	2361	my $class = shift;
2108		2362
2109	my $self = $class->SUPER::new (	2363	my $self = $class->SUPER::new (
2110	state => 0,	2364	state => 0,
2111	connect_activate => \&toggle_flopper,	2365	connect_activate => \&toggle_flopper,
2112	@_	2366	@_
2113	);	2367	);
2114		2368
2115	if ($self->{state}) {	2369	if ($self->{state}) {
…		…
2136	$self->emit (changed => $self->{state});	2390	$self->emit (changed => $self->{state});
2137	}	2391	}
2138		2392
2139	#############################################################################	2393	#############################################################################
2140		2394
		2395	package CFClient::UI::Tooltip;
		2396
		2397	our @ISA = CFClient::UI::Bin::;
		2398
		2399	use CFClient::OpenGL;
		2400
		2401	sub new {
		2402	my $class = shift;
		2403
		2404	$class->SUPER::new (
		2405	@_,
		2406	can_events => 0,
		2407	)
		2408	}
		2409
		2410	sub set_markup {
		2411	my ($self, $text) = @_;
		2412
		2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2414	$self->{label}->set_markup ($text);
		2415	$self->add ($self->{label});
		2416	}
		2417
		2418	sub size_request {
		2419	my ($self) = @_;
		2420
		2421	$self->child->set_max_size ($::WIDTH * 0.3);
		2422
		2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2424
		2425	($w + 4, $h + 4)
		2426	}
		2427
		2428	sub size_allocate {
		2429	my ($self, $w, $h) = @_;
		2430
		2431	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2432	}
		2433
		2434	sub _draw {
		2435	my ($self) = @_;
		2436
		2437	glPushMatrix;
		2438	glTranslate 0.375, 0.375;
		2439
		2440	my ($w, $h) = @$self{qw(w h)};
		2441
		2442	glColor 1, 0.8, 0.4;
		2443	glBegin GL_QUADS;
		2444	glVertex 0 , 0;
		2445	glVertex 0 , $h;
		2446	glVertex $w, $h;
		2447	glVertex $w, 0;
		2448	glEnd;
		2449
		2450	glColor 0, 0, 0;
		2451	glBegin GL_LINE_LOOP;
		2452	glVertex 0 , 0;
		2453	glVertex 0 , $h;
		2454	glVertex $w, $h;
		2455	glVertex $w, 0;
		2456	glEnd;
		2457
		2458	glPopMatrix;
		2459
		2460	glTranslate 2, 2;
		2461	$self->SUPER::_draw;
		2462	}
		2463
		2464	#############################################################################
		2465
		2466	package CFClient::UI::Face;
		2467
		2468	our @ISA = CFClient::UI::Base::;
		2469
		2470	use CFClient::OpenGL;
		2471
		2472	sub new {
		2473	my $class = shift;
		2474
		2475	$class->SUPER::new (
		2476	aspect => 1,
		2477	@_,
		2478	)
		2479	}
		2480
		2481	sub size_request {
		2482	(32, 8)
		2483	}
		2484
		2485	sub _draw {
		2486	my ($self) = @_;
		2487
		2488	return unless $::CONN;#d# manage and cache textures differently
		2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2490
		2491	# TODO animation
		2492	if ($tex) {
		2493	glEnable GL_BLEND;
		2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2495	glEnable GL_TEXTURE_2D;
		2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2497	glColor 1, 1, 1, 1;
		2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2499	glDisable GL_TEXTURE_2D;
		2500	glDisable GL_BLEND;
		2501	}
		2502	}
		2503
		2504	#############################################################################
		2505
		2506	package CFClient::UI::InventoryItem;
		2507
		2508	our @ISA = CFClient::UI::HBox::;
		2509
		2510	sub new {
		2511	my $class = shift;
		2512
		2513	my %args = @_;
		2514
		2515	my $item = $args{item};
		2516
		2517	my $desc = $item->{nrof} < 2
		2518	? $item->{name}
		2519	: "$item->{nrof} $item->{name_pl}";
		2520
		2521
		2522	my $self = $class->SUPER::new (
		2523	can_hover => 1,
		2524	can_events => 1,
		2525	tooltip => (CFClient::UI::Label->escape ($desc)
		2526	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2527	connect_button_down => sub {
		2528	my ($self, $ev, $x, $y) = @_;
		2529
		2530	# todo: maybe put examine on 1? but should just be a tooltip :(
		2531	if ($ev->{button} == 1) {
		2532	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2533	} elsif ($ev->{button} == 2) {
		2534	$::CONN->send ("apply $item->{tag}");
		2535	} elsif ($ev->{button} == 3) {
		2536	CFClient::UI::Menu->new (
		2537	items => [
		2538	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2539	[
		2540	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2541	sub { $::CONN->send ("lock $item->{tag}") },
		2542	],
		2543	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2544	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2545	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2546	],
		2547	)->popup ($ev);
		2548	}
		2549
		2550	1
		2551	},
		2552	%args
		2553	);
		2554	$self->add(new CFClient::UI::Face
		2555	can_events => 0,
		2556	face => $item->{face},
		2557	anim => $item->{anim},
		2558	animspeed => $item->{animspeed});
		2559	$self->add(new CFClient::UI::Label
		2560	can_events => 0,
		2561	text => $desc);
		2562
		2563	$self
		2564	}
		2565
		2566	#############################################################################
		2567
		2568	package CFClient::UI::Inventory;
		2569
		2570	our @ISA = CFClient::UI::ScrolledWindow::;
		2571
		2572	sub new {
		2573	my $class = shift;
		2574
		2575	my $self = $class->SUPER::new (
		2576	scrolled => (new CFClient::UI::VBox),
		2577	@_,
		2578	);
		2579
		2580	$self
		2581	}
		2582
		2583	sub set_items {
		2584	my ($self, $items) = @_;
		2585
		2586	$self->{scrolled}->clear;
		2587	return unless $items;
		2588
		2589	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2590
		2591	$self->{real_items} = \@items;
		2592
		2593	for my $item (@items) {
		2594	my $desc = $item->{nrof} < 2
		2595	? $item->{name}
		2596	: "$item->{nrof} $item->{name_pl}";
		2597
		2598	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2599	}
		2600
		2601	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2602	}
		2603
		2604	sub size_request {
		2605	my ($self) = @_;
		2606	($self->{req_w}, $self->{req_h});
		2607	}
		2608
		2609	#############################################################################
		2610
		2611	package CFClient::UI::Menu;
		2612
		2613	our @ISA = CFClient::UI::FancyFrame::;
		2614
		2615	use CFClient::OpenGL;
		2616
		2617	sub new {
		2618	my $class = shift;
		2619
		2620	my $self = $class->SUPER::new (
		2621	items => [],
		2622	z => 100,
		2623	@_,
		2624	);
		2625
		2626	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2627
		2628	for my $item (@{ $self->{items} }) {
		2629	my ($widget, $cb) = @$item;
		2630
		2631	# handle various types of items, only text for now
		2632	if (!ref $widget) {
		2633	$widget = new CFClient::UI::Label
		2634	can_hover => 1,
		2635	can_events => 1,
		2636	text => $widget;
		2637	}
		2638
		2639	$self->{item}{$widget} = $item;
		2640
		2641	$self->{vbox}->add ($widget);
		2642	}
		2643
		2644	$self
		2645	}
		2646
		2647	# popup given the event (must be a mouse button down event currently)
		2648	sub popup {
		2649	my ($self, $ev) = @_;
		2650
		2651	$self->emit ("popdown");
		2652
		2653	# maybe save $GRAB? must be careful about events...
		2654	$GRAB = $self;
		2655	$self->{button} = $ev->{button};
		2656
		2657	$self->show;
		2658	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2659	}
		2660
		2661	sub mouse_motion {
		2662	my ($self, $ev, $x, $y) = @_;
		2663
		2664	# TODO: should use vbox->find_widget or so
		2665	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2666	$self->{hover} = $self->{item}{$HOVER};
		2667	}
		2668
		2669	sub button_up {
		2670	my ($self, $ev, $x, $y) = @_;
		2671
		2672	if ($ev->{button} == $self->{button}) {
		2673	undef $GRAB;
		2674	$self->hide;
		2675
		2676	$self->emit ("popdown");
		2677	$self->{hover}[1]->() if $self->{hover};
		2678	}
		2679	}
		2680
		2681	#############################################################################
		2682
2141	package CFClient::UI::Root;	2683	package CFClient::UI::Root;
2142		2684
2143	our @ISA = CFClient::UI::Container::;	2685	our @ISA = CFClient::UI::Container::;
2144		2686
2145	use SDL::OpenGL;	2687	use CFClient::OpenGL;
2146		2688
2147	sub check_size {	2689	sub check_size {
2148	my ($self) = @_;	2690	my ($self) = @_;
2149		2691
2150	$self->configure (0, 0, $::WITH, $::HEIGHT);	2692	$self->configure (0, 0, $self->{w}, $self->{h});
2151	}	2693	}
2152		2694
2153	sub size_request {	2695	sub size_request {
2154	($::WIDTH, $::HEIGHT)	2696	my ($self) = @_;
		2697
		2698	($self->{w}, $self->{h})
		2699	}
		2700
		2701	sub size_allocate {
		2702	my ($self, $w, $h) = @_;
		2703
		2704	my $old_w = $self->{old_w};
		2705	my $old_h = $self->{old_h};
		2706
		2707	if ($old_w && $old_h) {
		2708	for my $child ($self->children) {
		2709	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2710	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2711	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2712	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2713	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2714	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2715	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2716	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2717	}
		2718	}
		2719
		2720	$self->{old_w} = $w;
		2721	$self->{old_h} = $h;
2155	}	2722	}
2156		2723
2157	sub configure {	2724	sub configure {
2158	my ($self, $x, $y, $w, $h) = @_;	2725	my ($self, $x, $y, $w, $h) = @_;
2159		2726
2160	$self->SUPER::configure ($x, $y, $w, $h);	2727	$self->SUPER::configure ($x, $y, $w, $h);
2161		2728
2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)	2729	for my $child ($self->children) {
2163	for @{$self->{children}};	2730	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2731
		2732	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2733	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2734	$child->configure ($X, $Y, $W, $H);
		2735	}
2164	}	2736	}
2165		2737
2166	sub _topleft {	2738	sub _topleft {
2167	my ($self, $x, $y) = @_;	2739	my ($self, $x, $y) = @_;
2168		2740
…		…
2176	::refresh ();	2748	::refresh ();
2177	}	2749	}
2178		2750
2179	sub add {	2751	sub add {
2180	my ($self, $child) = @_;	2752	my ($self, $child) = @_;
		2753
		2754	# integerize window positions
		2755	$child->{x} = int $child->{x};
		2756	$child->{y} = int $child->{y};
2181		2757
2182	$self->SUPER::add ($child);	2758	$self->SUPER::add ($child);
2183	}	2759	}
2184		2760
2185	sub on_refresh {	2761	sub on_refresh {
…		…
2211	#############################################################################	2787	#############################################################################
2212		2788
2213	package CFClient::UI;	2789	package CFClient::UI;
2214		2790
2215	$ROOT = new CFClient::UI::Root;	2791	$ROOT = new CFClient::UI::Root;
		2792	$TOOLTIP = new CFClient::UI::Tooltip;
2216		2793
2217	1	2794	1
2218		2795

Diff Legend

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