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

Diff Legend

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