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.189 by root, Mon May 8 22:17:24 2006 UTC

…		…
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (length $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_markup ($widget->{tooltip});
		29
		30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	}
14		49
15	# class methods for events	50	# class methods for events
16	sub feed_sdl_key_down_event {	51	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		53	if $FOCUS;
18	}	54	}
19		55
20	sub feed_sdl_key_up_event {	56	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		58	if $FOCUS;
22	}	59	}
23		60
24	sub feed_sdl_button_down_event {	61	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	62	my ($ev) = @_;
26	my ($x, $y) = ($ev->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->_check_size;
		409	return;
		410	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
270		411
		412	$check_size->{$self} = $self;
		413
		414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
		415	while (%$check_size) {
		416	my @widgets = values %$check_size;
		417	$_->_check_size
		418	for @widgets;
		419	}
		420	});
		421	}
		422
		423	sub _check_size {
		424	my ($self) = @_;
		425
		426	delete $CFClient::UI::ROOT->{_check_size}{$self};
		427
		428	$self->{parent}
		429	or return 1;
		430
		431	my ($w, $h) = $self->{user_w} && $self->{user_h}
		432	? @$self{qw(user_w user_h)}
		433	: $self->size_request;
		434
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {	435	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;	436	$self->{req_w} = $w;
273	$self->{req_h} = $h;	437	$self->{req_h} = $h;
274		438
275	$self->{parent}->check_size	439	$self->{parent}->_check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);	440	or $self->size_allocate (
279	$self->update;	441	(List::Util::max $self->{w}, $w),
		442	(List::Util::max $self->{h}, $h),
		443	);
		444
		445	1
		446	} else {
		447	0
280	}	448	}
281	}	449	}
282		450
283	sub update {	451	sub update {
284	my ($self) = @_;	452	my ($self) = @_;
285		453
286	$self->{parent}->update	454	my $update = $CFClient::UI::ROOT->{_update} ||= {};
287	if $self->{parent};	455
		456	$update->{$self} = $self;
		457
		458	$CFClient::UI::ROOT->on_refresh (_update => sub {
		459	while (%$update) {
		460	my @widgets = values %$update;
		461	%$update = ();
		462
		463	$_->{parent} && $_->{parent}->update
		464	for @widgets;
		465	}
		466	});
288	}	467	}
289		468
290	sub connect {	469	sub connect {
291	my ($self, $signal, $cb) = @_;	470	my ($self, $signal, $cb) = @_;
292		471
293	push @{ $self->{cb}{$signal} }, $cb;	472	push @{ $self->{signal_cb}{$signal} }, $cb;
294	}	473	}
295		474
296	sub emit {	475	sub emit {
297	my ($self, $signal, @args) = @_;	476	my ($self, $signal, @args) = @_;
298		477
299	$_->($self, @args)	478	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300	for @{$self->{cb}{$signal} || []};
301	}	479	}
302		480
303	sub DESTROY {	481	sub DESTROY {
304	my ($self) = @_;	482	my ($self) = @_;
305		483
…		…
311	package CFClient::UI::DrawBG;	489	package CFClient::UI::DrawBG;
312		490
313	our @ISA = CFClient::UI::Base::;	491	our @ISA = CFClient::UI::Base::;
314		492
315	use strict;	493	use strict;
316	use SDL::OpenGL;	494	use CFClient::OpenGL;
317		495
318	sub new {	496	sub new {
319	my $class = shift;	497	my $class = shift;
320		498
321	# range [value, low, high, page]	499	# range [value, low, high, page]
…		…
350		528
351	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
352		530
353	our @ISA = CFClient::UI::Base::;	531	our @ISA = CFClient::UI::Base::;
354		532
		533	sub new {
		534	my ($class, %arg) = @_;
		535	$class->SUPER::new (can_events => 0, %arg);
		536	}
		537
355	sub size_request {	538	sub size_request {
356	(0, 0)	539	(0, 0)
357	}	540	}
358		541
359	sub draw { }	542	sub draw { }
…		…
367	sub new {	550	sub new {
368	my ($class, %arg) = @_;	551	my ($class, %arg) = @_;
369		552
370	my $children = delete $arg{children} || [];	553	my $children = delete $arg{children} || [];
371		554
372	my $self = $class->SUPER::new (children => [], %arg);	555	my $self = $class->SUPER::new (
		556	children => [],
		557	can_events => 0,
		558	%arg,
		559	);
373	$self->add ($_) for @$children;	560	$self->add ($_) for @$children;
374		561
375	$self	562	$self
376	}	563	}
377		564
378	sub add {	565	sub add {
379	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
380		567
381	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
382		570
383	use sort 'stable';	571	use sort 'stable';
384		572
385	$self->{children} = [	573	$self->{children} = [
386	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
387	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
388	];	576	];
389		577
390	$self->{w} = $self->{h} = -1;
391
392	$child->check_size;	578	$_->check_size
		579	for @widgets;
		580
		581	$self->update;
		582	}
		583
		584	sub children {
		585	@{ $_[0]{children} }
393	}	586	}
394		587
395	sub remove {	588	sub remove {
396	my ($self, $widget) = @_;	589	my ($self, $child) = @_;
397		590
		591	delete $child->{parent};
		592	$child->hide;
		593
398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	594	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399		595
400	$self->check_size;	596	$self->check_size;
		597	$self->update;
		598	}
		599
		600	sub clear {
		601	my ($self) = @_;
		602
		603	my $children = delete $self->{children};
		604	$self->{children} = [];
		605
		606	for (@$children) {
		607	delete $_->{parent};
		608	$_->hide;
		609	}
		610
		611	$self->check_size;
		612	$self->update;
401	}	613	}
402		614
403	sub find_widget {	615	sub find_widget {
404	my ($self, $x, $y) = @_;	616	my ($self, $x, $y) = @_;
405		617
…		…
435		647
436	$class->SUPER::new (children => [$child], %arg)	648	$class->SUPER::new (children => [$child], %arg)
437	}	649	}
438		650
439	sub add {	651	sub add {
440	my ($self, $widget) = @_;	652	my ($self, $child) = @_;
441		653
442	$self->{children} = [];	654	$self->{children} = [];
443		655
444	$self->SUPER::add ($widget);	656	$self->SUPER::add ($child);
445	}	657	}
446		658
447	sub remove {	659	sub remove {
448	my ($self, $widget) = @_;	660	my ($self, $widget) = @_;
449		661
…		…
469		681
470	package CFClient::UI::Window;	682	package CFClient::UI::Window;
471		683
472	our @ISA = CFClient::UI::Bin::;	684	our @ISA = CFClient::UI::Bin::;
473		685
474	use SDL::OpenGL;	686	use CFClient::OpenGL;
475		687
476	sub new {	688	sub new {
477	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
478		690
479	my $self = $class->SUPER::new (%arg);	691	my $self = $class->SUPER::new (%arg);
480	}	692	}
481		693
482	sub update {	694	sub update {
483	my ($self) = @_;	695	my ($self) = @_;
484		696
485	# we want to do this delayed...	697	$ROOT->on_refresh ($self => sub { $self->render_child });
486	$self->render_chld;
487	$self->SUPER::update;	698	$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	}	699	}
499		700
500	sub size_allocate {	701	sub size_allocate {
501	my ($self, $w, $h) = @_;	702	my ($self, $w, $h) = @_;
502		703
503	$self->child->configure (0, 0, $w, $h);	704	$self->SUPER::size_allocate ($w, $h);
		705	$self->update;
		706	}
504		707
		708	sub _render {
		709	$_[0]{children}[0]->draw;
		710	}
		711
		712	sub render_child {
		713	my ($self) = @_;
		714
		715	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		716	glClearColor 0, 0, 0, 0;
		717	glClear GL_COLOR_BUFFER_BIT;
		718
505	$self->render_chld;	719	$self->_render;
		720	# glColorMask 1, 1, 1, 0;
		721	# glEnable GL_BLEND;
		722	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		723	# glRasterPos 0, 0;
		724	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		725	# glDisable GL_BLEND;
		726	# glColorMask 1, 1, 1, 1;
		727	};
506	}	728	}
507		729
508	sub _draw {	730	sub _draw {
509	my ($self) = @_;	731	my ($self) = @_;
510		732
511	my ($w, $h) = ($self->w, $self->h);	733	my ($w, $h) = ($self->w, $self->h);
512		734
513	my $tex = $self->{texture}	735	my $tex = $self->{texture}
514	or return;	736	or return;
		737
		738	glEnable GL_BLEND;
		739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		740	glEnable GL_TEXTURE_2D;
		741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		742	glColor 0, 0, 0, 1;
		743
		744	$tex->draw_quad (0, 0, $w, $h);
		745
		746	glDisable GL_BLEND;
		747	glDisable GL_TEXTURE_2D;
		748	}
		749
		750	#############################################################################
		751
		752	package CFClient::UI::ViewPort;
		753
		754	our @ISA = CFClient::UI::Window::;
		755
		756	sub size_request {
		757	my ($self) = @_;
		758
		759	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		760	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
		761
		762	@$self{qw(child_w child_h)}
		763	}
		764
		765	sub size_allocate {
		766	my ($self, $w, $h) = @_;
		767
		768	$self->update;
		769	}
		770
		771	sub set_offset {
		772	my ($self, $x, $y) = @_;
		773
		774	$self->{view_x} = int $x;
		775	$self->{view_y} = int $y;
		776
		777	$self->update;
		778	}
		779
		780	# hmm, this does not work for topleft of $self... but we should not aks for that
		781	sub _topleft {
		782	my ($self, $x, $y) = @_;
		783
		784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
		785	}
		786
		787	sub find_widget {
		788	my ($self, $x, $y) = @_;
		789
		790	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		791	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		792	) {
		793	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		794	} else {
		795	$self->CFClient::UI::Base::find_widget ($x, $y)
		796	}
		797	}
		798
		799	sub _render {
		800	my ($self) = @_;
		801
		802	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		803
		804	$self->SUPER::_render;
		805	}
		806
		807	#############################################################################
		808
		809	package CFClient::UI::ScrolledWindow;
		810
		811	our @ISA = CFClient::UI::HBox::;
		812
		813	sub new {
		814	my $class = shift;
		815
		816	my $self;
		817
		818	my $slider = new CFClient::UI::Slider
		819	vertical => 1,
		820	range => [0, 0, 1, 0.01], # HACK fix
		821	connect_changed => sub {
		822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		823	},
		824	;
		825
		826	$self = $class->SUPER::new (
		827	vp => (new CFClient::UI::ViewPort),
		828	slider => $slider,
		829	@_,
		830	);
		831
		832	$self->{vp}->add ($self->{scrolled});
		833	$self->add ($self->{vp});
		834	$self->add ($self->{slider});
		835
		836	$self
		837	}
		838
		839	#TODO# update range on size_allocate depeneing on child
		840	# update viewport offset on scroll
		841
		842	#############################################################################
		843
		844	package CFClient::UI::Frame;
		845
		846	our @ISA = CFClient::UI::Bin::;
		847
		848	use CFClient::OpenGL;
		849
		850	sub new {
		851	my $class = shift;
		852
		853	my $self = $class->SUPER::new (
		854	bg => [1, 1, 1, 1],
		855	border_bg => [1, 1, 1, 1],
		856	border => 0.8,
		857	@_
		858	);
		859
		860	$self
		861	}
		862
		863	sub _draw {
		864	my ($self) = @_;
		865
		866	my ($w, $h) = ($self->{w}, $self->{h});
515		867
516	glEnable GL_BLEND;	868	glEnable GL_BLEND;
517	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
518	glEnable GL_TEXTURE_2D;	870	glEnable GL_TEXTURE_2D;
519	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
520		872
521	$tex->draw_quad (0, 0, $w, $h);	873	# glBegin GL_QUADS;
		874	# glColor 0, 0, 0, 0;
		875	# glVertex 0 , 0;
		876	# glVertex 0 , $h;
		877	# glVertex $w, $h;
		878	# glVertex $w, 0;
		879	# glEnd;
522		880
		881
		882	$self->child->draw;
523	glDisable GL_BLEND;	883	glDisable GL_BLEND;
524	glDisable GL_TEXTURE_2D;	884	glDisable GL_TEXTURE_2D;
525	}	885	}
526		886
527	#############################################################################	887	#############################################################################
528		888
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;	889	package CFClient::UI::FancyFrame;
554		890
555	our @ISA = CFClient::UI::Bin::;	891	our @ISA = CFClient::UI::Bin::;
556		892
557	use SDL::OpenGL;	893	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		894
601	my @tex =	895	my @tex =
602	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	896	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);	897	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604		898
605	sub new {	899	sub new {
606	my $class = shift;	900	my $class = shift;
607		901
608	# TODO: user_x, user_y, overwrite moveto?	902	# TODO: user_x, user_y, overwrite moveto?
609		903
610	$class->SUPER::new (	904	my $self = $class->SUPER::new (
611	bg => [1, 1, 1, 1],	905	bg => [1, 1, 1, 1],
612	border_bg => [1, 1, 1, 1],	906	border_bg => [1, 1, 1, 1],
613	border => int $::FONTSIZE * 0.8,	907	border => 0.6,
		908	can_events => 1,
614	@_	909	@_
615	)	910	);
		911
		912	$self->{title} &&= new CFClient::UI::Label
		913	align => 0,
		914	valign => 1,
		915	text => $self->{title},
		916	fontsize => $self->{border};
		917
		918	$self
		919	}
		920
		921	sub border {
		922	int $_[0]{border} * $::FONTSIZE
616	}	923	}
617		924
618	sub size_request {	925	sub size_request {
619	my ($self) = @_;	926	my ($self) = @_;
620		927
621	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623	my ($w, $h) = $self->SUPER::size_request;	928	my ($w, $h) = $self->SUPER::size_request;
624		929
625	(	930	(
626	$w + $self->{border} * 2,	931	$w + $self->border * 2,
627	$h + $self->{border} * 2,	932	$h + $self->border * 2,
628	)	933	)
629	}	934	}
630		935
631	sub size_allocate {	936	sub size_allocate {
632	my ($self, $w, $h) = @_;	937	my ($self, $w, $h) = @_;
633		938
634	$h -= List::Util::max 0, $self->{border} * 2;	939	$h -= List::Util::max 0, $self->border * 2;
635	$w -= List::Util::max 0, $self->{border} * 2;	940	$w -= List::Util::max 0, $self->border * 2;
636		941
		942	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		943	if $self->{title};
		944
637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	945	$self->child->configure ($self->border, $self->border, $w, $h);
638	}	946	}
639		947
640	sub button_down {	948	sub button_down {
641	my ($self, $ev, $x, $y) = @_;	949	my ($self, $ev, $x, $y) = @_;
642		950
643	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	951	my ($w, $h) = @$self{qw(w h)};
644	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	952	my $border = $self->border;
645		953
		954	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
		955	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
		956
		957	if ($lr & $td) {
		958	my ($wx, $wy) = ($self->{x}, $self->{y});
646	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	959	my ($ox, $oy) = ($ev->{x}, $ev->{y});
647	my ($bw, $bh) = ($self->{w}, $self->{h});	960	my ($bw, $bh) = ($self->{w}, $self->{h});
		961
		962	my $mx = $x < $border;
		963	my $my = $y < $border;
648		964
649	$self->{motion} = sub {	965	$self->{motion} = sub {
650	my ($ev, $x, $y) = @_;	966	my ($ev, $x, $y) = @_;
651		967
652	($x, $y) = ($ev->motion_x, $ev->motion_y);	968	my $dx = $ev->{x} - $ox;
		969	my $dy = $ev->{y} - $oy;
653		970
654	$self->{user_w} = $bw + $x - $ox;	971	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
655	$self->{user_h} = $bh + $y - $oy;	972	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		973	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
656	$self->check_size;	974	$self->check_size;
657	};	975	};
658		976
659	} elsif ($x >= 0 && $x < $self->{w}	977	} elsif ($lr ^ $td) {
660	&& $y >= 0 && $y < $self->{border}) {
661
662	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	978	my ($ox, $oy) = ($ev->{x}, $ev->{y});
663	my ($bx, $by) = ($self->{x}, $self->{y});	979	my ($bx, $by) = ($self->{x}, $self->{y});
664		980
665	$self->{motion} = sub {	981	$self->{motion} = sub {
666	my ($ev, $x, $y) = @_;	982	my ($ev, $x, $y) = @_;
667		983
668	($x, $y) = ($ev->motion_x, $ev->motion_y);	984	($x, $y) = ($ev->{x}, $ev->{y});
669		985
670	$self->move ($bx + $x - $ox, $by + $y - $oy);	986	$self->move ($bx + $x - $ox, $by + $y - $oy);
671	$self->update;	987	$self->update;
672	};	988	};
673	}	989	}
…		…
694	glEnable GL_BLEND;	1010	glEnable GL_BLEND;
695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696	glEnable GL_TEXTURE_2D;	1012	glEnable GL_TEXTURE_2D;
697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698		1014
		1015	my $border = $self->border;
		1016
699	glColor @{ $self->{border_bg} };	1017	glColor @{ $self->{border_bg} };
700	$tex[1]->draw_quad (0, 0, $w, $self->{border});	1018	$tex[1]->draw_quad (0, 0, $w, $border);
701	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	1019	$tex[3]->draw_quad (0, $border, $border, $ch);
702	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);
704		1022
		1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
705	my $bg = $tex[0];	1024	my $bg = $tex[0];
706		1025
707	# TODO: repeat texture not scale	1026	# TODO: repeat texture not scale
708	my $rep_x = $cw / $bg->{w};	1027	my $rep_x = $cw / $bg->{w};
709	my $rep_y = $ch / $bg->{h};	1028	my $rep_y = $ch / $bg->{h};
710		1029
711	glColor @{ $self->{bg} };	1030	glColor @{ $self->{bg} };
712		1031
713	$bg->{s} = $rep_x;	1032	$bg->{s} = $rep_x;
714	$bg->{t} = $rep_y;	1033	$bg->{t} = $rep_y;
715	$bg->{wrap_mode} = 1;	1034	$bg->{wrap_mode} = 1;
716	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	1035	$bg->draw_quad ($border, $border, $cw, $ch);
717		1036
718	glDisable GL_TEXTURE_2D;	1037	glDisable GL_TEXTURE_2D;
719	glDisable GL_BLEND;	1038	glDisable GL_BLEND;
		1039	}
		1040
		1041	$self->{title}->draw if $self->{title};
720		1042
721	$self->child->draw;	1043	$self->child->draw;
722	}	1044	}
723		1045
724	#############################################################################	1046	#############################################################################
…		…
727		1049
728	our @ISA = CFClient::UI::Base::;	1050	our @ISA = CFClient::UI::Base::;
729		1051
730	use List::Util qw(max sum);	1052	use List::Util qw(max sum);
731		1053
732	use SDL::OpenGL;	1054	use CFClient::OpenGL;
733		1055
734	sub new {	1056	sub new {
735	my $class = shift;	1057	my $class = shift;
736		1058
737	$class->SUPER::new (	1059	$class->SUPER::new (
…		…
744	my ($self, $x, $y, $child) = @_;	1066	my ($self, $x, $y, $child) = @_;
745		1067
746	$child->set_parent ($self);	1068	$child->set_parent ($self);
747	$self->{children}[$y][$x] = $child;	1069	$self->{children}[$y][$x] = $child;
748		1070
749	$self->{w} = $self->{h} = -1;
750
751	$child->check_size;	1071	$child->check_size;
		1072	}
		1073
		1074	sub children {
		1075	grep $_, map @$_, grep $_, @{ $_[0]{children} }
752	}	1076	}
753		1077
754	# TODO: move to container class maybe? send childs a signal on removal?	1078	# TODO: move to container class maybe? send childs a signal on removal?
755	sub clear {	1079	sub clear {
756	my ($self) = @_;	1080	my ($self) = @_;
757		1081
		1082	my @children = $self->children;
758	delete $self->{children};	1083	delete $self->{children};
		1084
		1085	for (@children) {
		1086	delete $_->{parent};
		1087	$_->hide;
		1088	}
		1089
759	$self->update;	1090	$self->update;
760	}	1091	}
761		1092
762	sub get_wh {	1093	sub get_wh {
763	my ($self) = @_;	1094	my ($self) = @_;
…		…
769	or next;	1100	or next;
770		1101
771	for my $x (0 .. $#$row) {	1102	for my $x (0 .. $#$row) {
772	my $widget = $row->[$x]	1103	my $widget = $row->[$x]
773	or next;	1104	or next;
774	my ($w, $h) = $widget->size_request;	1105	my ($w, $h) = @$widget{qw(req_w req_h)};
775		1106
776	$w[$x] = max $w[$x], $w;	1107	$w[$x] = max $w[$x], $w;
777	$h[$y] = max $h[$y], $h;	1108	$h[$y] = max $h[$y], $h;
778	}	1109	}
779	}	1110	}
…		…
884		1215
885	($h, $w) = ($w, $h);	1216	($h, $w) = ($w, $h);
886		1217
887	my $children = $self->{children};	1218	my $children = $self->{children};
888		1219
889	my @h = map +($_->size_request)[0], @$children;	1220	my @h = map $_->{req_w}, @$children;
890		1221
891	my $req_h = List::Util::sum @h;	1222	my $req_h = List::Util::sum @h;
892		1223
893	if ($req_h > $h) {	1224	if ($req_h > $h) {
894	# ah well, not enough space	1225	# ah well, not enough space
…		…
942	sub size_allocate {	1273	sub size_allocate {
943	my ($self, $w, $h) = @_;	1274	my ($self, $w, $h) = @_;
944		1275
945	my $children = $self->{children};	1276	my $children = $self->{children};
946		1277
947	my @h = map +($_->size_request)[1], @$children;	1278	my @h = map $_->{req_h}, @$children;
948		1279
949	my $req_h = List::Util::sum @h;	1280	my $req_h = List::Util::sum @h;
950		1281
951	if ($req_h > $h) {	1282	if ($req_h > $h) {
952	# ah well, not enough space	1283	# ah well, not enough space
…		…
980		1311
981	package CFClient::UI::Label;	1312	package CFClient::UI::Label;
982		1313
983	our @ISA = CFClient::UI::Base::;	1314	our @ISA = CFClient::UI::Base::;
984		1315
985	use SDL::OpenGL;	1316	use CFClient::OpenGL;
986		1317
987	sub new {	1318	sub new {
988	my ($class, %arg) = @_;	1319	my ($class, %arg) = @_;
989		1320
990	my $self = $class->SUPER::new (	1321	my $self = $class->SUPER::new (
991	fg => [1, 1, 1],	1322	fg => [1, 1, 1],
992	fontsize => $::FONTSIZE,	1323	#font => default_font
		1324	fontsize => 1,
993	text => "",	1325	text => "",
994	align => -1,	1326	align => -1,
995	valign => -1,	1327	valign => -1,
996	padding => 2,	1328	padding => 2,
997	layout => new CFClient::Layout,	1329	layout => new CFClient::Layout,
		1330	can_events => 0,
998	%arg	1331	%arg
999	);	1332	);
1000		1333
1001	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1334	if (exists $self->{template}) {
		1335	my $layout = new CFClient::Layout;
		1336	$layout->set_text (delete $self->{template});
		1337	$self->{template} = $layout;
		1338	}
1002		1339
1003	$self->set_text (delete $self->{text}) if exists $self->{text};	1340	$self->set_text (delete $self->{text}) if exists $self->{text};
1004	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005		1342
1006	$self	1343	$self
1007	}	1344	}
1008		1345
1009	sub escape_text {	1346	sub escape {
1010	local $_ = $_[1];	1347	local $_ = $_[1];
1011		1348
1012	s/&/&amp;/g;	1349	s/&/&amp;/g;
1013	s/>/&gt;/g;	1350	s/>/&gt;/g;
1014	s/</&lt;/g;	1351	s/</&lt;/g;
1015		1352
1016	$_[1]	1353	$_[1]
1017	}	1354	}
1018		1355
		1356	sub update {
		1357	my ($self) = @_;
		1358
		1359	delete $self->{texture};
		1360	$self->SUPER::update;
		1361	}
		1362
1019	sub set_text {	1363	sub set_text {
1020	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1021		1365
		1366	return if $self->{text} eq "T$text";
		1367	$self->{text} = "T$text";
		1368
1022	$self->{layout}->set_text ($text);	1369	$self->{layout}->set_text ($text);
1023		1370
1024	delete $self->{texture};	1371	delete $self->{texture};
1025	$self->update;	1372	$self->update;
		1373	$self->check_size;
1026	}	1374	}
1027		1375
1028	sub set_markup {	1376	sub set_markup {
1029	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1030		1378
		1379	return if $self->{text} eq "M$markup";
		1380	$self->{text} = "M$markup";
		1381
1031	$self->{layout}->set_markup ($markup);	1382	$self->{layout}->set_markup ($markup);
1032		1383
1033	delete $self->{texture};	1384	delete $self->{texture};
1034	$self->update;	1385	$self->update;
		1386	$self->check_size;
1035	}	1387	}
1036		1388
1037	sub size_request {	1389	sub size_request {
1038	my ($self) = @_;	1390	my ($self) = @_;
1039		1391
1040	$self->{layout}->set_width;	1392	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1393	$self->{layout}->set_width ($self->{max_w} || -1);
1041	$self->{layout}->set_height ($self->{fontsize});	1394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042		1395
1043	my ($w, $h) = $self->{layout}->size;	1396	my ($w, $h) = $self->{layout}->size;
		1397
		1398	if (exists $self->{template}) {
		1399	$self->{template}->set_font ($self->{font}) if $self->{font};
		1400	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1401
		1402	my ($w2, $h2) = $self->{template}->size;
		1403
		1404	$w = List::Util::max $w, $w2;
		1405	$h = List::Util::max $h, $h2;
		1406	}
1044		1407
1045	(	1408	(
1046	$w + $self->{padding} * 2,	1409	$w + $self->{padding} * 2,
1047	$h + $self->{padding} * 2,	1410	$h + $self->{padding} * 2,
1048	)	1411	)
…		…
1052	my ($self, $w, $h) = @_;	1415	my ($self, $w, $h) = @_;
1053		1416
1054	delete $self->{texture};	1417	delete $self->{texture};
1055	}	1418	}
1056		1419
1057	sub update {	1420	sub set_fontsize {
1058	my ($self) = @_;	1421	my ($self, $fontsize) = @_;
1059		1422
		1423	$self->{fontsize} = $fontsize;
1060	delete $self->{texture};	1424	delete $self->{texture};
		1425
1061	$self->SUPER::update;	1426	$self->update;
		1427	$self->check_size;
1062	}	1428	}
1063		1429
1064	sub _draw {	1430	sub _draw {
1065	my ($self) = @_;	1431	my ($self) = @_;
1066		1432
1067	my $tex = $self->{texture} ||= do {	1433	my $tex = $self->{texture} ||= do {
		1434	$self->{layout}->set_font ($self->{font}) if $self->{font};
1068	$self->{layout}->set_width ($self->{w});	1435	$self->{layout}->set_width ($self->{w});
1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070	new_from_layout CFClient::Texture $self->{layout}	1437	new_from_layout CFClient::Texture $self->{layout}
1071	};	1438	};
1072		1439
1073	glEnable GL_BLEND;	1440	glEnable GL_BLEND;
1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1099		1466
1100	package CFClient::UI::EntryBase;	1467	package CFClient::UI::EntryBase;
1101		1468
1102	our @ISA = CFClient::UI::Label::;	1469	our @ISA = CFClient::UI::Label::;
1103		1470
1104	use SDL;	1471	use CFClient::OpenGL;
1105	use SDL::OpenGL;
1106		1472
1107	sub new {	1473	sub new {
1108	my $class = shift;	1474	my $class = shift;
1109		1475
1110	$class->SUPER::new (	1476	$class->SUPER::new (
1111	fg => [1, 1, 1],	1477	fg => [1, 1, 1],
1112	bg => [0, 0, 0, 0.2],	1478	bg => [0, 0, 0, 0.2],
1113	active_bg => [1, 1, 1, 0.5],	1479	active_bg => [1, 1, 1, 0.5],
1114	active_fg => [0, 0, 0],	1480	active_fg => [0, 0, 0],
1115	can_hover => 1,	1481	can_hover => 1,
1116	can_focus => 1,	1482	can_focus => 1,
1117	valign => 0,	1483	valign => 0,
		1484	can_events => 1,
1118	@_	1485	@_
1119	)	1486	)
1120	}	1487	}
1121		1488
1122	sub _set_text {	1489	sub _set_text {
…		…
1124		1491
1125	delete $self->{cur_h};	1492	delete $self->{cur_h};
1126		1493
1127	return if $self->{text} eq $text;	1494	return if $self->{text} eq $text;
1128		1495
		1496	delete $self->{texture};
		1497
1129	$self->{last_activity} = $::NOW;	1498	$self->{last_activity} = $::NOW;
1130	$self->{text} = $text;	1499	$self->{text} = $text;
1131		1500
1132	$text =~ s/./*/g if $self->{hidden};	1501	$text =~ s/./*/g if $self->{hidden};
1133	$self->{layout}->set_text ("$text ");	1502	$self->{layout}->set_text ("$text ");
…		…
1148	}	1517	}
1149		1518
1150	sub size_allocate {	1519	sub size_allocate {
1151	my ($self, $w, $h) = @_;	1520	my ($self, $w, $h) = @_;
1152		1521
1153	$self->_set_text ($self->{text});	1522	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154	}	1523	}
1155		1524
1156	sub set_text {	1525	sub set_text {
1157	my ($self, $text) = @_;	1526	my ($self, $text) = @_;
1158		1527
…		…
1162	}	1531	}
1163		1532
1164	sub key_down {	1533	sub key_down {
1165	my ($self, $ev) = @_;	1534	my ($self, $ev) = @_;
1166		1535
1167	my $mod = $ev->key_mod;	1536	my $mod = $ev->{mod};
1168	my $sym = $ev->key_sym;	1537	my $sym = $ev->{sym};
1169
1170	my $uni = $ev->key_unicode;	1538	my $uni = $ev->{unicode};
1171		1539
1172	my $text = $self->get_text;	1540	my $text = $self->get_text;
1173		1541
1174	if ($sym == SDLK_BACKSPACE) {	1542	if ($sym == 8) {
1175	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1543	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176	} elsif ($sym == SDLK_DELETE) {	1544	} elsif ($sym == 127) {
1177	substr $text, $self->{cursor}, 1, "";	1545	substr $text, $self->{cursor}, 1, "";
1178	} elsif ($sym == SDLK_LEFT) {	1546	} elsif ($sym == CFClient::SDLK_LEFT) {
1179	--$self->{cursor} if $self->{cursor};	1547	--$self->{cursor} if $self->{cursor};
1180	} elsif ($sym == SDLK_RIGHT) {	1548	} elsif ($sym == CFClient::SDLK_RIGHT) {
1181	++$self->{cursor} if $self->{cursor} < length $self->{text};	1549	++$self->{cursor} if $self->{cursor} < length $self->{text};
1182	} elsif ($sym == SDLK_HOME) {	1550	} elsif ($sym == CFClient::SDLK_HOME) {
1183	$self->{cursor} = 0;	1551	$self->{cursor} = 0;
1184	} elsif ($sym == SDLK_END) {	1552	} elsif ($sym == CFClient::SDLK_END) {
1185	$self->{cursor} = length $text;	1553	$self->{cursor} = length $text;
1186	} elsif ($sym == SDLK_ESCAPE) {	1554	} elsif ($sym == 27) {
1187	$self->emit ('escape');	1555	$self->emit ('escape');
1188	} elsif ($uni) {	1556	} elsif ($uni) {
1189	substr $text, $self->{cursor}++, 0, chr $uni;	1557	substr $text, $self->{cursor}++, 0, chr $uni;
1190	}	1558	}
1191		1559
…		…
1266		1634
1267	package CFClient::UI::Entry;	1635	package CFClient::UI::Entry;
1268		1636
1269	our @ISA = CFClient::UI::EntryBase::;	1637	our @ISA = CFClient::UI::EntryBase::;
1270		1638
1271	use SDL;	1639	use CFClient::OpenGL;
1272	use SDL::OpenGL;
1273		1640
1274	sub key_down {	1641	sub key_down {
1275	my ($self, $ev) = @_;	1642	my ($self, $ev) = @_;
1276		1643
1277	my $sym = $ev->key_sym;	1644	my $sym = $ev->{sym};
1278		1645
1279	if ($sym == SDLK_RETURN) {	1646	if ($sym == 13) {
		1647	unshift @{$self->{history}},
		1648	my $txt = $self->get_text;
		1649	$self->{history_pointer} = -1;
		1650	$self->{history_saveback} = '';
1280	$self->emit (activate => $self->get_text);	1651	$self->emit (activate => $txt);
1281	$self->update;	1652	$self->update;
		1653
		1654	} elsif ($sym == CFClient::SDLK_UP) {
		1655	if ($self->{history_pointer} < 0) {
		1656	$self->{history_saveback} = $self->get_text;
		1657	}
		1658	if (@{$self->{history} || []} > 0) {
		1659	$self->{history_pointer}++;
		1660	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1661	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1662	}
		1663	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1664	}
		1665
		1666	} elsif ($sym == CFClient::SDLK_DOWN) {
		1667	$self->{history_pointer}--;
		1668	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1669
		1670	if ($self->{history_pointer} >= 0) {
		1671	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1672	} else {
		1673	$self->set_text ($self->{history_saveback});
		1674	}
1282		1675
1283	} else {	1676	} else {
1284	$self->SUPER::key_down ($ev);	1677	$self->SUPER::key_down ($ev);
1285	}	1678	}
1286		1679
…		…
1290		1683
1291	package CFClient::UI::Button;	1684	package CFClient::UI::Button;
1292		1685
1293	our @ISA = CFClient::UI::Label::;	1686	our @ISA = CFClient::UI::Label::;
1294		1687
1295	use SDL;	1688	use CFClient::OpenGL;
1296	use SDL::OpenGL;
1297		1689
1298	my @tex =	1690	my @tex =
1299	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1691	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300	qw(b1_button_active.png);	1692	qw(b1_button_active.png);
1301		1693
1302	sub new {	1694	sub new {
1303	my $class = shift;	1695	my $class = shift;
1304		1696
1305	$class->SUPER::new (	1697	$class->SUPER::new (
1306	padding => 4,	1698	padding => 4,
1307	fg => [1, 1, 1],	1699	fg => [1, 1, 1],
1308	bg => [1, 1, 1, 0.2],	1700	bg => [1, 1, 1, 0.2],
1309	active_fg => [0, 0, 1],	1701	active_fg => [0, 0, 1],
1310	can_hover => 1,	1702	can_hover => 1,
1311	align => 0,	1703	align => 0,
1312	valign => 0,	1704	valign => 0,
		1705	can_events => 1,
1313	@_	1706	@_
1314	)	1707	)
1315	}	1708	}
1316		1709
1317	sub button_up {	1710	sub button_up {
…		…
1351	package CFClient::UI::CheckBox;	1744	package CFClient::UI::CheckBox;
1352		1745
1353	our @ISA = CFClient::UI::DrawBG::;	1746	our @ISA = CFClient::UI::DrawBG::;
1354		1747
1355	my @tex =	1748	my @tex =
1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1749	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1750	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358		1751
1359	use SDL;	1752	use CFClient::OpenGL;
1360	use SDL::OpenGL;
1361		1753
1362	sub new {	1754	sub new {
1363	my $class = shift;	1755	my $class = shift;
1364		1756
1365	$class->SUPER::new (	1757	$class->SUPER::new (
…		…
1411	glDisable GL_BLEND;	1803	glDisable GL_BLEND;
1412	}	1804	}
1413		1805
1414	#############################################################################	1806	#############################################################################
1415		1807
1416	package CFClient::UI::VGauge;	1808	package CFClient::UI::Image;
1417		1809
1418	our @ISA = CFClient::UI::Base::;	1810	our @ISA = CFClient::UI::Base::;
1419		1811
1420	use SDL::OpenGL;	1812	use CFClient::OpenGL;
		1813	use Carp qw/confess/;
1421		1814
1422	my %tex = (	1815	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		1816
1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
1442	sub new {	1817	sub new {
1443	my $class = shift;	1818	my $class = shift;
1444		1819
1445	my $self = $class->SUPER::new (gauge => 'food', @_);	1820	my $self = $class->SUPER::new (can_events => 0, @_);
		1821
		1822	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1823
		1824	$loaded_images{$self->{image}} ||=
		1825	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1826
		1827	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1828
		1829	Scalar::Util::weaken $loaded_images{$self->{image}};
		1830
		1831	$self->{aspect} = $tex->{w} / $tex->{h};
1446		1832
1447	$self	1833	$self
1448	}	1834	}
1449		1835
1450	sub size_request {	1836	sub size_request {
1451	my ($self) = @_;	1837	my ($self) = @_;
1452		1838
1453	my $tex = $tex{$self->{gauge}}[0];	1839	($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	}	1840	}
1475		1841
1476	sub _draw {	1842	sub _draw {
1477	my ($self) = @_;	1843	my ($self) = @_;
1478		1844
1479	my $tex = $tex{$self->{gauge}};	1845	my $tex = $self->{tex};
1480		1846
1481	my ($w, $h) = ($self->{w}, $self->{h});	1847	my ($w, $h) = ($self->{w}, $self->{h});
1482		1848
1483	my $ycut = $self->{val} / ($self->{max_val} || 1);	1849	if ($self->{rot90}) {
1484	$ycut = 1 if $self->{val} > $self->{max_val};	1850	glRotate 90, 0, 0, 1;
		1851	glTranslate 0, -$self->{w}, 0;
1485		1852
1486	my $t1 = $tex->[0];	1853	($w, $h) = ($h, $w);
1487	my $t2 = $tex->[1];	1854	}
1488		1855
1489	glEnable GL_BLEND;	1856	glEnable GL_BLEND;
1490	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491	glEnable GL_TEXTURE_2D;	1858	glEnable GL_TEXTURE_2D;
1492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493		1860
1494	my $h1 = $self->{h} - $ycut * $self->{h};	1861	$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		1862
1517	glDisable GL_BLEND;	1863	glDisable GL_BLEND;
1518	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1519	}	1865	}
1520		1866
1521	#############################################################################	1867	#############################################################################
1522		1868
		1869	package CFClient::UI::VGauge;
		1870
		1871	our @ISA = CFClient::UI::Base::;
		1872
		1873	use List::Util qw(min max);
		1874
		1875	use CFClient::OpenGL;
		1876
		1877	my %tex = (
		1878	food => [
		1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1880	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1881	],
		1882	grace => [
		1883	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1884	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1885	],
		1886	hp => [
		1887	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1888	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1889	],
		1890	mana => [
		1891	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1892	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1893	],
		1894	);
		1895
		1896	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1897	sub new {
		1898	my $class = shift;
		1899
		1900	my $self = $class->SUPER::new (
		1901	type => 'food',
		1902	@_
		1903	);
		1904
		1905	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1906
		1907	$self
		1908	}
		1909
		1910	sub size_request {
		1911	my ($self) = @_;
		1912
		1913	#my $tex = $tex{$self->{type}}[0];
		1914	#@$tex{qw(w h)}
		1915	(0, 0)
		1916	}
		1917
		1918	sub set_max {
		1919	my ($self, $max) = @_;
		1920
		1921	return if $self->{max_val} == $max;
		1922
		1923	$self->{max_val} = $max;
		1924	$self->update;
		1925	}
		1926
		1927	sub set_value {
		1928	my ($self, $val, $max) = @_;
		1929
		1930	$self->set_max ($max)
		1931	if defined $max;
		1932
		1933	return if $self->{val} == $val;
		1934
		1935	$self->{val} = $val;
		1936	$self->update;
		1937	}
		1938
		1939	sub _draw {
		1940	my ($self) = @_;
		1941
		1942	my $tex = $tex{$self->{type}};
		1943	my ($t1, $t2, $t3) = @$tex;
		1944
		1945	my ($w, $h) = ($self->{w}, $self->{h});
		1946
		1947	if ($self->{vertical}) {
		1948	glRotate 90, 0, 0, 1;
		1949	glTranslate 0, -$self->{w}, 0;
		1950
		1951	($w, $h) = ($h, $w);
		1952	}
		1953
		1954	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1955
		1956	my $ycut1 = max 0, min 1, $ycut;
		1957	my $ycut2 = max 0, min 1, $ycut - 1;
		1958
		1959	my $h1 = $self->{h} * (1 - $ycut1);
		1960	my $h2 = $self->{h} * (1 - $ycut2);
		1961
		1962	glEnable GL_BLEND;
		1963	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1964	glEnable GL_TEXTURE_2D;
		1965	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1966
		1967	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1968	glBegin GL_QUADS;
		1969	glTexCoord 0 , 0; glVertex 0 , 0;
		1970	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1971	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
		1972	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1973	glEnd;
		1974
		1975	my $ycut1 = List::Util::min 1, $ycut;
		1976	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1977	glBegin GL_QUADS;
		1978	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1979	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1980	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1981	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
		1982	glEnd;
		1983
		1984	if ($t3) {
		1985	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1986	glBegin GL_QUADS;
		1987	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1988	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1989	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1990	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1991	glEnd;
		1992	}
		1993
		1994	glDisable GL_BLEND;
		1995	glDisable GL_TEXTURE_2D;
		1996	}
		1997
		1998	#############################################################################
		1999
		2000	package CFClient::UI::Gauge;
		2001
		2002	our @ISA = CFClient::UI::VBox::;
		2003
		2004	sub new {
		2005	my ($class, %arg) = @_;
		2006
		2007	my $self = $class->SUPER::new (
		2008	tooltip => $arg{type},
		2009	can_hover => 1,
		2010	can_events => 1,
		2011	%arg,
		2012	);
		2013
		2014	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		2015	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		2016	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		2017
		2018	$self
		2019	}
		2020
		2021	sub set_fontsize {
		2022	my ($self, $fsize) = @_;
		2023
		2024	$self->{value}->set_fontsize ($fsize);
		2025	$self->{max} ->set_fontsize ($fsize);
		2026	}
		2027
		2028	sub set_max {
		2029	my ($self, $max) = @_;
		2030
		2031	$self->{gauge}->set_max ($max);
		2032	$self->{max}->set_text ($max);
		2033	}
		2034
		2035	sub set_value {
		2036	my ($self, $val, $max) = @_;
		2037
		2038	$self->set_max ($max)
		2039	if defined $max;
		2040
		2041	$self->{gauge}->set_value ($val, $max);
		2042	$self->{value}->set_text ($val);
		2043	}
		2044
		2045	#############################################################################
		2046
1523	package CFClient::UI::Slider;	2047	package CFClient::UI::Slider;
1524		2048
1525	use strict;	2049	use strict;
1526		2050
1527	use SDL::OpenGL;	2051	use CFClient::OpenGL;
1528		2052
1529	our @ISA = CFClient::UI::DrawBG::;	2053	our @ISA = CFClient::UI::DrawBG::;
1530		2054
1531	my @tex =	2055	my @tex =
1532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2056	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1542	# TODO: calculations are off	2066	# TODO: calculations are off
1543	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
1544	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
1545	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
1546	range => [0, 0, 100, 10],	2070	range => [0, 0, 100, 10],
1547	req_w => 40,	2071	req_w => $::WIDTH / 80,
1548	req_h => 13,	2072	req_h => $::WIDTH / 80,
1549	vertical => 0,	2073	vertical => 0,
1550	can_hover => 1,	2074	can_hover => 1,
1551	inner_pad => 5,	2075	inner_pad => 5,
1552	@_	2076	@_
1553	);	2077	);
…		…
1657		2181
1658	package CFClient::UI::TextView;	2182	package CFClient::UI::TextView;
1659		2183
1660	our @ISA = CFClient::UI::HBox::;	2184	our @ISA = CFClient::UI::HBox::;
1661		2185
1662	use SDL::OpenGL;	2186	use CFClient::OpenGL;
1663		2187
1664	sub new {	2188	sub new {
1665	my $class = shift;	2189	my $class = shift;
1666		2190
1667	my $self = $class->SUPER::new (	2191	my $self = $class->SUPER::new (
1668	req_w => $::WIDTH / 6,	2192	fontsize => 1,
1669	req_h => $::HEIGHT / 6,	2193	can_events => 0,
1670	fontsize => $::FONTSIZE,	2194	#font => default_font
1671	@_,	2195	@_,
1672		2196
1673	layout => (new CFClient::Layout),	2197	layout => (new CFClient::Layout),
1674	par => [],	2198	par => [],
1675	height => 0,	2199	height => 0,
1676	children => [	2200	children => [
1677	(new CFClient::UI::Empty expand => 1),	2201	(new CFClient::UI::Empty expand => 1),
1678	(new CFClient::UI::Slider vertical => 1),	2202	(new CFClient::UI::Slider vertical => 1),
1679	],	2203	],
1680	);	2204	);
1681		2205
1682	$self->{children}[1]->connect (changed => sub {	2206	$self->{children}[1]->connect (changed => sub { $self->update });
1683	$self->update;
1684	});
1685		2207
1686	$self	2208	$self
1687	}	2209	}
1688		2210
1689	sub set_fontsize {	2211	sub set_fontsize {
…		…
1696	sub text_height {	2218	sub text_height {
1697	my ($self, $text) = @_;	2219	my ($self, $text) = @_;
1698		2220
1699	my $layout = $self->{layout};	2221	my $layout = $self->{layout};
1700		2222
1701	$layout->set_height ($self->{fontsize});	2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702	$layout->set_width ($self->{w});	2224	$layout->set_width ($self->{children}[0]{w});
1703	$layout->set_text ($text);	2225	$layout->set_text ($text);
1704		2226
1705	($layout->size)[1]	2227	($layout->size)[1]
1706	}	2228	}
1707		2229
…		…
1710		2232
1711	$self->{need_reflow}++;	2233	$self->{need_reflow}++;
1712	$self->update;	2234	$self->update;
1713	}	2235	}
1714		2236
1715	sub size_request {
1716	my ($self) = @_;
1717
1718	($self->{req_w}, $self->{req_h})
1719	}
1720
1721	sub size_allocate {	2237	sub size_allocate {
1722	my ($self, $w, $h) = @_;	2238	my ($self, $w, $h) = @_;
1723		2239
		2240	$self->SUPER::size_allocate ($w, $h);
		2241
		2242	$self->{layout}->set_font ($self->{font}) if $self->{font};
1724	$self->{layout}->set_height ($self->{fontsize});	2243	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725	$self->{layout}->set_width ($self->{w});	2244	$self->{layout}->set_width ($self->{children}[0]{w});
1726		2245
1727	$self->reflow;	2246	$self->reflow;
1728	$self->update;
1729	}	2247	}
1730		2248
1731	sub add_paragraph {	2249	sub add_paragraph {
1732	my ($self, $color, $text) = @_;	2250	my ($self, $color, $text) = @_;
1733		2251
…		…
1764	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1765		2283
1766	delete $self->{texture};	2284	delete $self->{texture};
1767	}	2285	}
1768		2286
1769	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2287	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1770	glClearColor 0, 0, 0, 1;	2288	glClearColor 0, 0, 0, 0;
1771	glClear GL_COLOR_BUFFER_BIT;	2289	glClear GL_COLOR_BUFFER_BIT;
1772		2290
1773	glEnable GL_BLEND;	2291	glEnable GL_BLEND;
1774	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1775	glEnable GL_TEXTURE_2D;	2293	glEnable GL_TEXTURE_2D;
…		…
1782		2300
1783	my $y = 0;	2301	my $y = 0;
1784		2302
1785	my $layout = $self->{layout};	2303	my $layout = $self->{layout};
1786		2304
		2305	$layout->set_font ($self->{font}) if $self->{font};
		2306
1787	for my $par (@{$self->{par}}) {	2307	for my $par (@{$self->{par}}) {
1788	my $h = $par->[0];	2308	my $h = $par->[0];
1789		2309
1790	if ($y0 < $y + $h && $y < $y1) {	2310	if ($y0 < $y + $h && $y < $y1) {
1791	$layout->set_text ($par->[2]);	2311	$layout->set_text ($par->[2]);
…		…
1805	}	2325	}
1806		2326
1807	sub _draw {	2327	sub _draw {
1808	my ($self) = @_;	2328	my ($self) = @_;
1809		2329
1810	if ($self->{texture}) {	2330	glEnable GL_BLEND;
		2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1811	glEnable GL_TEXTURE_2D;	2332	glEnable GL_TEXTURE_2D;
1812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2334	glColor 1, 1, 1, 1;
1813	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1814	glDisable GL_TEXTURE_2D;	2336	glDisable GL_TEXTURE_2D;
1815	}	2337	glDisable GL_BLEND;
1816		2338
1817	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
1818		2340
1819	}	2341	}
1820		2342
1821	#############################################################################	2343	#############################################################################
1822		2344
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;	2345	package CFClient::UI::Animator;
2060		2346
2061	use SDL::OpenGL;	2347	use CFClient::OpenGL;
2062		2348
2063	our @ISA = CFClient::UI::Bin::;	2349	our @ISA = CFClient::UI::Bin::;
2064		2350
2065	sub moveto {	2351	sub moveto {
2066	my ($self, $x, $y) = @_;	2352	my ($self, $x, $y) = @_;
…		…
2104		2390
2105	sub new {	2391	sub new {
2106	my $class = shift;	2392	my $class = shift;
2107		2393
2108	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
2109	state => 0,	2395	state => 0,
2110	connect_activate => \&toggle_flopper,	2396	connect_activate => \&toggle_flopper,
2111	@_	2397	@_
2112	);	2398	);
2113		2399
2114	if ($self->{state}) {	2400	if ($self->{state}) {
…		…
2135	$self->emit (changed => $self->{state});	2421	$self->emit (changed => $self->{state});
2136	}	2422	}
2137		2423
2138	#############################################################################	2424	#############################################################################
2139		2425
		2426	package CFClient::UI::Tooltip;
		2427
		2428	our @ISA = CFClient::UI::Bin::;
		2429
		2430	use CFClient::OpenGL;
		2431
		2432	sub new {
		2433	my $class = shift;
		2434
		2435	$class->SUPER::new (
		2436	@_,
		2437	can_events => 0,
		2438	)
		2439	}
		2440
		2441	sub set_markup {
		2442	my ($self, $text) = @_;
		2443
		2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2445	$self->{label}->set_markup ($text);
		2446	$self->add ($self->{label});
		2447	}
		2448
		2449	sub size_request {
		2450	my ($self) = @_;
		2451
		2452	$self->child->set_max_size ($::WIDTH * 0.3);
		2453
		2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2455
		2456	($w + 4, $h + 4)
		2457	}
		2458
		2459	sub size_allocate {
		2460	my ($self, $w, $h) = @_;
		2461
		2462	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	glPushMatrix;
		2469	glTranslate 0.375, 0.375;
		2470
		2471	my ($w, $h) = @$self{qw(w h)};
		2472
		2473	glColor 1, 0.8, 0.4;
		2474	glBegin GL_QUADS;
		2475	glVertex 0 , 0;
		2476	glVertex 0 , $h;
		2477	glVertex $w, $h;
		2478	glVertex $w, 0;
		2479	glEnd;
		2480
		2481	glColor 0, 0, 0;
		2482	glBegin GL_LINE_LOOP;
		2483	glVertex 0 , 0;
		2484	glVertex 0 , $h;
		2485	glVertex $w, $h;
		2486	glVertex $w, 0;
		2487	glEnd;
		2488
		2489	glPopMatrix;
		2490
		2491	glTranslate 2, 2;
		2492	$self->SUPER::_draw;
		2493	}
		2494
		2495	#############################################################################
		2496
		2497	package CFClient::UI::Face;
		2498
		2499	our @ISA = CFClient::UI::Base::;
		2500
		2501	use CFClient::OpenGL;
		2502
		2503	sub new {
		2504	my $class = shift;
		2505
		2506	$class->SUPER::new (
		2507	aspect => 1,
		2508	@_,
		2509	)
		2510	}
		2511
		2512	sub size_request {
		2513	(32, 8)
		2514	}
		2515
		2516	sub _draw {
		2517	my ($self) = @_;
		2518
		2519	return unless $::CONN;#d# manage and cache textures differently
		2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2521
		2522	# TODO animation
		2523	if ($tex) {
		2524	glEnable GL_BLEND;
		2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2526	glEnable GL_TEXTURE_2D;
		2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2528	glColor 1, 1, 1, 1;
		2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2530	glDisable GL_TEXTURE_2D;
		2531	glDisable GL_BLEND;
		2532	}
		2533	}
		2534
		2535	#############################################################################
		2536
		2537	package CFClient::UI::InventoryItem;
		2538
		2539	our @ISA = CFClient::UI::HBox::;
		2540
		2541	sub new {
		2542	my $class = shift;
		2543
		2544	my %args = @_;
		2545
		2546	my $item = $args{item};
		2547
		2548	my $desc = $item->{nrof} < 2
		2549	? $item->{name}
		2550	: "$item->{nrof} $item->{name_pl}";
		2551
		2552
		2553	my $self = $class->SUPER::new (
		2554	can_hover => 1,
		2555	can_events => 1,
		2556	tooltip => (CFClient::UI::Label->escape ($desc)
		2557	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2558	connect_button_down => sub {
		2559	my ($self, $ev, $x, $y) = @_;
		2560
		2561	# todo: maybe put examine on 1? but should just be a tooltip :(
		2562	if ($ev->{button} == 1) {
		2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2564	} elsif ($ev->{button} == 2) {
		2565	$::CONN->send ("apply $item->{tag}");
		2566	} elsif ($ev->{button} == 3) {
		2567	CFClient::UI::Menu->new (
		2568	items => [
		2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2570	[
		2571	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2572	sub { $::CONN->send ("lock $item->{tag}") },
		2573	],
		2574	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2575	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2577	],
		2578	)->popup ($ev);
		2579	}
		2580
		2581	1
		2582	},
		2583	%args
		2584	);
		2585	$self->add(new CFClient::UI::Face
		2586	can_events => 0,
		2587	face => $item->{face},
		2588	anim => $item->{anim},
		2589	animspeed => $item->{animspeed});
		2590	$self->add(new CFClient::UI::Label
		2591	can_events => 0,
		2592	text => $desc);
		2593
		2594	$self
		2595	}
		2596
		2597	#############################################################################
		2598
		2599	package CFClient::UI::Inventory;
		2600
		2601	our @ISA = CFClient::UI::ScrolledWindow::;
		2602
		2603	sub new {
		2604	my $class = shift;
		2605
		2606	my $self = $class->SUPER::new (
		2607	scrolled => (new CFClient::UI::VBox),
		2608	@_,
		2609	);
		2610
		2611	$self
		2612	}
		2613
		2614	sub set_items {
		2615	my ($self, $items) = @_;
		2616
		2617	$self->{scrolled}->clear;
		2618	return unless $items;
		2619
		2620	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2621
		2622	$self->{real_items} = \@items;
		2623
		2624	for my $item (@items) {
		2625	my $desc = $item->{nrof} < 2
		2626	? $item->{name}
		2627	: "$item->{nrof} $item->{name_pl}";
		2628
		2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2630	}
		2631
		2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2633	}
		2634
		2635	sub size_request {
		2636	my ($self) = @_;
		2637	($self->{req_w}, $self->{req_h});
		2638	}
		2639
		2640	#############################################################################
		2641
		2642	package CFClient::UI::Menu;
		2643
		2644	our @ISA = CFClient::UI::FancyFrame::;
		2645
		2646	use CFClient::OpenGL;
		2647
		2648	sub new {
		2649	my $class = shift;
		2650
		2651	my $self = $class->SUPER::new (
		2652	items => [],
		2653	z => 100,
		2654	@_,
		2655	);
		2656
		2657	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2658
		2659	for my $item (@{ $self->{items} }) {
		2660	my ($widget, $cb) = @$item;
		2661
		2662	# handle various types of items, only text for now
		2663	if (!ref $widget) {
		2664	$widget = new CFClient::UI::Label
		2665	can_hover => 1,
		2666	can_events => 1,
		2667	text => $widget;
		2668	}
		2669
		2670	$self->{item}{$widget} = $item;
		2671
		2672	$self->{vbox}->add ($widget);
		2673	}
		2674
		2675	$self
		2676	}
		2677
		2678	# popup given the event (must be a mouse button down event currently)
		2679	sub popup {
		2680	my ($self, $ev) = @_;
		2681
		2682	$self->emit ("popdown");
		2683
		2684	# maybe save $GRAB? must be careful about events...
		2685	$GRAB = $self;
		2686	$self->{button} = $ev->{button};
		2687
		2688	$self->show;
		2689	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2690	}
		2691
		2692	sub mouse_motion {
		2693	my ($self, $ev, $x, $y) = @_;
		2694
		2695	# TODO: should use vbox->find_widget or so
		2696	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2697	$self->{hover} = $self->{item}{$HOVER};
		2698	}
		2699
		2700	sub button_up {
		2701	my ($self, $ev, $x, $y) = @_;
		2702
		2703	if ($ev->{button} == $self->{button}) {
		2704	undef $GRAB;
		2705	$self->hide;
		2706
		2707	$self->emit ("popdown");
		2708	$self->{hover}[1]->() if $self->{hover};
		2709	}
		2710	}
		2711
		2712	#############################################################################
		2713
2140	package CFClient::UI::Root;	2714	package CFClient::UI::Root;
2141		2715
2142	our @ISA = CFClient::UI::Container::;	2716	our @ISA = CFClient::UI::Container::;
2143		2717
2144	use SDL::OpenGL;	2718	use CFClient::OpenGL;
2145		2719
2146	sub check_size {	2720	sub check_size {
2147	my ($self) = @_;	2721	my ($self) = @_;
2148		2722
2149	$self->configure (0, 0, $::WITH, $::HEIGHT);	2723	$self->configure (0, 0, $self->{w}, $self->{h});
2150	}	2724	}
2151		2725
2152	sub size_request {	2726	sub size_request {
2153	($::WIDTH, $::HEIGHT)	2727	my ($self) = @_;
		2728
		2729	($self->{w}, $self->{h})
		2730	}
		2731
		2732	sub size_allocate {
		2733	my ($self, $w, $h) = @_;
		2734
		2735	my $old_w = $self->{old_w};
		2736	my $old_h = $self->{old_h};
		2737
		2738	if ($old_w && $old_h) {
		2739	for my $child ($self->children) {
		2740	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2741	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2742	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2743	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2744	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2745	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2748	}
		2749	}
		2750
		2751	$self->{old_w} = $w;
		2752	$self->{old_h} = $h;
2154	}	2753	}
2155		2754
2156	sub configure {	2755	sub configure {
2157	my ($self, $x, $y, $w, $h) = @_;	2756	my ($self, $x, $y, $w, $h) = @_;
2158		2757
2159	$self->SUPER::configure ($x, $y, $w, $h);	2758	$self->SUPER::configure ($x, $y, $w, $h);
2160		2759
2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)	2760	for my $child ($self->children) {
2162	for @{$self->{children}};	2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2762
		2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2764	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2765	$child->configure ($X, $Y, $W, $H);
		2766	}
2163	}	2767	}
2164		2768
2165	sub _topleft {	2769	sub _topleft {
2166	my ($self, $x, $y) = @_;	2770	my ($self, $x, $y) = @_;
2167		2771
…		…
2175	::refresh ();	2779	::refresh ();
2176	}	2780	}
2177		2781
2178	sub add {	2782	sub add {
2179	my ($self, $child) = @_;	2783	my ($self, $child) = @_;
		2784
		2785	# integerize window positions
		2786	$child->{x} = int $child->{x};
		2787	$child->{y} = int $child->{y};
2180		2788
2181	$self->SUPER::add ($child);	2789	$self->SUPER::add ($child);
2182	}	2790	}
2183		2791
2184	sub on_refresh {	2792	sub on_refresh {
…		…
2210	#############################################################################	2818	#############################################################################
2211		2819
2212	package CFClient::UI;	2820	package CFClient::UI;
2213		2821
2214	$ROOT = new CFClient::UI::Root;	2822	$ROOT = new CFClient::UI::Root;
		2823	$TOOLTIP = new CFClient::UI::Tooltip;
2215		2824
2216	1	2825	1
2217		2826

Diff Legend

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