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

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

Diff Legend

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