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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
20		21
21	sub get_layout {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};
29	}
30
31	return $LAYOUT;
32	}
33
34	sub set_layout {
35	my ($layout) = @_;
36	$LAYOUT = $layout;
37	}
38
39	sub check_tooltip {
40	if (!$GRAB) {	23	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
45	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
46		34
47	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
48		36
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		38
51	$TOOLTIP->set_tooltip_from ($widget);	39	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	40	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	41	}
63		42
64	return;	43	return;
65	}	44	}
66	}	45	}
67	}	46	}
68		47
69	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
70	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
		51	});
		52
		53	sub get_layout {
		54	my $layout;
		55
		56	for (grep { $_->{name} } values %WIDGET) {
		57	my $win = $layout->{$_->{name}} = { };
		58
		59	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		60	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		61	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		62	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		63
		64	$win->{show} = $_->{visible} && $_->{is_toplevel};
		65	}
		66
		67	$layout
		68	}
		69
		70	sub set_layout {
		71	my ($layout) = @_;
		72
		73	$LAYOUT = $layout;
71	}	74	}
72		75
73	# class methods for events	76	# class methods for events
74	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
75	$FOCUS->emit (key_down => $_[0])	78	$FOCUS->emit (key_down => $_[0])
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
119	check_tooltip;	146	check_hover $widget;
		147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	check_tooltip;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
172	sub rescale_widgets {	193	sub rescale_widgets {
173	my ($sx, $sy) = @_;	194	my ($sx, $sy) = @_;
174		195
175	for my $widget (values %WIDGET) {	196	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	197	if ($widget->{is_toplevel}) {
		198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		200
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	203	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	204	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	205	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	206	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		207
		208	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		209	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		210
183	}	211	}
184	}	212	}
185		213
186	reconfigure_widgets;	214	reconfigure_widgets;
187	}	215	}
188		216
189	#############################################################################	217	#############################################################################
190		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
191	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
192		228
193	use strict;	229	use strict;
194		230
195	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
196		232
197	sub new {	233	sub new {
198	my $class = shift;	234	my $class = shift;
199		235
200	my $self = bless {	236	my $self = bless {
201	x => 0,	237	x => "center",
202	y => 0,	238	y => "center",
203	z => 0,	239	z => 0,
		240	w => undef,
		241	h => undef,
204	can_events => 1,	242	can_events => 1,
205	@_	243	@_
206	}, $class;	244	}, $class;
		245
		246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
207		247
208	for (keys %$self) {	248	for (keys %$self) {
209	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
211	}	251	}
212	}	252	}
213		253
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		259
		260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		262
		263	$self->show if $layout->{show};
221	}	264	}
222		265
223	$self	266	$self
224	}	267	}
225		268
226	sub destroy {	269	sub destroy {
227	my ($self) = @_;	270	my ($self) = @_;
228		271
229	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
230	%$self = ();	274	%$self = ();
231	}	275	}
232		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
233	sub show {	281	sub show {
234	my ($self) = @_;	282	my ($self) = @_;
235		283
236	return if $self->{parent};	284	return if $self->{parent};
237		285
238	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
239	}
240
241	sub center {
242	my ($self) = @_;
243
244	$CFClient::UI::ROOT->on_post_alloc (
245	"center_$self" => sub {
246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247	},
248	);
249
250	$self->update;
251	}	287	}
252		288
253	sub set_visible {	289	sub set_visible {
254	my ($self) = @_;	290	my ($self) = @_;
255		291
…		…
257		293
258	$self->{root} = $self->{parent}{root};	294	$self->{root} = $self->{parent}{root};
259	$self->{visible} = $self->{parent}{visible} + 1;	295	$self->{visible} = $self->{parent}{visible} + 1;
260		296
261	$self->emit (visibility_change => 1);	297	$self->emit (visibility_change => 1);
		298
		299	$self->realloc if !exists $self->{req_w};
		300
		301	$_->set_visible for $self->children;
262	}	302	}
263		303
264	sub set_invisible {	304	sub set_invisible {
265	my ($self) = @_;	305	my ($self) = @_;
266		306
267	return unless $self->{visible};	307	return unless $self->{visible};
268		308
269	# broken show/hide model	309	$_->set_invisible for $self->children;
270		310
		311	delete $self->{visible};
271	delete $self->{root};	312	delete $self->{root};
272	delete $self->{visible};
273		313
274	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
275	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
276		316
277	CFClient::UI::check_tooltip	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
278	if $CFClient::UI::TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
279		319
280	$self->focus_out;	320	$self->emit ("focus_out");
281
282	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
283	}	322	}
284		323
285	sub set_visibility {	324	sub set_visibility {
286	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
287		326
288	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
289		328
290	$visible ? $self->hide	329	$visible ? $self->show
291	: $self->show;	330	: $self->hide;
292	}	331	}
293		332
294	sub toggle_visibility {	333	sub toggle_visibility {
295	my ($self) = @_;	334	my ($self) = @_;
296		335
…		…
306		345
307	$self->{parent}->remove ($self)	346	$self->{parent}->remove ($self)
308	if $self->{parent};	347	if $self->{parent};
309	}	348	}
310		349
311	sub move {	350	sub move_abs {
312	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
313		352
314	$self->{x} = int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
315	$self->{y} = int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
316	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
317		356
318	$self->update;	357	$self->update;
319	}	358	}
320		359
321	sub set_size {	360	sub set_size {
322	my ($self, $w, $h) = @_;	361	my ($self, $w, $h) = @_;
323		362
324	$self->{def_w} = $w;	363	$self->{force_w} = $w;
325	$self->{def_h} = $h;	364	$self->{force_h} = $h;
326		365
327	$self->check_size;	366	$self->realloc;
328	}	367	}
329		368
330	sub size_request {	369	sub size_request {
331	require Carp;	370	require Carp;
332	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
333	}	372	}
334		373
		374	sub baseline_shift {
		375	0
		376	}
		377
335	sub configure {	378	sub configure {
336	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
337		380
338	if ($self->{aspect}) {	381	if ($self->{aspect}) {
		382	my ($ow, $oh) = ($w, $h);
		383
339	my $w2 = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
340	my $h2 = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
341		386
342	# use alignment to adjust x, y	387	# use alignment to adjust x, y
343		388
344	$x += int +($w - $w2) * 0.5;	389	$x += int 0.5 * ($ow - $w);
345	$y += int +($h - $h2) * 0.5;	390	$y += int 0.5 * ($oh - $h);
346
347	($w, $h) = ($w2, $h2);
348	}	391	}
349		392
350	if ($self->{x} != $x || $self->{y} != $y) {	393	if ($self->{x} ne $x || $self->{y} ne $y) {
351	$self->{x} = $x;	394	$self->{x} = $x;
352	$self->{y} = $y;	395	$self->{y} = $y;
353	$self->update;	396	$self->update;
354	}	397	}
355		398
356	if ($self->{w} != $w || $self->{h} != $h) {	399	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];	400	return unless $self->{visible};
358	}
359	}
360		401
361	sub size_allocate {	402	$self->{alloc_w} = $w;
362	# nothing to be done	403	$self->{alloc_h} = $h;
363	}
364		404
365	sub reconfigure {	405	$self->{root}{size_alloc}{$self+0} = $self;
366	my ($self) = @_;	406	}
367
368	$self->check_size (1);
369	$self->update;
370	}	407	}
371		408
372	sub children {	409	sub children {
		410	# nop
		411	}
		412
		413	sub visible_children {
		414	$_[0]->children
373	}	415	}
374		416
375	sub set_max_size {	417	sub set_max_size {
376	my ($self, $w, $h) = @_;	418	my ($self, $w, $h) = @_;
377		419
378	delete $self->{max_w}; $self->{max_w} = $w if $w;	420	$self->{max_w} = int $w if defined $w;
379	delete $self->{max_h}; $self->{max_h} = $h if $h;	421	$self->{max_h} = int $h if defined $h;
		422
		423	$self->realloc;
380	}	424	}
381		425
382	sub set_tooltip {	426	sub set_tooltip {
383	my ($self, $tooltip) = @_;	427	my ($self, $tooltip) = @_;
384		428
…		…
387		431
388	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
389		433
390	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
391		435
392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
393	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
394	CFClient::UI::check_tooltip;	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
395	}	439	}
396	}	440	}
397		441
398	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
399	sub coord2local {	443	sub coord2local {
400	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
401		445
		446	Carp::confess unless $self->{parent};#d#
		447
402	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
403	}	449	}
404		450
405	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
406	sub coord2global {	452	sub coord2global {
407	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
408		454
		455	Carp::confess unless $self->{parent};#d#
		456
409	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
410	}	458	}
411		459
412	sub focus_in {	460	sub invoke_focus_in {
413	my ($self) = @_;	461	my ($self) = @_;
414		462
415	return if $FOCUS == $self;	463	return if $FOCUS == $self;
416	return unless $self->{can_focus};	464	return unless $self->{can_focus};
417		465
418	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
419		467
420	$self->_emit (focus_in => $focus);	468	$self->update;
421		469
422	$focus->update if $focus;	470	0
423	$FOCUS->update;
424	}	471	}
425		472
426	sub focus_out {	473	sub invoke_focus_out {
427	my ($self) = @_;	474	my ($self) = @_;
428		475
429	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
430		477
431	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
432		479
433	$self->_emit (focus_out => $focus);	480	$self->update;
434		481
435	$focus->update if $focus; #?
436
437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
438	unless $FOCUS;	483	unless $FOCUS;
439	}
440		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
441	sub mouse_motion { }	495	sub invoke_mouse_motion { 0 }
442	sub button_up { }	496	sub invoke_button_up { 0 }
443	sub key_down { }	497	sub invoke_key_down { 0 }
444	sub key_up { }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
445		500
446	sub button_down {	501	sub invoke_button_down {
447	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
448		503
449	$self->focus_in;	504	$self->grab_focus;
450	}
451		505
452	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	506	0
453	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	507	}
454	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	508
455	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	509	sub connect {
456	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
		532
		533	sub emit {
		534	my ($self, $signal, @args) = @_;
		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
		556	#sub find_widget {
		557	# in .xs
		558
		559	sub set_parent {
		560	my ($self, $parent) = @_;
		561
		562	CFPlus::weaken ($self->{parent} = $parent);
		563	$self->set_visible if $parent->{visible};
		564	}
		565
		566	sub realloc {
		567	my ($self) = @_;
		568
		569	if ($self->{visible}) {
		570	return if $self->{root}{realloc}{$self+0};
		571
		572	$self->{root}{realloc}{$self+0} = $self;
		573	$self->{root}->update;
		574	} else {
		575	delete $self->{req_w};
		576	delete $self->{req_h};
		577	}
		578	}
		579
		580	sub update {
		581	my ($self) = @_;
		582
		583	$self->{parent}->update
		584	if $self->{parent};
		585	}
		586
		587	sub reconfigure {
		588	my ($self) = @_;
		589
		590	$self->realloc;
		591	$self->update;
		592	}
		593
		594	# using global variables seems a bit hacky, but passing through all drawing
		595	# functions seems pointless.
		596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457		597
458	sub draw {	598	sub draw {
459	my ($self) = @_;	599	my ($self) = @_;
460		600
461	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
		602
		603	# update screen rectangle
		604	local $draw_x = $draw_x + $self->{x};
		605	local $draw_y = $draw_y + $self->{y};
		606
		607	# skip widgets that are entirely outside the drawing area
		608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462		610
463	glPushMatrix;	611	glPushMatrix;
464	glTranslate $self->{x}, $self->{y}, 0;	612	glTranslate $self->{x}, $self->{y}, 0;
465	$self->_draw;
466	glPopMatrix;
467		613
468	if ($self == $HOVER && $self->{can_hover}) {	614	if ($self == $HOVER && $self->{can_hover}) {
469	my ($x, $y) = @$self{qw(x y)};
470
471	glColor 1, 0.8, 0.5, 0.2;	615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472	glEnable GL_BLEND;	616	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474	glBegin GL_QUADS;	618	glBegin GL_QUADS;
475	glVertex $x , $y;	619	glVertex 0 , 0;
476	glVertex $x + $self->{w}, $y;	620	glVertex $self->{w}, 0;
477	glVertex $x + $self->{w}, $y + $self->{h};	621	glVertex $self->{w}, $self->{h};
478	glVertex $x , $y + $self->{h};	622	glVertex 0 , $self->{h};
479	glEnd;	623	glEnd;
480	glDisable GL_BLEND;	624	glDisable GL_BLEND;
481	}	625	}
482		626
483	if ($ENV{PCLIENT_DEBUG}) {	627	if ($ENV{CFPLUS_DEBUG} & 1) {
484	glPushMatrix;	628	glPushMatrix;
485	glColor 1, 1, 0, 1;	629	glColor 1, 1, 0, 1;
486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	630	glTranslate 0.375, 0.375;
487	glBegin GL_LINE_LOOP;	631	glBegin GL_LINE_LOOP;
488	glVertex 0 , 0;	632	glVertex 0 , 0;
489	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
490	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
491	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
492	glEnd;	636	glEnd;
493	glPopMatrix;	637	glPopMatrix;
494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
495	}	639	}
		640
		641	$self->_draw;
		642	glPopMatrix;
496	}	643	}
497		644
498	sub _draw {	645	sub _draw {
499	my ($self) = @_;	646	my ($self) = @_;
500		647
501	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
502	}	649	}
503		650
504	sub find_widget {	651	my $cntx;#d#
505	my ($self, $x, $y) = @_;
506
507	return () unless $self->{can_events};
508
509	return $self
510	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513	()
514	}
515
516	sub set_parent {
517	my ($self, $parent) = @_;
518
519	Scalar::Util::weaken ($self->{parent} = $parent);
520
521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523	$self->check_size;
524	}
525
526	sub check_size {
527	my ($self, $forced) = @_;
528
529	$self->{force_alloc} = 1 if $forced;
530	$CFClient::UI::ROOT->{check_size}{$self} = $self;
531	}
532
533	sub update {
534	my ($self) = @_;
535
536	$self->{parent}->update
537	if $self->{parent};
538	}
539
540	sub connect {
541	my ($self, $signal, $cb) = @_;
542
543	push @{ $self->{signal_cb}{$signal} }, $cb;
544	}
545
546	sub _emit {
547	my ($self, $signal, @args) = @_;
548
549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550	}
551
552	sub emit {
553	my ($self, $signal, @args) = @_;
554
555	$self->_emit ($signal, @args)
556	|| $self->$signal (@args);
557	}
558
559	sub visibility_change {
560	#my ($self, $visible) = @_;
561	}
562
563	sub DESTROY {	652	sub DESTROY {
564	my ($self) = @_;	653	my ($self) = @_;
565		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
566	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
567	#$self->deactivate;
568	}	661	}
569		662
570	#############################################################################	663	#############################################################################
571		664
572	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
573		666
574	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
575		668
576	use strict;	669	use strict;
577	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
578		671
579	sub new {	672	sub new {
580	my $class = shift;	673	my $class = shift;
581		674
582	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
597		690
598	if ($color && (@$color < 4 || $color->[3])) {	691	if ($color && (@$color < 4 || $color->[3])) {
599	my ($w, $h) = @$self{qw(w h)};	692	my ($w, $h) = @$self{qw(w h)};
600		693
601	glEnable GL_BLEND;	694	glEnable GL_BLEND;
602	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603	glColor @$color;	696	glColor_premultiply @$color;
604		697
605	glBegin GL_QUADS;	698	glBegin GL_QUADS;
606	glVertex 0 , 0;	699	glVertex 0 , 0;
607	glVertex 0 , $h;	700	glVertex 0 , $h;
608	glVertex $w, $h;	701	glVertex $w, $h;
…		…
613	}	706	}
614	}	707	}
615		708
616	#############################################################################	709	#############################################################################
617		710
618	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
619		712
620	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
621		714
622	sub new {	715	sub new {
623	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
624	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
625	}	718	}
626		719
627	sub size_request {	720	sub size_request {
628	(0, 0)	721	my ($self) = @_;
		722
		723	($self->{w} + 0, $self->{h} + 0)
629	}	724	}
630		725
631	sub draw { }	726	sub draw { }
632		727
633	#############################################################################	728	#############################################################################
634		729
635	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
636		731
637	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
638		733
639	sub new {	734	sub new {
640	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
641		736
642	my $children = delete $arg{children} || [];	737	my $children = delete $arg{children};
643		738
644	my $self = $class->SUPER::new (	739	my $self = $class->SUPER::new (
645	children => [],	740	children => [],
646	can_events => 0,	741	can_events => 0,
647	%arg,	742	%arg,
648	);	743	);
		744
649	$self->add ($_) for @$children;	745	$self->add (@$children)
		746	if $children;
650		747
651	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
652	}	757	}
653		758
654	sub add {	759	sub add {
655	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
656		761
…		…
662	$self->{children} = [	767	$self->{children} = [
663	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
664	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
665	];	770	];
666		771
667	$self->check_size (1);	772	$self->realloc;
668	$self->update;
669	}	773	}
670		774
671	sub children {	775	sub children {
672	@{ $_[0]{children} }	776	@{ $_[0]{children} }
673	}	777	}
…		…
678	delete $child->{parent};	782	delete $child->{parent};
679	$child->hide;	783	$child->hide;
680		784
681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	785	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682		786
683	$self->check_size (1);	787	$self->realloc;
684	$self->update;
685	}	788	}
686		789
687	sub clear {	790	sub clear {
688	my ($self) = @_;	791	my ($self) = @_;
689		792
…		…
693	for (@$children) {	796	for (@$children) {
694	delete $_->{parent};	797	delete $_->{parent};
695	$_->hide;	798	$_->hide;
696	}	799	}
697		800
698	$self->check_size;	801	$self->realloc;
699	$self->update;
700	}	802	}
701		803
702	sub find_widget {	804	sub find_widget {
703	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
704		806
705	$x -= $self->{x};	807	$x -= $self->{x};
706	$y -= $self->{y};	808	$y -= $self->{y};
707		809
708	my $res;	810	my $res;
709		811
710	for (reverse @{ $self->{children} }) {	812	for (reverse $self->visible_children) {
711	$res = $_->find_widget ($x, $y)	813	$res = $_->find_widget ($x, $y)
712	and return $res;	814	and return $res;
713	}	815	}
714		816
715	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	817	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
721	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
722	}	824	}
723		825
724	#############################################################################	826	#############################################################################
725		827
726	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
727		829
728	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
729		831
730	sub new {	832	sub new {
731	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
732		834
733	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
734		836
735	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
736	}	838	}
737		839
738	sub add {	840	sub add {
739	my ($self, $child) = @_;	841	my ($self, $child) = @_;
740		842
741	$self->{children} = [];	843	$self->SUPER::remove ($_) for @{ $self->{children} };
742
743	$self->SUPER::add ($child);	844	$self->SUPER::add ($child);
744	}	845	}
745		846
746	sub remove {	847	sub remove {
747	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
748		849
749	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
750		851
751	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
752	unless @{$self->{children}};	853	unless @{$self->{children}};
753	}	854	}
754		855
755	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
756		857
757	sub size_request {	858	sub size_request {
758	$_[0]{children}[0]->size_request	859	$_[0]{children}[0]->size_request
759	}	860	}
760		861
761	sub size_allocate {	862	sub invoke_size_allocate {
762	my ($self, $w, $h) = @_;	863	my ($self, $w, $h) = @_;
763		864
764	$self->{children}[0]->configure (0, 0, $w, $h);	865	$self->{children}[0]->configure (0, 0, $w, $h);
		866
		867	1
765	}	868	}
766		869
767	#############################################################################	870	#############################################################################
768		871
		872	# back-buffered drawing area
		873
769	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
770		875
771	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
772		877
773	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
774		879
775	sub new {	880	sub new {
776	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
777		882
778	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
783		888
784	$ROOT->on_post_alloc ($self => sub { $self->render_child });	889	$ROOT->on_post_alloc ($self => sub { $self->render_child });
785	$self->SUPER::update;	890	$self->SUPER::update;
786	}	891	}
787		892
788	sub size_allocate {	893	sub invoke_size_allocate {
789	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
790		895
791	$self->SUPER::size_allocate ($w, $h);
792	$self->update;	896	$self->update;
		897
		898	$self->SUPER::invoke_size_allocate ($w, $h)
793	}	899	}
794		900
795	sub _render {	901	sub _render {
		902	my ($self) = @_;
		903
796	$_[0]{children}[0]->draw;	904	$self->{children}[0]->draw;
797	}	905	}
798		906
799	sub render_child {	907	sub render_child {
800	my ($self) = @_;	908	my ($self) = @_;
801		909
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
805		913
		914	{
		915	package CFPlus::UI::Base;
		916
		917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		918	(0, 0, $self->{w}, $self->{h});
		919
806	$self->_render;	920	$self->_render;
		921	}
807	};	922	};
808	}	923	}
809		924
810	sub _draw {	925	sub _draw {
811	my ($self) = @_;	926	my ($self) = @_;
812
813	my ($w, $h) = ($self->w, $self->h);
814		927
815	my $tex = $self->{texture}	928	my $tex = $self->{texture}
816	or return;	929	or return;
817		930
818	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820	glColor 1, 1, 1, 1;	933	glColor 0, 0, 0, 1;
821		934
822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
823		936
824	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
825	}	938	}
826		939
827	#############################################################################	940	#############################################################################
828		941
829	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
830		943
		944	use List::Util qw(min max);
		945
831	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
832		947
833	sub new {	948	sub new {
834	my $class = shift;	949	my $class = shift;
835		950
836	$class->SUPER::new (	951	$class->SUPER::new (
…		…
841	}	956	}
842		957
843	sub size_request {	958	sub size_request {
844	my ($self) = @_;	959	my ($self) = @_;
845		960
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		962
848	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
850		965
851	($w, $h)	966	($w, $h)
852	}	967	}
853		968
854	sub size_allocate {	969	sub invoke_size_allocate {
855	my ($self, $w, $h) = @_;	970	my ($self, $w, $h) = @_;
856		971
		972	my $child = $self->child;
		973
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	974	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	975	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		976
860	$self->child->configure (0, 0, $w, $h);	977	$self->child->configure (0, 0, $w, $h);
861	$self->update;	978	$self->update;
		979
		980	1
862	}	981	}
863		982
864	sub set_offset {	983	sub set_offset {
865	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
866		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
867	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
868	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
869		992
		993	$self->emit (changed => $x, $y);
870	$self->update;	994	$self->update;
		995	}
871	}	996	}
872		997
873	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
874	sub coord2local {	999	sub coord2local {
875	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
890	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
891		1016
892	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
894	) {	1019	) {
895	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896	} else {	1021	} else {
897	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
898	}	1023	}
899	}	1024	}
900		1025
901	sub _render {	1026	sub _render {
902	my ($self) = @_;	1027	my ($self) = @_;
903		1028
		1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1031
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		1033
906	$self->SUPER::_render;	1034	$self->SUPER::_render;
907	}	1035	}
908		1036
909	#############################################################################	1037	#############################################################################
910		1038
911	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
912		1040
913	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
914		1042
915	sub new {	1043	sub new {
916	my $class = shift;	1044	my ($class, %arg) = @_;
		1045
		1046	my $child = delete $arg{child};
917		1047
918	my $self;	1048	my $self;
919		1049
920	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
921	vertical => 1,	1060	vertical => 1,
922	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
923	on_changed => sub {	1062	on_changed => sub {
924	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
925	},	1065	},
926	;	1066	;
927		1067
928	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
930	slider => $slider,	1072	hslider => $hslider,
931	@_,	1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
		1076	%arg,
932	);	1077	);
933		1078
934	$self->{vp}->add ($self->{scrolled});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
935	$self->add ($self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
936	$self->add ($self->{slider});	1094
		1095	$self->add ($child) if $child;
937		1096
938	$self	1097	$self
939	}	1098	}
940		1099
		1100	#TODO# update range on size_allocate depending on child
		1101
		1102	sub add {
		1103	my ($self, $widget) = @_;
		1104
		1105	$self->{vp}->add ($self->{child} = $widget);
		1106	}
		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
941	sub update {	1132	sub update {
942	my ($self) = @_;	1133	my ($self) = @_;
943		1134
		1135	$self->update_slider;
944	$self->SUPER::update;	1136	$self->SUPER::update;
945
946	# todo: overwrite size_allocate of child
947	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1137	}
950		1138
		1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
		1192	}
		1193
951	sub size_allocate {	1194	sub invoke_size_allocate {
952	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
953		1196
		1197	$self->update_slider;
954	$self->SUPER::size_allocate ($w, $h);	1198	$self->SUPER::invoke_size_allocate ($w, $h)
955
956	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1199	}
959
960	#TODO# update range on size_allocate depending on child
961	# update viewport offset on scroll
962		1200
963	#############################################################################	1201	#############################################################################
964		1202
965	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
966		1204
967	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
968		1206
969	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
970		1208
971	sub new {	1209	sub new {
972	my $class = shift;	1210	my $class = shift;
973		1211
974	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
982		1220
983	if ($self->{bg}) {	1221	if ($self->{bg}) {
984	my ($w, $h) = @$self{qw(w h)};	1222	my ($w, $h) = @$self{qw(w h)};
985		1223
986	glEnable GL_BLEND;	1224	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988	glColor @{ $self->{bg} };	1226	glColor_premultiply @{ $self->{bg} };
989		1227
990	glBegin GL_QUADS;	1228	glBegin GL_QUADS;
991	glVertex 0 , 0;	1229	glVertex 0 , 0;
992	glVertex 0 , $h;	1230	glVertex 0 , $h;
993	glVertex $w, $h;	1231	glVertex $w, $h;
…		…
1000	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1001	}	1239	}
1002		1240
1003	#############################################################################	1241	#############################################################################
1004		1242
1005	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1006		1244
1007	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1008		1246
1009	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
1010
1011	my @tex =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1248
1015	sub new {	1249	sub new {
1016	my $class = shift;	1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
		1348
		1349	my $bg =
		1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1351	mipmap => 1, wrap => 1;
		1352
		1353	my @border =
		1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
		1361	sub new {
		1362	my ($class, %arg) = @_;
1017		1363
1018	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1367	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1368	can_events => 1,
1024	@_	1369	min_w => 64,
		1370	min_h => 32,
		1371	%arg,
1025	);	1372	);
1026		1373
1027	$self->{title} &&= new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1028	align => 0,	1375	align => 0,
1029	valign => 1,	1376	valign => 1,
1030	text => $self->{title},	1377	text => $self->{title},
1031	fontsize => $self->{border};	1378	fontsize => $self->{border},
		1379	if exists $self->{title};
		1380
		1381	if ($self->{has_close_button}) {
		1382	$self->{close_button} =
		1383	new CFPlus::UI::ImageButton
		1384	path => 'x1_close.png',
		1385	on_activate => sub { $self->emit ("delete") };
		1386
		1387	$self->CFPlus::UI::Container::add ($self->{close_button});
		1388	}
1032		1389
1033	$self	1390	$self
		1391	}
		1392
		1393	sub add {
		1394	my ($self, @widgets) = @_;
		1395
		1396	$self->SUPER::add (@widgets);
		1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034	}	1399	}
1035		1400
1036	sub border {	1401	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1038	}	1403	}
1039		1404
1040	sub size_request {	1405	sub size_request {
1041	my ($self) = @_;	1406	my ($self) = @_;
		1407
		1408	$self->{title_widget}->size_request
		1409	if $self->{title_widget};
		1410
		1411	$self->{close_button}->size_request
		1412	if $self->{close_button};
1042		1413
1043	my ($w, $h) = $self->SUPER::size_request;	1414	my ($w, $h) = $self->SUPER::size_request;
1044		1415
1045	(	1416	(
1046	$w + $self->border * 2,	1417	$w + $self->border * 2,
1047	$h + $self->border * 2,	1418	$h + $self->border * 2,
1048	)	1419	)
1049	}	1420	}
1050		1421
1051	sub size_allocate {	1422	sub invoke_size_allocate {
1052	my ($self, $w, $h) = @_;	1423	my ($self, $w, $h) = @_;
1053		1424
		1425	if ($self->{title_widget}) {
		1426	$self->{title_widget}{w} = $w;
		1427	$self->{title_widget}{h} = $h;
		1428	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1429	}
		1430
		1431	my $border = $self->border;
		1432
1054	$h -= List::Util::max 0, $self->border * 2;	1433	$h -= List::Util::max 0, $border * 2;
1055	$w -= List::Util::max 0, $self->border * 2;	1434	$w -= List::Util::max 0, $border * 2;
1056		1435
1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058	if $self->{title};
1059
1060	$self->child->configure ($self->border, $self->border, $w, $h);	1436	$self->child->configure ($border, $border, $w, $h);
1061	}
1062		1437
		1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1439	if $self->{close_button};
		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
		1449	1
		1450	}
		1451
1063	sub button_down {	1452	sub invoke_button_down {
1064	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
1065		1454
1066	my ($w, $h) = @$self{qw(w h)};	1455	my ($w, $h) = @$self{qw(w h)};
1067	my $border = $self->border;	1456	my $border = $self->border;
1068		1457
…		…
1081	my ($ev, $x, $y) = @_;	1470	my ($ev, $x, $y) = @_;
1082		1471
1083	my $dx = $ev->{x} - $ox;	1472	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1473	my $dy = $ev->{y} - $oy;
1085		1474
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1475	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1476	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1477
1091	$self->check_size;	1478	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1479	$self->realloc;
1092	};	1480	};
1093		1481
1094	} elsif ($lr ^ $td) {	1482	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1483	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1484	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1486	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1487	my ($ev, $x, $y) = @_;
1100		1488
1101	($x, $y) = ($ev->{x}, $ev->{y});	1489	($x, $y) = ($ev->{x}, $ev->{y});
1102		1490
1103	$self->{user_x} = $bx + $x - $ox;	1491	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104	$self->{user_y} = $by + $y - $oy;	1492	# HACK: the next line is required to enforce placement
1105		1493	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106	$self->move ($self->{user_x}, $self->{user_y});
1107	$self->update;
1108	};	1494	};
		1495	} else {
		1496	return 0;
		1497	}
		1498
1109	}	1499	1
1110	}	1500	}
1111		1501
1112	sub button_up {	1502	sub invoke_button_up {
1113	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1114		1504
1115	delete $self->{motion};	1505	! ! delete $self->{motion}
1116	}	1506	}
1117		1507
1118	sub mouse_motion {	1508	sub invoke_mouse_motion {
1119	my ($self, $ev, $x, $y) = @_;	1509	my ($self, $ev, $x, $y) = @_;
1120		1510
1121	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1512
		1513	! ! $self->{motion}
		1514	}
		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
1122	}	1522	}
1123		1523
1124	sub _draw {	1524	sub _draw {
1125	my ($self) = @_;	1525	my ($self) = @_;
1126		1526
		1527	my $child = $self->{children}[0];
		1528
1127	my ($w, $h ) = ($self->{w}, $self->{h});	1529	my ($w, $h ) = ($self->{w}, $self->{h});
1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1530	my ($cw, $ch) = ($child->{w}, $child->{h});
1129		1531
1130	glEnable GL_TEXTURE_2D;	1532	glEnable GL_TEXTURE_2D;
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1534
1133	my $border = $self->border;	1535	my $border = $self->border;
1134		1536
1135	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1136	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1137	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1138	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1140		1556
1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142	my $bg = $tex[0];	1558	glColor @{ $self->{bg} };
1143		1559
1144	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
		1561	# solve this better(?)
1145	my $rep_x = $cw / $bg->{w};	1562	$bg->{s} = $cw / $bg->{w};
1146	my $rep_y = $ch / $bg->{h};	1563	$bg->{t} = $ch / $bg->{h};
1147
1148	glColor @{ $self->{bg} };
1149
1150	$bg->{s} = $rep_x;
1151	$bg->{t} = $rep_y;
1152	$bg->{wrap_mode} = 1;
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1564	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1565	}
1155		1566
1156	glDisable GL_TEXTURE_2D;	1567	glDisable GL_TEXTURE_2D;
1157		1568
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1569	$child->draw;
		1570
		1571	if ($self->{title_widget}) {
		1572	glTranslate 0, $border - $self->{h};
		1573	$self->{title_widget}->_draw;
		1574
		1575	glTranslate 0, - ($border - $self->{h});
		1576	}
		1577
		1578	$self->{close_button}->draw
		1579	if $self->{close_button};
1161	}	1580	}
1162		1581
1163	#############################################################################	1582	#############################################################################
1164		1583
1165	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1166		1585
1167	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1168		1587
1169	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1170		1589
1171	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1172		1591
1173	sub new {	1592	sub new {
1174	my $class = shift;	1593	my $class = shift;
1175		1594
1176	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1177	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1178	@_,	1599	@_,
1179	)	1600	)
1180	}	1601	}
1181		1602
1182	sub children {	1603	sub children {
1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1184	}	1605	}
1185		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1186	sub add {	1608	sub add {
1187	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1188		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} ||= 1;
		1625	$child->{colspan} ||= 1;
		1626
1189	$child->set_parent ($self);	1627	$child->set_parent ($self);
1190	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
		1629	}
1191		1630
1192	$self->check_size (1);	1631	$self->{force_realloc} = 1;
		1632	$self->{force_size_alloc} = 1;
		1633	$self->realloc;
		1634	}
		1635
		1636	sub remove {
		1637	my ($self, $child) = @_;
		1638
		1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ || [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1193	}	1644	}
1194		1645
1195	# TODO: move to container class maybe? send children a signal on removal?	1646	# TODO: move to container class maybe? send children a signal on removal?
1196	sub clear {	1647	sub clear {
1197	my ($self) = @_;	1648	my ($self) = @_;
…		…
1202	for (@children) {	1653	for (@children) {
1203	delete $_->{parent};	1654	delete $_->{parent};
1204	$_->hide;	1655	$_->hide;
1205	}	1656	}
1206		1657
1207	$self->check_size (1);	1658	$self->realloc;
1208	$self->update;
1209	}	1659	}
1210		1660
1211	sub get_wh {	1661	sub get_wh {
1212	my ($self) = @_;	1662	my ($self) = @_;
1213		1663
1214	my (@w, @h);	1664	my (@w, @h);
1215		1665
1216	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1217	my $row = $self->{children}[$y]
1218	or next;
1219		1667
1220	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1221	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1222	or next;
1223	my ($w, $h) = @$widget{qw(req_w req_h)};
1224		1670
1225	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1226	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1227	}	1680	}
1228	}	1681	}
1229		1682
1230	(\@w, \@h)	1683	(\@w, \@h)
1231	}	1684	}
…		…
1239	(sum @$ws),	1692	(sum @$ws),
1240	(sum @$hs),	1693	(sum @$hs),
1241	)	1694	)
1242	}	1695	}
1243		1696
1244	sub size_allocate {	1697	sub invoke_size_allocate {
1245	my ($self, $w, $h) = @_;	1698	my ($self, $w, $h) = @_;
1246		1699
1247	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1248		1701
1249	my $req_w = (sum @$ws) || 1;	1702	my $req_w = (sum @$ws) || 1;
1250	my $req_h = (sum @$hs) || 1;	1703	my $req_h = (sum @$hs) || 1;
1251		1704
1252	# TODO: nicer code && do row_expand	1705	# now linearly scale the rows/columns to the allocated size
1253	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1254	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1255	my $col_expand = (sum @col_expand) || 1;	1708	my $col_expand = (sum @col_expand) || 1;
1256		1709
1257	# linearly scale sizes
1258	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1259	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1260		1711
1261	CFClient::UI::harmonize $ws;	1712	CFPlus::UI::harmonize $ws;
		1713
		1714	my @row_expand = @{$self->{row_expand}};
		1715	@row_expand = (1) x @$ws unless @row_expand;
		1716	my $row_expand = (sum @row_expand) || 1;
		1717
		1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1719
1262	CFClient::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1263		1721
1264	my $y;	1722	my (@x, @y);
1265		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1266	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1267	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1268	or next;
1269		1729
1270	my $x = 0;	1730	$widget->configure (
1271	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1272		1733	);
1273	for my $c (0 .. $#$row) {	1734	}
1274	my $col_w = $ws->[$c];
1275		1735
1276	if (my $widget = $row->[$c]) {
1277	$widget->configure ($x, $y, $col_w, $row_h);
1278	}
1279
1280	$x += $col_w;
1281	}
1282
1283	$y += $row_h;
1284	}	1736	1
1285
1286	}	1737	}
1287		1738
1288	sub find_widget {	1739	sub find_widget {
1289	my ($self, $x, $y) = @_;	1740	my ($self, $x, $y) = @_;
1290		1741
…		…
1309	}	1760	}
1310	}	1761	}
1311		1762
1312	#############################################################################	1763	#############################################################################
1313		1764
1314	package CFClient::UI::Box;	1765	package CFPlus::UI::Fixed;
1315		1766
		1767	use List::Util qw(min max);
		1768
1316	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub add {
		1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1773
		1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1775	$self->SUPER::add ($child);
		1776	}
		1777
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub size_request {
		1787	my ($self) = @_;
		1788
		1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1790
		1791	# determine overall size by querying abs widgets
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	if ($pos eq "abs") {
		1796	$w = _scale $size, $w, $child->{req_w};
		1797	$h = _scale $size, $h, $child->{req_h};
		1798
		1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1801	}
		1802	}
		1803
		1804	my $W = $x2 - $x1;
		1805	my $H = $y2 - $y1;
		1806
		1807	# now layout remaining widgets
		1808	for my $child ($self->visible_children) {
		1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1810
		1811	if ($pos ne "abs") {
		1812	$x = _scale $pos, $x, $W;
		1813	$y = _scale $pos, $x, $H;
		1814	$w = _scale $size, $w, $child->{req_w};
		1815	$h = _scale $size, $h, $child->{req_h};
		1816
		1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1819	}
		1820	}
		1821
		1822	my $W = $x2 - $x1;
		1823	my $H = $y2 - $y1;
		1824
		1825	($W, $H)
		1826	}
		1827
		1828	sub invoke_size_allocate {
		1829	my ($self, $W, $H) = @_;
		1830
		1831	for my $child ($self->visible_children) {
		1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1833
		1834	$x = _scale $pos, $x, $W;
		1835	$y = _scale $pos, $x, $H;
		1836	$w = _scale $size, $w, $child->{req_w};
		1837	$h = _scale $size, $h, $child->{req_h};
		1838
		1839	$child->configure ($x, $y, $w, $h);
		1840	}
		1841
		1842	1
		1843	}
		1844
		1845	#############################################################################
		1846
		1847	package CFPlus::UI::Box;
		1848
		1849	our @ISA = CFPlus::UI::Container::;
1317		1850
1318	sub size_request {	1851	sub size_request {
1319	my ($self) = @_;	1852	my ($self) = @_;
1320		1853
1321	$self->{vertical}	1854	$self->{vertical}
…		…
1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1860	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1861	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1329	)	1862	)
1330	}	1863	}
1331		1864
1332	sub size_allocate {	1865	sub invoke_size_allocate {
1333	my ($self, $w, $h) = @_;	1866	my ($self, $w, $h) = @_;
1334		1867
1335	my $space = $self->{vertical} ? $h : $w;	1868	my $space = $self->{vertical} ? $h : $w;
1336	my $children = $self->{children};	1869	my @children = $self->visible_children;
1337		1870
1338	my @req;	1871	my @req;
1339		1872
1340	if ($self->{homogeneous}) {	1873	if ($self->{homogeneous}) {
1341	@req = ($space / (@$children || 1)) x @$children;	1874	@req = ($space / (@children || 1)) x @children;
1342	} else {	1875	} else {
1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1876	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344	my $req = List::Util::sum @req;	1877	my $req = List::Util::sum @req;
1345		1878
1346	if ($req > $space) {	1879	if ($req > $space) {
1347	# ah well, not enough space	1880	# ah well, not enough space
1348	$_ *= $space / $req for @req;	1881	$_ *= $space / $req for @req;
1349	} else {	1882	} else {
1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1883	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351		1884
1352	$space = ($space - $req) / $expand; # remaining space to give away	1885	$space = ($space - $req) / $expand; # remaining space to give away
1353		1886
1354	$req[$_] += $space * $children->[$_]{expand}	1887	$req[$_] += $space * $children[$_]{expand}
1355	for 0 .. $#$children;	1888	for 0 .. $#children;
1356	}	1889	}
1357	}	1890	}
1358		1891
1359	CFClient::UI::harmonize \@req;	1892	CFPlus::UI::harmonize \@req;
1360		1893
1361	my $pos = 0;	1894	my $pos = 0;
1362	for (0 .. $#$children) {	1895	for (0 .. $#children) {
1363	my $alloc = $req[$_];	1896	my $alloc = $req[$_];
1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1897	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365		1898
1366	$pos += $alloc;	1899	$pos += $alloc;
1367	}	1900	}
1368		1901
1369	1	1902	1
1370	}	1903	}
1371		1904
1372	#############################################################################	1905	#############################################################################
1373		1906
1374	package CFClient::UI::HBox;	1907	package CFPlus::UI::HBox;
1375		1908
1376	our @ISA = CFClient::UI::Box::;	1909	our @ISA = CFPlus::UI::Box::;
1377		1910
1378	sub new {	1911	sub new {
1379	my $class = shift;	1912	my $class = shift;
1380		1913
1381	$class->SUPER::new (	1914	$class->SUPER::new (
…		…
1384	)	1917	)
1385	}	1918	}
1386		1919
1387	#############################################################################	1920	#############################################################################
1388		1921
1389	package CFClient::UI::VBox;	1922	package CFPlus::UI::VBox;
1390		1923
1391	our @ISA = CFClient::UI::Box::;	1924	our @ISA = CFPlus::UI::Box::;
1392		1925
1393	sub new {	1926	sub new {
1394	my $class = shift;	1927	my $class = shift;
1395		1928
1396	$class->SUPER::new (	1929	$class->SUPER::new (
…		…
1399	)	1932	)
1400	}	1933	}
1401		1934
1402	#############################################################################	1935	#############################################################################
1403		1936
1404	package CFClient::UI::Label;	1937	package CFPlus::UI::Label;
1405		1938
1406	our @ISA = CFClient::UI::DrawBG::;	1939	our @ISA = CFPlus::UI::DrawBG::;
1407		1940
1408	use CFClient::OpenGL;	1941	use CFPlus::OpenGL;
1409		1942
1410	sub new {	1943	sub new {
1411	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1412		1945
1413	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
…		…
1416	#active_bg => none	1949	#active_bg => none
1417	#font => default_font	1950	#font => default_font
1418	#text => initial text	1951	#text => initial text
1419	#markup => initial narkup	1952	#markup => initial narkup
1420	#max_w => maximum pixel width	1953	#max_w => maximum pixel width
		1954	#style => 0, # render flags
1421	ellipsise => 3, # end	1955	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1956	layout => (new CFPlus::Layout),
1423	fontsize => 1,	1957	fontsize => 1,
1424	align => -1,	1958	align => -1,
1425	valign => -1,	1959	valign => -1,
1426	padding => 2,	1960	padding_x => 2,
		1961	padding_y => 2,
1427	can_events => 0,	1962	can_events => 0,
1428	%arg	1963	%arg
1429	);	1964	);
1430		1965
1431	if (exists $self->{template}) {	1966	if (exists $self->{template}) {
1432	my $layout = new CFClient::Layout;	1967	my $layout = new CFPlus::Layout;
1433	$layout->set_text (delete $self->{template});	1968	$layout->set_text (delete $self->{template});
1434	$self->{template} = $layout;	1969	$self->{template} = $layout;
1435	}	1970	}
1436		1971
1437	if (exists $self->{markup}) {	1972	if (exists $self->{markup}) {
…		…
1441	}	1976	}
1442		1977
1443	$self	1978	$self
1444	}	1979	}
1445		1980
1446	sub escape($) {
1447	local $_ = $_[0];
1448
1449	s/&/&amp;/g;
1450	s/>/&gt;/g;
1451	s/</&lt;/g;
1452
1453	$_
1454	}
1455
1456	sub update {	1981	sub update {
1457	my ($self) = @_;	1982	my ($self) = @_;
1458		1983
1459	delete $self->{texture};	1984	delete $self->{texture};
1460	$self->SUPER::update;	1985	$self->SUPER::update;
1461	}	1986	}
1462		1987
		1988	sub realloc {
		1989	my ($self) = @_;
		1990
		1991	delete $self->{ox};
		1992	$self->SUPER::realloc;
		1993	}
		1994
1463	sub set_text {	1995	sub set_text {
1464	my ($self, $text) = @_;	1996	my ($self, $text) = @_;
1465		1997
1466	return if $self->{text} eq "T$text";	1998	return if $self->{text} eq "T$text";
1467	$self->{text} = "T$text";	1999	$self->{text} = "T$text";
1468		2000
1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470	$self->{layout}->set_text ($text);	2001	$self->{layout}->set_text ($text);
1471		2002
		2003	delete $self->{size_req};
		2004	$self->realloc;
1472	$self->update;	2005	$self->update;
1473	$self->check_size;
1474	}	2006	}
1475		2007
1476	sub set_markup {	2008	sub set_markup {
1477	my ($self, $markup) = @_;	2009	my ($self, $markup) = @_;
1478		2010
1479	return if $self->{text} eq "M$markup";	2011	return if $self->{text} eq "M$markup";
1480	$self->{text} = "M$markup";	2012	$self->{text} = "M$markup";
1481		2013
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2014	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		2015
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	2016	$self->{layout}->set_markup ($markup);
1486		2017
		2018	delete $self->{size_req};
		2019	$self->realloc;
1487	$self->update;	2020	$self->update;
1488	$self->check_size;
1489	}	2021	}
1490		2022
1491	sub size_request {	2023	sub size_request {
1492	my ($self) = @_;	2024	my ($self) = @_;
1493		2025
		2026	$self->{size_req} ||= do {
1494	$self->{layout}->set_font ($self->{font}) if $self->{font};	2027	$self->{layout}->set_font ($self->{font}) if $self->{font};
1495	$self->{layout}->set_width ($self->{max_w} || -1);	2028	$self->{layout}->set_width ($self->{max_w} || -1);
1496	$self->{layout}->set_ellipsise ($self->{ellipsise});	2029	$self->{layout}->set_ellipsise ($self->{ellipsise});
1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2030	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499		2032
1500	my ($w, $h) = $self->{layout}->size;	2033	my ($w, $h) = $self->{layout}->size;
1501		2034
1502	if (exists $self->{template}) {	2035	if (exists $self->{template}) {
1503	$self->{template}->set_font ($self->{font}) if $self->{font};	2036	$self->{template}->set_font ($self->{font}) if $self->{font};
		2037	$self->{template}->set_width ($self->{max_w} || -1);
1504	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		2039
1506	my ($w2, $h2) = $self->{template}->size;	2040	my ($w2, $h2) = $self->{template}->size;
1507		2041
1508	$w = List::Util::max $w, $w2;	2042	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	2043	$h = List::Util::max $h, $h2;
		2044	}
		2045
		2046	[$w, $h]
1510	}	2047	};
1511		2048
1512	(	2049	@{ $self->{size_req} }
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	2050	}
1517		2051
		2052	sub baseline_shift {
		2053	$_[0]{layout}->descent
		2054	}
		2055
1518	sub size_allocate {	2056	sub invoke_size_allocate {
1519	my ($self, $w, $h) = @_;	2057	my ($self, $w, $h) = @_;
1520		2058
		2059	delete $self->{ox};
		2060
1521	delete $self->{texture};	2061	delete $self->{texture}
		2062	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2063
		2064	1
1522	}	2065	}
1523		2066
1524	sub set_fontsize {	2067	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	2068	my ($self, $fontsize) = @_;
1526		2069
1527	$self->{fontsize} = $fontsize;	2070	$self->{fontsize} = $fontsize;
		2071	delete $self->{size_req};
1528	delete $self->{texture};	2072	delete $self->{texture};
1529		2073
1530	$self->update;	2074	$self->realloc;
1531	$self->check_size;	2075	}
		2076
		2077	sub reconfigure {
		2078	my ($self) = @_;
		2079
		2080	delete $self->{size_req};
		2081	delete $self->{texture};
		2082
		2083	$self->SUPER::reconfigure;
1532	}	2084	}
1533		2085
1534	sub _draw {	2086	sub _draw {
1535	my ($self) = @_;	2087	my ($self) = @_;
1536		2088
1537	$self->SUPER::_draw; # draw background, if applicable	2089	$self->SUPER::_draw; # draw background, if applicable
1538		2090
1539	my $tex = $self->{texture} ||= do {	2091	my $size = $self->{texture} ||= do {
1540	$self->{layout}->set_foreground (@{$self->{fg}});	2092	$self->{layout}->set_foreground (@{$self->{fg}});
1541	$self->{layout}->set_font ($self->{font}) if $self->{font};	2093	$self->{layout}->set_font ($self->{font}) if $self->{font};
1542	$self->{layout}->set_width ($self->{w});	2094	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	2095	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2096	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		2098
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	2099	[$self->{layout}->size]
1548
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551	: ($self->{w} - $tex->{w}) * 0.5);
1552
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	2100	};
1559		2101
1560	glEnable GL_TEXTURE_2D;	2102	unless (exists $self->{ox}) {
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2103	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
		2104	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
		2105	: ($self->{w} - $size->[0]) * 0.5);
1562		2106
1563	if ($tex->{format} == GL_ALPHA) {	2107	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564	glColor @{$self->{fg}};	2108	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	2109	: ($self->{h} - $size->[1]) * 0.5);
1566	} else {
1567	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568	}	2110	};
1569		2111
1570	glDisable GL_TEXTURE_2D;	2112	my $w = List::Util::min $self->{w} + 4, $size->[0];
		2113	my $h = List::Util::min $self->{h} + 2, $size->[1];
		2114
		2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1571	}	2116	}
1572		2117
1573	#############################################################################	2118	#############################################################################
1574		2119
1575	package CFClient::UI::EntryBase;	2120	package CFPlus::UI::EntryBase;
1576		2121
1577	our @ISA = CFClient::UI::Label::;	2122	our @ISA = CFPlus::UI::Label::;
1578		2123
1579	use CFClient::OpenGL;	2124	use CFPlus::OpenGL;
1580		2125
1581	sub new {	2126	sub new {
1582	my $class = shift;	2127	my $class = shift;
1583		2128
1584	$class->SUPER::new (	2129	$class->SUPER::new (
…		…
1588	active_fg => [0, 0, 0],	2133	active_fg => [0, 0, 0],
1589	can_hover => 1,	2134	can_hover => 1,
1590	can_focus => 1,	2135	can_focus => 1,
1591	valign => 0,	2136	valign => 0,
1592	can_events => 1,	2137	can_events => 1,
		2138	ellipsise => 0,
1593	#text => ...	2139	#text => ...
		2140	#hidden => "*",
1594	@_	2141	@_
1595	)	2142	)
1596	}	2143	}
1597		2144
1598	sub _set_text {	2145	sub _set_text {
…		…
1600		2147
1601	delete $self->{cur_h};	2148	delete $self->{cur_h};
1602		2149
1603	return if $self->{text} eq $text;	2150	return if $self->{text} eq $text;
1604		2151
1605	delete $self->{texture};
1606
1607	$self->{last_activity} = $::NOW;	2152	$self->{last_activity} = $::NOW;
1608	$self->{text} = $text;	2153	$self->{text} = $text;
1609		2154
1610	$text =~ s/./*/g if $self->{hidden};	2155	$text =~ s/./*/g if $self->{hidden};
1611	$self->{layout}->set_text ("$text ");	2156	$self->{layout}->set_text ("$text ");
		2157	delete $self->{size_req};
1612		2158
1613	$self->_emit (changed => $self->{text});	2159	$self->emit (changed => $self->{text});
		2160
		2161	$self->realloc;
		2162	$self->update;
1614	}	2163	}
1615		2164
1616	sub set_text {	2165	sub set_text {
1617	my ($self, $text) = @_;	2166	my ($self, $text) = @_;
1618		2167
1619	$self->{cursor} = length $text;	2168	$self->{cursor} = length $text;
1620	$self->_set_text ($text);	2169	$self->_set_text ($text);
1621	$self->update;
1622	$self->check_size;
1623	}	2170	}
1624		2171
1625	sub get_text {	2172	sub get_text {
1626	$_[0]{text}	2173	$_[0]{text}
1627	}	2174	}
…		…
1632	my ($w, $h) = $self->SUPER::size_request;	2179	my ($w, $h) = $self->SUPER::size_request;
1633		2180
1634	($w + 1, $h) # add 1 for cursor	2181	($w + 1, $h) # add 1 for cursor
1635	}	2182	}
1636		2183
1637	sub key_down {	2184	sub invoke_key_down {
1638	my ($self, $ev) = @_;	2185	my ($self, $ev) = @_;
1639		2186
1640	my $mod = $ev->{mod};	2187	my $mod = $ev->{mod};
1641	my $sym = $ev->{sym};	2188	my $sym = $ev->{sym};
1642	my $uni = $ev->{unicode};	2189	my $uni = $ev->{unicode};
1643		2190
1644	my $text = $self->get_text;	2191	my $text = $self->get_text;
		2192
		2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1645		2194
1646	if ($uni == 8) {	2195	if ($uni == 8) {
1647	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1648	} elsif ($uni == 127) {	2197	} elsif ($uni == 127) {
1649	substr $text, $self->{cursor}, 1, "";	2198	substr $text, $self->{cursor}, 1, "";
1650	} elsif ($sym == CFClient::SDLK_LEFT) {	2199	} elsif ($sym == CFPlus::SDLK_LEFT) {
1651	--$self->{cursor} if $self->{cursor};	2200	--$self->{cursor} if $self->{cursor};
1652	} elsif ($sym == CFClient::SDLK_RIGHT) {	2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1653	++$self->{cursor} if $self->{cursor} < length $self->{text};	2202	++$self->{cursor} if $self->{cursor} < length $self->{text};
1654	} elsif ($sym == CFClient::SDLK_HOME) {	2203	} elsif ($sym == CFPlus::SDLK_HOME) {
		2204	# what a hack
		2205	$self->{cursor} =
		2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2207	? length $1
		2208	: 0;
		2209	} elsif ($sym == CFPlus::SDLK_END) {
		2210	# uh, again
		2211	$self->{cursor} =
		2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2213	? $self->{cursor} + length $1
		2214	: length $self->{text};
		2215	} elsif ($uni == 21) { # ctrl-u
		2216	$text = "";
1655	$self->{cursor} = 0;	2217	$self->{cursor} = 0;
1656	} elsif ($sym == CFClient::SDLK_END) {
1657	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	2218	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	2219	$self->emit ('escape');
1660	} elsif ($uni) {	2220	} elsif ($uni == 0x0d) {
		2221	substr $text, $self->{cursor}++, 0, "\012";
		2222	} elsif ($uni >= 0x20) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	2223	substr $text, $self->{cursor}++, 0, chr $uni;
		2224	} else {
		2225	return 0;
1662	}	2226	}
1663		2227
1664	$self->_set_text ($text);	2228	$self->_set_text ($text);
		2229
		2230	$self->realloc;
1665	$self->update;	2231	$self->update;
1666	$self->check_size;
1667	}
1668		2232
		2233	1
		2234	}
		2235
1669	sub focus_in {	2236	sub invoke_focus_in {
1670	my ($self) = @_;	2237	my ($self) = @_;
1671		2238
1672	$self->{last_activity} = $::NOW;	2239	$self->{last_activity} = $::NOW;
1673		2240
1674	$self->SUPER::focus_in;	2241	$self->SUPER::invoke_focus_in
1675	}	2242	}
1676		2243
1677	sub button_down {	2244	sub invoke_button_down {
1678	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
1679		2246
1680	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::invoke_button_down ($ev, $x, $y);
1681		2248
1682	my $idx = $self->{layout}->xy_to_index ($x, $y);	2249	my $idx = $self->{layout}->xy_to_index ($x, $y);
1683		2250
1684	# byte-index to char-index	2251	# byte-index to char-index
1685	my $text = $self->{text};	2252	my $text = $self->{text};
1686	utf8::encode $text;	2253	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	2254	$self->{cursor} = length $text;
1688		2255
1689	$self->_set_text ($self->{text});	2256	$self->_set_text ($self->{text});
1690	$self->update;	2257	$self->update;
		2258
		2259	1
1691	}	2260	}
1692		2261
1693	sub mouse_motion {	2262	sub invoke_mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	2263	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2264	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2265
		2266	1
1696	}	2267	}
1697		2268
1698	sub _draw {	2269	sub _draw {
1699	my ($self) = @_;	2270	my ($self) = @_;
1700		2271
1701	local $self->{fg} = $self->{fg};	2272	local $self->{fg} = $self->{fg};
1702		2273
1703	if ($FOCUS == $self) {	2274	if ($FOCUS == $self) {
1704	glColor @{$self->{active_bg}};	2275	glColor_premultiply @{$self->{active_bg}};
1705	$self->{fg} = $self->{active_fg};	2276	$self->{fg} = $self->{active_fg};
1706	} else {	2277	} else {
1707	glColor @{$self->{bg}};	2278	glColor_premultiply @{$self->{bg}};
1708	}	2279	}
1709		2280
1710	glEnable GL_BLEND;	2281	glEnable GL_BLEND;
1711	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2282	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712	glBegin GL_QUADS;	2283	glBegin GL_QUADS;
1713	glVertex 0 , 0;	2284	glVertex 0 , 0;
1714	glVertex 0 , $self->{h};	2285	glVertex 0 , $self->{h};
1715	glVertex $self->{w}, $self->{h};	2286	glVertex $self->{w}, $self->{h};
1716	glVertex $self->{w}, 0;	2287	glVertex $self->{w}, 0;
…		…
1727	utf8::encode $text;	2298	utf8::encode $text;
1728		2299
1729	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1730	}	2301	}
1731		2302
1732	glColor @{$self->{fg}};
1733	glBegin GL_LINES;	2303	glBegin GL_LINES;
1734	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1735	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1736	glEnd;	2306	glEnd;
1737	}	2307	}
1738	}	2308	}
1739		2309
		2310	#############################################################################
		2311
1740	package CFClient::UI::Entry;	2312	package CFPlus::UI::Entry;
1741		2313
1742	our @ISA = CFClient::UI::EntryBase::;	2314	our @ISA = CFPlus::UI::EntryBase::;
1743		2315
1744	use CFClient::OpenGL;	2316	use CFPlus::OpenGL;
1745		2317
1746	sub key_down {	2318	sub invoke_key_down {
1747	my ($self, $ev) = @_;	2319	my ($self, $ev) = @_;
1748		2320
1749	my $sym = $ev->{sym};	2321	my $sym = $ev->{sym};
1750		2322
1751	if ($sym == 13) {	2323	if ($ev->{uni} == 0x0d || $sym == 13) {
1752	unshift @{$self->{history}},	2324	unshift @{$self->{history}},
1753	my $txt = $self->get_text;	2325	my $txt = $self->get_text;
		2326
1754	$self->{history_pointer} = -1;	2327	$self->{history_pointer} = -1;
1755	$self->{history_saveback} = '';	2328	$self->{history_saveback} = '';
1756	$self->_emit (activate => $txt);	2329	$self->emit (activate => $txt);
1757	$self->update;	2330	$self->update;
1758		2331
1759	} elsif ($sym == CFClient::SDLK_UP) {	2332	} elsif ($sym == CFPlus::SDLK_UP) {
1760	if ($self->{history_pointer} < 0) {	2333	if ($self->{history_pointer} < 0) {
1761	$self->{history_saveback} = $self->get_text;	2334	$self->{history_saveback} = $self->get_text;
1762	}	2335	}
1763	if (@{$self->{history} || []} > 0) {	2336	if (@{$self->{history} || []} > 0) {
1764	$self->{history_pointer}++;	2337	$self->{history_pointer}++;
…		…
1766	$self->{history_pointer} = @{$self->{history} || []} - 1;	2339	$self->{history_pointer} = @{$self->{history} || []} - 1;
1767	}	2340	}
1768	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1769	}	2342	}
1770		2343
1771	} elsif ($sym == CFClient::SDLK_DOWN) {	2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
1772	$self->{history_pointer}--;	2345	$self->{history_pointer}--;
1773	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1774		2347
1775	if ($self->{history_pointer} >= 0) {	2348	if ($self->{history_pointer} >= 0) {
1776	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1777	} else {	2350	} else {
1778	$self->set_text ($self->{history_saveback});	2351	$self->set_text ($self->{history_saveback});
1779	}	2352	}
1780		2353
1781	} else {	2354	} else {
1782	$self->SUPER::key_down ($ev);	2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
1783	}	2358	1
1784
1785	}	2359	}
1786		2360
1787	#############################################################################	2361	#############################################################################
1788		2362
		2363	package CFPlus::UI::TextEdit;
		2364
		2365	our @ISA = CFPlus::UI::EntryBase::;
		2366
		2367	use CFPlus::OpenGL;
		2368
		2369	sub move_cursor_ver {
		2370	my ($self, $dy) = @_;
		2371
		2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2373
		2374	$y += $dy;
		2375
		2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2377	$self->{cursor} = $index;
		2378	delete $self->{cur_h};
		2379	$self->update;
		2380	return;
		2381	}
		2382	}
		2383
		2384	sub invoke_key_down {
		2385	my ($self, $ev) = @_;
		2386
		2387	my $sym = $ev->{sym};
		2388
		2389	if ($sym == CFPlus::SDLK_UP) {
		2390	$self->move_cursor_ver (-1);
		2391	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2392	$self->move_cursor_ver (+1);
		2393	} else {
		2394	return $self->SUPER::invoke_key_down ($ev)
		2395	}
		2396
		2397	1
		2398	}
		2399
		2400	#############################################################################
		2401
1789	package CFClient::UI::Button;	2402	package CFPlus::UI::Button;
1790		2403
1791	our @ISA = CFClient::UI::Label::;	2404	our @ISA = CFPlus::UI::Label::;
1792		2405
1793	use CFClient::OpenGL;	2406	use CFPlus::OpenGL;
1794		2407
1795	my @tex =	2408	my @tex =
1796	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1797	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
1798		2411
1799	sub new {	2412	sub new {
1800	my $class = shift;	2413	my $class = shift;
1801		2414
1802	$class->SUPER::new (	2415	$class->SUPER::new (
1803	padding => 4,	2416	padding_x => 4,
		2417	padding_y => 4,
1804	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
1805	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
1806	can_hover => 1,	2420	can_hover => 1,
1807	align => 0,	2421	align => 0,
1808	valign => 0,	2422	valign => 0,
1809	can_events => 1,	2423	can_events => 1,
1810	@_	2424	@_
1811	)	2425	)
1812	}	2426	}
1813		2427
1814	sub activate { }
1815
1816	sub button_up {	2428	sub invoke_button_up {
1817	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
1818		2430
1819	$self->emit ("activate")	2431	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	2432	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	2433	&& $y >= 0 && $y < $self->{h};
		2434
		2435	1
1822	}	2436	}
1823		2437
1824	sub _draw {	2438	sub _draw {
1825	my ($self) = @_;	2439	my ($self) = @_;
1826		2440
1827	local $self->{fg} = $self->{fg};	2441	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829	if ($GRAB == $self) {
1830	$self->{fg} = $self->{active_fg};
1831	}
1832		2442
1833	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
1834	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
1836		2446
		2447	my $tex = $tex[$GRAB == $self];
1837	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1838		2449
1839	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
1840		2451
1841	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
1842	}	2453	}
1843		2454
1844	#############################################################################	2455	#############################################################################
1845		2456
1846	package CFClient::UI::CheckBox;	2457	package CFPlus::UI::CheckBox;
1847		2458
1848	our @ISA = CFClient::UI::DrawBG::;	2459	our @ISA = CFPlus::UI::DrawBG::;
1849		2460
1850	my @tex =	2461	my @tex =
1851	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1852	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1853		2464
1854	use CFClient::OpenGL;	2465	use CFPlus::OpenGL;
1855		2466
1856	sub new {	2467	sub new {
1857	my $class = shift;	2468	my $class = shift;
1858		2469
1859	$class->SUPER::new (	2470	$class->SUPER::new (
1860	padding => 2,	2471	padding_x => 2,
		2472	padding_y => 2,
1861	fg => [1, 1, 1],	2473	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	2474	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	2475	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	2476	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	2477	state => 0,
…		…
1869	}	2481	}
1870		2482
1871	sub size_request {	2483	sub size_request {
1872	my ($self) = @_;	2484	my ($self) = @_;
1873		2485
1874	($self->{padding} * 2 + 6) x 2	2486	(6) x 2
1875	}	2487	}
1876		2488
		2489	sub toggle {
		2490	my ($self) = @_;
		2491
		2492	$self->{state} = !$self->{state};
		2493	$self->emit (changed => $self->{state});
		2494	$self->update;
		2495	}
		2496
1877	sub button_down {	2497	sub invoke_button_down {
1878	my ($self, $ev, $x, $y) = @_;	2498	my ($self, $ev, $x, $y) = @_;
1879		2499
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2500	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2501	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	2502	$self->toggle;
1883	$self->_emit (changed => $self->{state});	2503	} else {
		2504	return 0
		2505	}
		2506
1884	}	2507	1
1885	}	2508	}
1886		2509
1887	sub _draw {	2510	sub _draw {
1888	my ($self) = @_;	2511	my ($self) = @_;
1889		2512
1890	$self->SUPER::_draw;	2513	$self->SUPER::_draw;
1891		2514
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2515	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		2516
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2517	my ($w, $h) = @$self{qw(w h)};
		2518
		2519	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		2520
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2521	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		2522
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	2523	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		2524
…		…
1902	glDisable GL_TEXTURE_2D;	2527	glDisable GL_TEXTURE_2D;
1903	}	2528	}
1904		2529
1905	#############################################################################	2530	#############################################################################
1906		2531
1907	package CFClient::UI::Image;	2532	package CFPlus::UI::Image;
1908		2533
1909	our @ISA = CFClient::UI::Base::;	2534	our @ISA = CFPlus::UI::Base::;
1910		2535
1911	use CFClient::OpenGL;	2536	use CFPlus::OpenGL;
1912	use Carp qw/confess/;
1913		2537
1914	our %loaded_images;	2538	our %texture_cache;
1915		2539
1916	sub new {	2540	sub new {
1917	my $class = shift;	2541	my $class = shift;
1918		2542
1919	my $self = $class->SUPER::new (can_events => 0, @_);	2543	my $self = $class->SUPER::new (
		2544	can_events => 0,
		2545	@_,
		2546	);
1920		2547
1921	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2548	$self->{path} || $self->{tex}
		2549	or Carp::croak "'path' or 'tex' attributes required";
1922		2550
1923	$loaded_images{$self->{image}} ||=	2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1924	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1925		2553
1926	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2554	CFPlus::weaken $texture_cache{$self->{path}};
1927		2555
1928	Scalar::Util::weaken $loaded_images{$self->{image}};	2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930	$self->{aspect} = $tex->{w} / $tex->{h};
1931		2557
1932	$self	2558	$self
1933	}	2559	}
1934		2560
		2561	sub STORABLE_freeze {
		2562	my ($self, $cloning) = @_;
		2563
		2564	$self->{path}
		2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2566
		2567	$self->{path}
		2568	}
		2569
		2570	sub STORABLE_attach {
		2571	my ($self, $cloning, $path) = @_;
		2572
		2573	$self->new (path => $path)
		2574	}
		2575
1935	sub size_request {	2576	sub size_request {
1936	my ($self) = @_;	2577	my ($self) = @_;
1937		2578
1938	($self->{tex}->{w}, $self->{tex}->{h})	2579	($self->{tex}{w}, $self->{tex}{h})
1939	}	2580	}
1940		2581
1941	sub _draw {	2582	sub _draw {
1942	my ($self) = @_;	2583	my ($self) = @_;
1943		2584
…		…
1953	}	2594	}
1954		2595
1955	glEnable GL_TEXTURE_2D;	2596	glEnable GL_TEXTURE_2D;
1956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1957		2598
1958	$tex->draw_quad_alpha (0, 0, $w, $h);	2599	$tex->draw_quad (0, 0, $w, $h);
1959		2600
1960	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
1961	}	2602	}
1962		2603
1963	#############################################################################	2604	#############################################################################
1964		2605
		2606	package CFPlus::UI::ImageButton;
		2607
		2608	our @ISA = CFPlus::UI::Image::;
		2609
		2610	use CFPlus::OpenGL;
		2611
		2612	my %textures;
		2613
		2614	sub new {
		2615	my $class = shift;
		2616
		2617	my $self = $class->SUPER::new (
		2618	padding_x => 4,
		2619	padding_y => 4,
		2620	fg => [1, 1, 1],
		2621	active_fg => [0, 0, 1],
		2622	can_hover => 1,
		2623	align => 0,
		2624	valign => 0,
		2625	can_events => 1,
		2626	@_
		2627	);
		2628	}
		2629
		2630	sub invoke_button_up {
		2631	my ($self, $ev, $x, $y) = @_;
		2632
		2633	$self->emit ("activate")
		2634	if $x >= 0 && $x < $self->{w}
		2635	&& $y >= 0 && $y < $self->{h};
		2636
		2637	1
		2638	}
		2639
		2640	#############################################################################
		2641
1965	package CFClient::UI::VGauge;	2642	package CFPlus::UI::VGauge;
1966		2643
1967	our @ISA = CFClient::UI::Base::;	2644	our @ISA = CFPlus::UI::Base::;
1968		2645
1969	use List::Util qw(min max);	2646	use List::Util qw(min max);
1970		2647
1971	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
1972		2649
1973	my %tex = (	2650	my %tex = (
1974	food => [	2651	food => [
1975	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1976	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1977	],	2654	],
1978	grace => [	2655	grace => [
1979	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1980	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1981	],	2658	],
1982	hp => [	2659	hp => [
1983	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1984	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1985	],	2662	],
1986	mana => [	2663	mana => [
1987	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1988	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1989	],	2666	],
1990	);	2667	);
1991		2668
1992	# eg. VGauge->new (gauge => 'food'), default gauge: food	2669	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2052	my $ycut1 = max 0, min 1, $ycut;	2729	my $ycut1 = max 0, min 1, $ycut;
2053	my $ycut2 = max 0, min 1, $ycut - 1;	2730	my $ycut2 = max 0, min 1, $ycut - 1;
2054		2731
2055	my $h1 = $self->{h} * (1 - $ycut1);	2732	my $h1 = $self->{h} * (1 - $ycut1);
2056	my $h2 = $self->{h} * (1 - $ycut2);	2733	my $h2 = $self->{h} * (1 - $ycut2);
		2734	my $h3 = $self->{h};
		2735
		2736	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057		2737
2058	glEnable GL_BLEND;	2738	glEnable GL_BLEND;
2059	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2739	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2740	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glEnable GL_TEXTURE_2D;	2741	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2742	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2743
2063	glBindTexture GL_TEXTURE_2D, $t1->{name};	2744	glBindTexture GL_TEXTURE_2D, $t1->{name};
2064	glBegin GL_QUADS;	2745	glBegin GL_QUADS;
…		…
2079		2760
2080	if ($t3) {	2761	if ($t3) {
2081	glBindTexture GL_TEXTURE_2D, $t3->{name};	2762	glBindTexture GL_TEXTURE_2D, $t3->{name};
2082	glBegin GL_QUADS;	2763	glBegin GL_QUADS;
2083	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2764	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2765	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2766	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2767	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087	glEnd;	2768	glEnd;
2088	}	2769	}
2089		2770
2090	glDisable GL_BLEND;	2771	glDisable GL_BLEND;
2091	glDisable GL_TEXTURE_2D;	2772	glDisable GL_TEXTURE_2D;
2092	}	2773	}
2093		2774
2094	#############################################################################	2775	#############################################################################
2095		2776
2096	package CFClient::UI::Gauge;	2777	package CFPlus::UI::Gauge;
2097		2778
2098	our @ISA = CFClient::UI::VBox::;	2779	our @ISA = CFPlus::UI::VBox::;
2099		2780
2100	sub new {	2781	sub new {
2101	my ($class, %arg) = @_;	2782	my ($class, %arg) = @_;
2102		2783
2103	my $self = $class->SUPER::new (	2784	my $self = $class->SUPER::new (
…		…
2105	can_hover => 1,	2786	can_hover => 1,
2106	can_events => 1,	2787	can_events => 1,
2107	%arg,	2788	%arg,
2108	);	2789	);
2109		2790
2110	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2791	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2111	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2792	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2112	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2113		2794
2114	$self	2795	$self
2115	}	2796	}
2116		2797
2117	sub set_fontsize {	2798	sub set_fontsize {
…		…
2138	$self->{value}->set_text ($val);	2819	$self->{value}->set_text ($val);
2139	}	2820	}
2140		2821
2141	#############################################################################	2822	#############################################################################
2142		2823
2143	package CFClient::UI::Slider;	2824	package CFPlus::UI::Slider;
2144		2825
2145	use strict;	2826	use strict;
2146		2827
2147	use CFClient::OpenGL;	2828	use CFPlus::OpenGL;
2148		2829
2149	our @ISA = CFClient::UI::DrawBG::;	2830	our @ISA = CFPlus::UI::DrawBG::;
2150		2831
2151	my @tex =	2832	my @tex =
2152	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2153	qw(s1_slider.png s1_slider_bg.png);	2834	qw(s1_slider.png s1_slider_bg.png);
2154		2835
2155	sub new {	2836	sub new {
2156	my $class = shift;	2837	my $class = shift;
2157		2838
…		…
2164	fg => [1, 1, 1],	2845	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2846	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2847	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2848	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2849	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2850	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2851	min_h => $::WIDTH / 80,
2171	vertical => 0,	2852	vertical => 0,
2172	can_hover => 1,	2853	can_hover => 1,
2173	inner_pad => 0.02,	2854	inner_pad => 0.02,
2174	@_	2855	@_
2175	);	2856	);
…		…
2183	sub set_range {	2864	sub set_range {
2184	my ($self, $range) = @_;	2865	my ($self, $range) = @_;
2185		2866
2186	($range, $self->{range}) = ($self->{range}, $range);	2867	($range, $self->{range}) = ($self->{range}, $range);
2187		2868
2188	$self->update
2189	if "@$range" ne "@{$self->{range}}";	2869	if ("@$range" ne "@{$self->{range}}") {
		2870	$self->update;
		2871	$self->set_value ($self->{range}[0]);
		2872	}
2190	}	2873	}
2191		2874
2192	sub set_value {	2875	sub set_value {
2193	my ($self, $value) = @_;	2876	my ($self, $value) = @_;
2194		2877
…		…
2205	if $unit;	2888	if $unit;
2206		2889
2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2890	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2208		2891
2209	if ($value != $old_value) {	2892	if ($value != $old_value) {
2210	$self->_emit (changed => $value);	2893	$self->emit (changed => $value);
2211	$self->update;	2894	$self->update;
2212	}	2895	}
2213	}	2896	}
2214		2897
2215	sub size_request {	2898	sub size_request {
2216	my ($self) = @_;	2899	my ($self) = @_;
2217		2900
2218	my $w = $self->{req_w};	2901	($self->{req_w}, $self->{req_h})
2219	my $h = $self->{req_h};
2220
2221	$self->{vertical} ? ($h, $w) : ($w, $h)
2222	}	2902	}
2223		2903
2224	sub button_down {	2904	sub invoke_button_down {
2225	my ($self, $ev, $x, $y) = @_;	2905	my ($self, $ev, $x, $y) = @_;
2226		2906
2227	$self->SUPER::button_down ($ev, $x, $y);	2907	$self->SUPER::invoke_button_down ($ev, $x, $y);
2228		2908
2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2909	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230		2910
2231	$self->mouse_motion ($ev, $x, $y);	2911	$self->invoke_mouse_motion ($ev, $x, $y)
2232	}	2912	}
2233		2913
2234	sub mouse_motion {	2914	sub invoke_mouse_motion {
2235	my ($self, $ev, $x, $y) = @_;	2915	my ($self, $ev, $x, $y) = @_;
2236		2916
2237	if ($GRAB == $self) {	2917	if ($GRAB == $self) {
2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2918	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2239		2919
2240	my (undef, $lo, $hi, $page) = @{$self->{range}};	2920	my (undef, $lo, $hi, $page) = @{$self->{range}};
2241		2921
2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2922	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243		2923
2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2924	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2925	} else {
		2926	return 0;
		2927	}
		2928
2245	}	2929	1
		2930	}
		2931
		2932	sub invoke_mouse_wheel {
		2933	my ($self, $ev) = @_;
		2934
		2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2936
		2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2938
		2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2940
		2941	! ! $delta
2246	}	2942	}
2247		2943
2248	sub update {	2944	sub update {
2249	my ($self) = @_;	2945	my ($self) = @_;
2250		2946
2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2947	delete $self->{knob_w};
		2948	$self->SUPER::update;
		2949	}
		2950
		2951	sub _draw {
		2952	my ($self) = @_;
		2953
		2954	unless ($self->{knob_w}) {
2252	$self->set_value ($self->{range}[0]);	2955	$self->set_value ($self->{range}[0]);
2253		2956
2254	my ($value, $lo, $hi, $page) = @{$self->{range}};	2957	my ($value, $lo, $hi, $page) = @{$self->{range}};
2255	my $range = ($hi - $page - $lo) || 1e-100;	2958	my $range = ($hi - $page - $lo) || 1e-100;
2256		2959
…		…
2262	$value = ($value - $lo) / $range;	2965	$value = ($value - $lo) / $range;
2263	$value = $value * $self->{scale} + $self->{offset};	2966	$value = $value * $self->{scale} + $self->{offset};
2264		2967
2265	$self->{knob_x} = $value - $knob_w * 0.5;	2968	$self->{knob_x} = $value - $knob_w * 0.5;
2266	$self->{knob_w} = $knob_w;	2969	$self->{knob_w} = $knob_w;
2267	});	2970	}
2268
2269	$self->SUPER::update;
2270	}
2271
2272	sub _draw {
2273	my ($self) = @_;
2274		2971
2275	$self->SUPER::_draw ();	2972	$self->SUPER::_draw ();
2276		2973
2277	glScale $self->{w}, $self->{h};	2974	glScale $self->{w}, $self->{h};
2278		2975
…		…
2298	glDisable GL_TEXTURE_2D;	2995	glDisable GL_TEXTURE_2D;
2299	}	2996	}
2300		2997
2301	#############################################################################	2998	#############################################################################
2302		2999
2303	package CFClient::UI::ValSlider;	3000	package CFPlus::UI::ValSlider;
2304		3001
2305	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2306		3003
2307	sub new {	3004	sub new {
2308	my ($class, %arg) = @_;	3005	my ($class, %arg) = @_;
2309		3006
2310	my $range = delete $arg{range};	3007	my $range = delete $arg{range};
2311		3008
2312	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2315	to_value => sub { shift },	3012	to_value => sub { shift },
2316	from_value => sub { shift },	3013	from_value => sub { shift },
2317	%arg,	3014	%arg,
2318	);	3015	);
2319		3016
…		…
2339	sub set_range { shift->{slider}->set_range (@_) }	3036	sub set_range { shift->{slider}->set_range (@_) }
2340	sub set_value { shift->{slider}->set_value (@_) }	3037	sub set_value { shift->{slider}->set_value (@_) }
2341		3038
2342	#############################################################################	3039	#############################################################################
2343		3040
2344	package CFClient::UI::TextView;	3041	package CFPlus::UI::TextScroller;
2345		3042
2346	our @ISA = CFClient::UI::HBox::;	3043	our @ISA = CFPlus::UI::HBox::;
2347		3044
2348	use CFClient::OpenGL;	3045	use CFPlus::OpenGL;
2349		3046
2350	sub new {	3047	sub new {
2351	my $class = shift;	3048	my $class = shift;
2352		3049
2353	my $self = $class->SUPER::new (	3050	my $self = $class->SUPER::new (
2354	fontsize => 1,	3051	fontsize => 1,
2355	can_events => 0,	3052	can_events => 1,
		3053	indent => 0,
2356	#font => default_font	3054	#font => default_font
2357	@_,	3055	@_,
2358		3056
2359	layout => (new CFClient::Layout 1),	3057	layout => (new CFPlus::Layout),
2360	par => [],	3058	par => [],
		3059	max_par => 0,
2361	height => 0,	3060	height => 0,
2362	children => [	3061	children => [
2363	(new CFClient::UI::Empty expand => 1),	3062	(new CFPlus::UI::Empty expand => 1),
2364	(new CFClient::UI::Slider vertical => 1),	3063	(new CFPlus::UI::Slider vertical => 1),
2365	],	3064	],
2366	);	3065	);
2367		3066
2368	$self->{children}[1]->connect (changed => sub { $self->update });	3067	$self->{children}[1]->connect (changed => sub { $self->update });
2369		3068
…		…
2375		3074
2376	$self->{fontsize} = $fontsize;	3075	$self->{fontsize} = $fontsize;
2377	$self->reflow;	3076	$self->reflow;
2378	}	3077	}
2379		3078
		3079	sub size_request {
		3080	my ($self) = @_;
		3081
		3082	my ($empty, $slider) = @{ $self->{children} };
		3083
		3084	local $self->{children} = [$empty, $slider];
		3085	$self->SUPER::size_request
		3086	}
		3087
2380	sub size_allocate {	3088	sub invoke_size_allocate {
2381	my ($self, $w, $h) = @_;	3089	my ($self, $w, $h) = @_;
2382		3090
2383	$self->SUPER::size_allocate ($w, $h);	3091	my ($empty, $slider, @other) = @{ $self->{children} };
		3092	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2384		3093
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	3094	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3095	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	3096	$self->{layout}->set_width ($empty->{w});
		3097	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388		3098
2389	$self->reflow;	3099	$self->reflow;
2390	}
2391		3100
2392	sub text_size {	3101	local $self->{children} = [$empty, $slider];
		3102	$self->SUPER::invoke_size_allocate ($w, $h)
		3103	}
		3104
		3105	sub invoke_mouse_wheel {
2393	my ($self, $text, $indent) = @_;	3106	my ($self, $ev) = @_;
		3107
		3108	return 0 unless $ev->{dy}; # only vertical movements
		3109
		3110	$self->{children}[1]->emit (mouse_wheel => $ev);
		3111
		3112	1
		3113	}
		3114
		3115	sub get_layout {
		3116	my ($self, $para) = @_;
2394		3117
2395	my $layout = $self->{layout};	3118	my $layout = $self->{layout};
2396		3119
		3120	$layout->set_font ($self->{font}) if $self->{font};
		3121	$layout->set_foreground (@{$para->{fg}});
2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3122	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398	$layout->set_width ($self->{children}[0]{w} - $indent);	3123	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3124	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399	$layout->set_markup ($text);	3125	$layout->set_markup ($para->{markup});
		3126
		3127	$layout->set_shapes (
		3128	map
		3129	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3130	@{$para->{widget}}
2400		3131	);
		3132
2401	$layout->size	3133	$layout
2402	}	3134	}
2403		3135
2404	sub reflow {	3136	sub reflow {
2405	my ($self) = @_;	3137	my ($self) = @_;
2406		3138
…		…
2413		3145
2414	# todo: base offset on lines or so, not on pixels	3146	# todo: base offset on lines or so, not on pixels
2415	$self->{children}[1]->set_value ($offset);	3147	$self->{children}[1]->set_value ($offset);
2416	}	3148	}
2417		3149
		3150	sub current_paragraph {
		3151	my ($self) = @_;
		3152
		3153	$self->{top_paragraph} - 1
		3154	}
		3155
		3156	sub scroll_to {
		3157	my ($self, $para) = @_;
		3158
		3159	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3160
		3161	$self->{scroll_to} = $para;
		3162	$self->update;
		3163	}
		3164
2418	sub clear {	3165	sub clear {
2419	my ($self) = @_;	3166	my ($self) = @_;
		3167
		3168	my (undef, undef, @other) = @{ $self->{children} };
		3169	$self->remove ($_) for @other;
2420		3170
2421	$self->{par} = [];	3171	$self->{par} = [];
2422	$self->{height} = 0;	3172	$self->{height} = 0;
2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3173	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424	}	3174	}
2425		3175
2426	sub add_paragraph {	3176	sub add_paragraph {
2427	my ($self, $color, $text, $indent) = @_;	3177	my $self = shift;
2428		3178
2429	for my $line (split /\n/, $text) {	3179	for my $para (@_) {
2430	my ($w, $h) = $self->text_size ($line);	3180	$para = {
		3181	fg => [1, 1, 1, 1],
		3182	indent => 0,
		3183	markup => "",
		3184	widget => [],
		3185	ref $para ? %$para : (markup => $para),
		3186	w => 1e10,
		3187	wrapped => 1,
		3188	};
		3189
		3190	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3191	push @{$self->{par}}, $para;
		3192	}
		3193
		3194	if (my $max = $self->{max_par}) {
		3195	shift @{$self->{par}} while @{$self->{par}} > $max;
		3196	}
		3197
		3198	$self->{need_reflow}++;
		3199	$self->update;
		3200	}
		3201
		3202	sub scroll_to_bottom {
		3203	my ($self) = @_;
		3204
		3205	$self->{scroll_to} = $#{$self->{par}};
		3206	$self->update;
		3207	}
		3208
		3209	sub force_uptodate {
		3210	my ($self) = @_;
		3211
		3212	if (delete $self->{need_reflow}) {
		3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3214
		3215	my $height = 0;
		3216
		3217	for my $para (@{$self->{par}}) {
		3218	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3219	my $layout = $self->get_layout ($para);
		3220	my ($w, $h) = $layout->size;
		3221
		3222	$para->{w} = $w + $para->{indent};
		3223	$para->{h} = $h;
		3224	$para->{wrapped} = $layout->has_wrapped;
		3225	}
		3226
		3227	$para->{y} = $height;
		3228	$height += $para->{h};
		3229	}
		3230
2431	$self->{height} += $h;	3231	$self->{height} = $height;
2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3232	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2433	}
2434		3233
2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3234	delete $self->{texture};
		3235	}
		3236
		3237	if (my $paridx = delete $self->{scroll_to}) {
		3238	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3239	}
2436	}	3240	}
2437		3241
2438	sub update {	3242	sub update {
2439	my ($self) = @_;	3243	my ($self) = @_;
2440		3244
…		…
2442		3246
2443	return unless $self->{h} > 0;	3247	return unless $self->{h} > 0;
2444		3248
2445	delete $self->{texture};	3249	delete $self->{texture};
2446		3250
2447	$ROOT->on_post_alloc ($self, sub {	3251	$ROOT->on_post_alloc ($self => sub {
		3252	$self->force_uptodate;
		3253
2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449		3255
2450	if (delete $self->{need_reflow}) {
2451	my $height = 0;
2452
2453	my $layout = $self->{layout};
2454
2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457	for (@{$self->{par}}) {
2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459	$layout->set_width ($W - $_->[3]);
2460	$layout->set_markup ($_->[4]);
2461	my ($w, $h) = $layout->size;
2462	$_->[0] = $w + $_->[3];
2463	$_->[1] = $h;
2464	}
2465
2466	$height += $_->[1];
2467	}
2468
2469	$self->{height} = $height;
2470
2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2472
2473	delete $self->{texture};
2474	}
2475
2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2477	glClearColor 0.5, 0.5, 0.5, 0;	3257	glClearColor 0, 0, 0, 0;
2478	glClear GL_COLOR_BUFFER_BIT;	3258	glClear GL_COLOR_BUFFER_BIT;
2479		3259
		3260	package CFPlus::UI::Base;
		3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3262	(0, 0, $self->{w}, $self->{h});
		3263
		3264	my $top = int $self->{children}[1]{range}[0];
		3265
		3266	my $paridx = 0;
		3267	my $top_paragraph;
2480	my $top = int $self->{children}[1]{range}[0];	3268	my $top = int $self->{children}[1]{range}[0];
2481		3269
2482	my $y0 = $top;	3270	my $y0 = $top;
2483	my $y1 = $top + $H;	3271	my $y1 = $top + $H;
2484		3272
2485	my $y = 0;
2486
2487	my $layout = $self->{layout};
2488
2489	$layout->set_font ($self->{font}) if $self->{font};
2490
2491	glEnable GL_BLEND;
2492	#TODO# not correct in windows where rgba is forced off
2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2495	for my $par (@{$self->{par}}) {	3273	for my $para (@{$self->{par}}) {
2496	my $h = $par->[1];	3274	my $h = $para->{h};
		3275	my $y = $para->{y};
2497		3276
2498	if ($y0 < $y + $h && $y < $y1) {	3277	if ($y0 < $y + $h && $y < $y1) {
2499	$layout->set_foreground (@{ $par->[2] });	3278	my $layout = $self->get_layout ($para);
2500	$layout->set_width ($W - $par->[3]);
2501	$layout->set_markup ($par->[4]);
2502		3279
2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3280	$layout->render ($para->{indent}, $y - $y0);
2504		3281
2505	glRasterPos $par->[3], $y - $y0;	3282	if (my @w = @{ $para->{widget} }) {
2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3283	my @s = $layout->get_shapes;
		3284
		3285	for (@w) {
		3286	my ($dx, $dy) = splice @s, 0, 2, ();
		3287
		3288	$_->{x} = $dx + $para->{indent};
		3289	$_->{y} = $dy + $y - $y0;
		3290
		3291	$_->draw;
		3292	}
		3293	}
2507	}	3294	}
2508		3295
2509	$y += $h;	3296	$paridx++;
		3297	$top_paragraph ||= $paridx if $y >= $top;
2510	}	3298	}
2511		3299
2512	glDisable GL_BLEND;	3300	$self->{top_paragraph} = $top_paragraph;
2513	};	3301	};
2514	});	3302	});
2515	}	3303	}
2516		3304
		3305	sub reconfigure {
		3306	my ($self) = @_;
		3307
		3308	$self->SUPER::reconfigure;
		3309
		3310	$_->{w} = 1e10 for @{ $self->{par} };
		3311	$self->reflow;
		3312	}
		3313
2517	sub _draw {	3314	sub _draw {
2518	my ($self) = @_;	3315	my ($self) = @_;
2519		3316
2520	glEnable GL_TEXTURE_2D;	3317	glEnable GL_TEXTURE_2D;
2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522	glColor 1, 1, 1, 1;	3319	glColor 0, 0, 0, 1;
2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3320	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524	glDisable GL_TEXTURE_2D;	3321	glDisable GL_TEXTURE_2D;
2525		3322
2526	$self->{children}[1]->draw;	3323	$self->{children}[1]->draw;
2527
2528	}	3324	}
2529		3325
2530	#############################################################################	3326	#############################################################################
2531		3327
2532	package CFClient::UI::Animator;	3328	package CFPlus::UI::Animator;
2533		3329
2534	use CFClient::OpenGL;	3330	use CFPlus::OpenGL;
2535		3331
2536	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2537		3333
2538	sub moveto {	3334	sub moveto {
2539	my ($self, $x, $y) = @_;	3335	my ($self, $x, $y) = @_;
2540		3336
2541	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2569	glPopMatrix;	3365	glPopMatrix;
2570	}	3366	}
2571		3367
2572	#############################################################################	3368	#############################################################################
2573		3369
2574	package CFClient::UI::Flopper;	3370	package CFPlus::UI::Flopper;
2575		3371
2576	our @ISA = CFClient::UI::Button::;	3372	our @ISA = CFPlus::UI::Button::;
2577		3373
2578	sub new {	3374	sub new {
2579	my $class = shift;	3375	my $class = shift;
2580		3376
2581	my $self = $class->SUPER::new (	3377	my $self = $class->SUPER::new (
…		…
2593	$self->{other}->toggle_visibility;	3389	$self->{other}->toggle_visibility;
2594	}	3390	}
2595		3391
2596	#############################################################################	3392	#############################################################################
2597		3393
2598	package CFClient::UI::Tooltip;	3394	package CFPlus::UI::Tooltip;
2599		3395
2600	our @ISA = CFClient::UI::Bin::;	3396	our @ISA = CFPlus::UI::Bin::;
2601		3397
2602	use CFClient::OpenGL;	3398	use CFPlus::OpenGL;
2603		3399
2604	sub new {	3400	sub new {
2605	my $class = shift;	3401	my $class = shift;
2606		3402
2607	$class->SUPER::new (	3403	$class->SUPER::new (
…		…
2611	}	3407	}
2612		3408
2613	sub set_tooltip_from {	3409	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	3410	my ($self, $widget) = @_;
2615		3411
		3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3413	if $widget->{tooltip} =~ /^#(.*)$/;
		3414
		3415	my $tooltip = $widget->{tooltip};
		3416
		3417	if ($ENV{CFPLUS_DEBUG} & 2) {
		3418	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3419	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3420	. "req $widget->{req_w} $widget->{req_h}\n"
		3421	. "visible $widget->{visible}";
		3422	}
		3423
		3424	$tooltip =~ s/^\n+//;
		3425	$tooltip =~ s/\n+$//;
		3426
2616	$self->add (new CFClient::UI::Label	3427	$self->add (new CFPlus::UI::Label
2617	markup => $widget->{tooltip},	3428	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	3430	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	3431	style => 1, # FLAG_INVERSE
2621	ellipsise => 0,	3432	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	3433	font => ($widget->{tooltip_font} || $::FONT_PROP),
2623	);	3434	);
2624	}	3435	}
2625		3436
…		…
2629	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3440	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630		3441
2631	($w + 4, $h + 4)	3442	($w + 4, $h + 4)
2632	}	3443	}
2633		3444
2634	sub size_allocate {	3445	sub invoke_size_allocate {
2635	my ($self, $w, $h) = @_;	3446	my ($self, $w, $h) = @_;
2636		3447
2637	$self->SUPER::size_allocate ($w - 4, $h - 4);	3448	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3449	}
		3450
		3451	sub invoke_visibility_change {
		3452	my ($self, $visible) = @_;
		3453
		3454	return unless $visible;
		3455
		3456	$self->{root}->on_post_alloc ("move_$self" => sub {
		3457	my $widget = $self->{owner}
		3458	or return;
		3459
		3460	if ($widget->{visible}) {
		3461	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3462
		3463	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3464	if $x + $self->{w} > $self->{root}{w};
		3465
		3466	$self->move_abs ($x, $y);
		3467	} else {
		3468	$self->hide;
		3469	}
		3470	});
2638	}	3471	}
2639		3472
2640	sub _draw {	3473	sub _draw {
2641	my ($self) = @_;	3474	my ($self) = @_;
2642		3475
…		…
2659	glVertex $w, $h;	3492	glVertex $w, $h;
2660	glVertex $w, 0;	3493	glVertex $w, 0;
2661	glEnd;	3494	glEnd;
2662		3495
2663	glTranslate 2 - 0.375, 2 - 0.375;	3496	glTranslate 2 - 0.375, 2 - 0.375;
		3497
2664	$self->SUPER::_draw;	3498	$self->SUPER::_draw;
2665	}	3499	}
2666		3500
2667	#############################################################################	3501	#############################################################################
2668		3502
2669	package CFClient::UI::Face;	3503	package CFPlus::UI::Face;
2670		3504
2671	our @ISA = CFClient::UI::Base::;	3505	our @ISA = CFPlus::UI::DrawBG::;
2672		3506
2673	use CFClient::OpenGL;	3507	use CFPlus::OpenGL;
2674		3508
2675	sub new {	3509	sub new {
2676	my $class = shift;	3510	my $class = shift;
2677		3511
2678	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
2679	aspect => 1,	3515	aspect => 1,
2680	can_events => 0,	3516	can_events => 0,
2681	@_,	3517	@_,
2682	);	3518	);
2683		3519
2684	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
2685	Scalar::Util::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
2686		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2687	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
2688	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2689	hard => 1,	3526	parked => 1,
2690	interval => $self->{animspeed},
2691	cb => sub {	3527	cb => sub {
		3528	return unless $::CONN && $widget;
		3529
2692	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
2693	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
2694	},	3535	},
2695	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
2696	}	3540	}
2697		3541
2698	$self	3542	$self
2699	}	3543	}
2700		3544
		3545	sub update_timer {
		3546	my ($self) = @_;
		3547
		3548	return unless $self->{timer};
		3549
		3550	if ($self->{visible}) {
		3551	$self->{timer}->at (
		3552	$self->{anim_start}
		3553	+ $self->{animspeed}
		3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3555	);
		3556	$self->{timer}->start;
		3557	} else {
		3558	$self->{timer}->stop;
		3559	}
		3560	}
		3561
		3562	sub update_face {
		3563	my ($self) = @_;
		3564
		3565	return unless $::CONN;
		3566
		3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3568	if ($anim && @$anim) {
		3569	delete $self->{wait_face};
		3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3571	}
		3572	}
		3573	}
		3574
2701	sub size_request {	3575	sub size_request {
2702	(32, 8)	3576	my ($self) = @_;
		3577
		3578	if ($::CONN) {
		3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3580	if (my $tex = $::CONN->{texture}[$faceid]) {
		3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3582	} else {
		3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3584	$self->realloc;
		3585	});
		3586	}
		3587	}
		3588	}
		3589
		3590	($self->{size_w} || 8, $self->{size_h} || 8)
2703	}	3591	}
2704		3592
2705	sub update {	3593	sub update {
2706	my ($self) = @_;	3594	my ($self) = @_;
2707		3595
2708	return unless $self->{visible};	3596	return unless $self->{visible};
2709		3597
2710	$self->SUPER::update;	3598	$self->SUPER::update;
2711	}	3599	}
2712		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
2713	sub _draw {	3609	sub _draw {
2714	my ($self) = @_;	3610	my ($self) = @_;
2715		3611
2716	return unless $::CONN;	3612	return unless $::CONN;
2717		3613
2718	my $face;	3614	$self->SUPER::_draw;
2719		3615
2720	if ($self->{frame}) {
2721	my $anim = $::CONN->{anim}[$self->{anim}];	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
2722		3617	or return;
2723	$face = $anim->[ $self->{frame} % @$anim ]
2724	if $anim && @$anim;
2725	}
2726		3618
2727	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3619	my $tex = $::CONN->{texture}[$faceid];
2728		3620
2729	if ($tex) {	3621	if ($tex) {
2730	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
2731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732	glColor 1, 1, 1, 1;	3624	glColor 0, 0, 0, 1;
2733	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3625	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734	glDisable GL_TEXTURE_2D;	3626	glDisable GL_TEXTURE_2D;
2735	}	3627	}
2736	}	3628	}
2737		3629
2738	sub DESTROY {	3630	sub destroy {
2739	my ($self) = @_;	3631	my ($self) = @_;
2740		3632
2741	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
2742	if $self->{timer};	3634	if $self->{timer};
2743		3635
2744	$self->SUPER::DESTROY;	3636	$self->SUPER::destroy;
2745	}	3637	}
2746		3638
2747	#############################################################################	3639	#############################################################################
2748		3640
2749	package CFClient::UI::Inventory;	3641	package CFPlus::UI::Buttonbar;
2750		3642
2751	our @ISA = CFClient::UI::ScrolledWindow::;	3643	our @ISA = CFPlus::UI::HBox::;
2752		3644
2753	sub new {	3645	# TODO: should actually wrap buttons and other goodies.
2754	my $class = shift;
2755
2756	my $self = $class->SUPER::new (
2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758	@_,
2759	);
2760
2761	$self
2762	}
2763
2764	sub set_items {
2765	my ($self, $items) = @_;
2766
2767	$self->{scrolled}->clear;
2768	return unless $items;
2769
2770	my @items = sort {
2771	($a->{type} <=> $b->{type})
2772	or ($a->{name} cmp $b->{name})
2773	} @$items;
2774
2775	$self->{real_items} = \@items;
2776
2777	my $row = 0;
2778	for my $item (@items) {
2779	CFClient::Item::update_widgets $item;
2780
2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785	$row++;
2786	}
2787	}
2788		3646
2789	#############################################################################	3647	#############################################################################
2790		3648
2791	package CFClient::UI::Menu;	3649	package CFPlus::UI::Menu;
2792		3650
2793	our @ISA = CFClient::UI::FancyFrame::;	3651	our @ISA = CFPlus::UI::Toplevel::;
2794		3652
2795	use CFClient::OpenGL;	3653	use CFPlus::OpenGL;
2796		3654
2797	sub new {	3655	sub new {
2798	my $class = shift;	3656	my $class = shift;
2799		3657
2800	my $self = $class->SUPER::new (	3658	my $self = $class->SUPER::new (
2801	items => [],	3659	items => [],
2802	z => 100,	3660	z => 100,
2803	@_,	3661	@_,
2804	);	3662	);
2805		3663
2806	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2807		3665
2808	for my $item (@{ $self->{items} }) {	3666	for my $item (@{ $self->{items} }) {
2809	my ($widget, $cb) = @$item;	3667	my ($widget, $cb, $tooltip) = @$item;
2810		3668
2811	# handle various types of items, only text for now	3669	# handle various types of items, only text for now
2812	if (!ref $widget) {	3670	if (!ref $widget) {
		3671	if ($widget =~ /\t/) {
		3672	my ($left, $right) = split /\t/, $widget, 2;
		3673
2813	$widget = new CFClient::UI::Label	3674	$widget = new CFPlus::UI::HBox
2814	can_hover => 1,	3675	can_hover => 1,
2815	can_events => 1,	3676	can_events => 1,
		3677	tooltip => $tooltip,
		3678	children => [
		3679	(new CFPlus::UI::Label markup => $left, expand => 1),
		3680	(new CFPlus::UI::Label markup => $right, align => +1),
		3681	],
		3682	;
		3683
		3684	} else {
		3685	$widget = new CFPlus::UI::Label
		3686	can_hover => 1,
		3687	can_events => 1,
2816	text => $widget;	3688	markup => $widget,
		3689	tooltip => $tooltip;
		3690	}
2817	}	3691	}
2818		3692
2819	$self->{item}{$widget} = $item;	3693	$self->{item}{$widget} = $item;
2820		3694
2821	$self->{vbox}->add ($widget);	3695	$self->{vbox}->add ($widget);
…		…
2826		3700
2827	# popup given the event (must be a mouse button down event currently)	3701	# popup given the event (must be a mouse button down event currently)
2828	sub popup {	3702	sub popup {
2829	my ($self, $ev) = @_;	3703	my ($self, $ev) = @_;
2830		3704
2831	$self->_emit ("popdown");	3705	$self->emit ("popdown");
2832		3706
2833	# maybe save $GRAB? must be careful about events...	3707	# maybe save $GRAB? must be careful about events...
2834	$GRAB = $self;	3708	$GRAB = $self;
2835	$self->{button} = $ev->{button};	3709	$self->{button} = $ev->{button};
2836		3710
2837	$self->show;	3711	$self->show;
2838	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3712	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839	}	3713	}
2840		3714
2841	sub mouse_motion {	3715	sub invoke_mouse_motion {
2842	my ($self, $ev, $x, $y) = @_;	3716	my ($self, $ev, $x, $y) = @_;
2843		3717
2844	# TODO: should use vbox->find_widget or so	3718	# TODO: should use vbox->find_widget or so
2845	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3719	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846	$self->{hover} = $self->{item}{$HOVER};	3720	$self->{hover} = $self->{item}{$HOVER};
2847	}
2848		3721
		3722	0
		3723	}
		3724
2849	sub button_up {	3725	sub invoke_button_up {
2850	my ($self, $ev, $x, $y) = @_;	3726	my ($self, $ev, $x, $y) = @_;
2851		3727
2852	if ($ev->{button} == $self->{button}) {	3728	if ($ev->{button} == $self->{button}) {
2853	undef $GRAB;	3729	undef $GRAB;
2854	$self->hide;	3730	$self->hide;
2855		3731
2856	$self->_emit ("popdown");	3732	$self->emit ("popdown");
2857	$self->{hover}[1]->() if $self->{hover};	3733	$self->{hover}[1]->() if $self->{hover};
		3734	} else {
		3735	return 0
		3736	}
		3737
2858	}	3738	1
2859	}	3739	}
2860		3740
2861	#############################################################################	3741	#############################################################################
2862		3742
2863	package CFClient::UI::Statusbox;	3743	package CFPlus::UI::Multiplexer;
2864		3744
2865	our @ISA = CFClient::UI::VBox::;	3745	our @ISA = CFPlus::UI::Container::;
2866		3746
2867	sub new {	3747	sub new {
2868	my $class = shift;	3748	my $class = shift;
2869		3749
2870	$class->SUPER::new (	3750	my $self = $class->SUPER::new (
		3751	@_,
		3752	);
		3753
		3754	$self->{current} = $self->{children}[0]
		3755	if @{ $self->{children} };
		3756
		3757	$self
		3758	}
		3759
		3760	sub add {
		3761	my ($self, @widgets) = @_;
		3762
		3763	$self->SUPER::add (@widgets);
		3764
		3765	$self->{current} = $self->{children}[0]
		3766	if @{ $self->{children} };
		3767	}
		3768
		3769	sub get_current_page {
		3770	my ($self) = @_;
		3771
		3772	$self->{current}
		3773	}
		3774
		3775	sub set_current_page {
		3776	my ($self, $page_or_widget) = @_;
		3777
		3778	my $widget = ref $page_or_widget
		3779	? $page_or_widget
		3780	: $self->{children}[$page_or_widget];
		3781
		3782	$self->{current} = $widget;
		3783	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3784
		3785	$self->emit (page_changed => $self->{current});
		3786
		3787	$self->realloc;
		3788	}
		3789
		3790	sub visible_children {
		3791	$_[0]{current}
		3792	}
		3793
		3794	sub size_request {
		3795	my ($self) = @_;
		3796
		3797	$self->{current}->size_request
		3798	}
		3799
		3800	sub invoke_size_allocate {
		3801	my ($self, $w, $h) = @_;
		3802
		3803	$self->{current}->configure (0, 0, $w, $h);
		3804
		3805	1
		3806	}
		3807
		3808	sub _draw {
		3809	my ($self) = @_;
		3810
		3811	$self->{current}->draw;
		3812	}
		3813
		3814	#############################################################################
		3815
		3816	package CFPlus::UI::Notebook;
		3817
		3818	our @ISA = CFPlus::UI::VBox::;
		3819
		3820	sub new {
		3821	my $class = shift;
		3822
		3823	my $self = $class->SUPER::new (
		3824	buttonbar => (new CFPlus::UI::Buttonbar),
		3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3826	# filter => # will be put between multiplexer and $self
		3827	@_,
		3828	);
		3829
		3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3831	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3832
		3833	$self
		3834	}
		3835
		3836	sub add {
		3837	my ($self, $title, $widget, $tooltip) = @_;
		3838
		3839	CFPlus::weaken $self;
		3840
		3841	$self->{buttonbar}->add (new CFPlus::UI::Button
		3842	markup => $title,
		3843	tooltip => $tooltip,
		3844	on_activate => sub { $self->set_current_page ($widget) },
		3845	);
		3846
		3847	$self->{multiplexer}->add ($widget);
		3848	}
		3849
		3850	sub get_current_page {
		3851	my ($self) = @_;
		3852
		3853	$self->{multiplexer}->get_current_page
		3854	}
		3855
		3856	sub set_current_page {
		3857	my ($self, $page) = @_;
		3858
		3859	$self->{multiplexer}->set_current_page ($page);
		3860	$self->emit (page_changed => $self->{multiplexer}{current});
		3861	}
		3862
		3863	#############################################################################
		3864
		3865	package CFPlus::UI::Selector;
		3866
		3867	use utf8;
		3868
		3869	our @ISA = CFPlus::UI::Button::;
		3870
		3871	sub new {
		3872	my $class = shift;
		3873
		3874	my $self = $class->SUPER::new (
		3875	options => [], # [value, title, longdesc], ...
		3876	value => undef,
		3877	@_,
		3878	);
		3879
		3880	$self->_set_value ($self->{value});
		3881
		3882	$self
		3883	}
		3884
		3885	sub invoke_button_down {
		3886	my ($self, $ev) = @_;
		3887
		3888	my @menu_items;
		3889
		3890	for (@{ $self->{options} }) {
		3891	my ($value, $title, $tooltip) = @$_;
		3892
		3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3894	}
		3895
		3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3897	}
		3898
		3899	sub _set_value {
		3900	my ($self, $value) = @_;
		3901
		3902	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3903	or return;
		3904
		3905	$self->{value} = $item->[0];
		3906	$self->set_markup ("$item->[1] ⇓");
		3907	$self->set_tooltip ($item->[2]);
		3908	}
		3909
		3910	sub set_value {
		3911	my ($self, $value) = @_;
		3912
		3913	return unless $self->{value} ne $value;
		3914
		3915	$self->_set_value ($value);
		3916	$self->emit (changed => $value);
		3917	}
		3918
		3919	#############################################################################
		3920
		3921	package CFPlus::UI::Statusbox;
		3922
		3923	our @ISA = CFPlus::UI::VBox::;
		3924
		3925	sub new {
		3926	my $class = shift;
		3927
		3928	my $self = $class->SUPER::new (
2871	fontsize => 0.8,	3929	fontsize => 0.8,
2872	@_,	3930	@_,
2873	)	3931	);
		3932
		3933	CFPlus::weaken (my $this = $self);
		3934
		3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3936
		3937	$self
2874	}	3938	}
2875		3939
2876	sub reorder {	3940	sub reorder {
2877	my ($self) = @_;	3941	my ($self) = @_;
2878	my $NOW = time;	3942	my $NOW = Time::HiRes::time;
		3943
		3944	# freeze display when hovering over any label
		3945	return if $CFPlus::UI::TOOLTIP->{owner}
		3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3947	values %{ $self->{item} };
2879		3948
2880	while (my ($k, $v) = each %{ $self->{item} }) {	3949	while (my ($k, $v) = each %{ $self->{item} }) {
2881	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882	}	3951	}
2883		3952
…		…
2886	my @items = sort {	3955	my @items = sort {
2887	$a->{pri} <=> $b->{pri}	3956	$a->{pri} <=> $b->{pri}
2888	or $b->{id} <=> $a->{id}	3957	or $b->{id} <=> $a->{id}
2889	} values %{ $self->{item} };	3958	} values %{ $self->{item} };
2890		3959
		3960	$self->{timer}->interval (1);
		3961
2891	my $count = 10 + 1;	3962	my $count = 10 + 1;
2892	for my $item (@items) {	3963	for my $item (@items) {
2893	last unless --$count;	3964	last unless --$count;
2894		3965
2895	push @widgets, $item->{label} ||= do {	3966	my $label = $item->{label} ||= do {
2896	# TODO: doesn't handle markup well (read as: at all)	3967	# TODO: doesn't handle markup well (read as: at all)
2897	my $short = $item->{count} > 1	3968	my $short = $item->{count} > 1
2898	? "<b>$item->{count} ×</b> $item->{text}"	3969	? "<b>$item->{count} ×</b> $item->{text}"
2899	: $item->{text};	3970	: $item->{text};
2900		3971
2901	for ($short) {	3972	for ($short) {
2902	s/^\s+//;	3973	s/^\s+//;
2903	s/\s+/ /g;	3974	s/\s+/ /g;
2904	}	3975	}
2905		3976
2906	new CFClient::UI::Label	3977	new CFPlus::UI::Label
2907	markup => $short,	3978	markup => $short,
2908	tooltip => $item->{tooltip},	3979	tooltip => $item->{tooltip},
2909	tooltip_font => $::FONT_PROP,	3980	tooltip_font => $::FONT_PROP,
2910	tooltip_width => 0.67,	3981	tooltip_width => 0.67,
2911	fontsize => $item->{fontsize} || $self->{fontsize},	3982	fontsize => $item->{fontsize} || $self->{fontsize},
2912	max_w => $::WIDTH * 0.44,	3983	max_w => $::WIDTH * 0.44,
2913	fg => $item->{fg},	3984	fg => [@{ $item->{fg} }],
2914	can_events => 1,	3985	can_events => 1,
2915	can_hover => 1	3986	can_hover => 1
2916	};	3987	};
		3988
		3989	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3990	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3991	$label->update;
		3992	$label->set_max_size (undef, $label->{req_h} * $diff)
		3993	if $diff < 1;
		3994	$self->{timer}->interval (1/30);
		3995	} else {
		3996	$label->{fg}[3] = $item->{fg}[3] || 1;
		3997	}
		3998
		3999	push @widgets, $label;
2917	}	4000	}
2918		4001
2919	$self->clear;	4002	$self->clear;
2920	$self->SUPER::add (reverse @widgets);	4003	$self->SUPER::add (reverse @widgets);
2921	}	4004	}
…		…
2926	$text =~ s/^\s+//;	4009	$text =~ s/^\s+//;
2927	$text =~ s/\s+$//;	4010	$text =~ s/\s+$//;
2928		4011
2929	return unless $text;	4012	return unless $text;
2930		4013
2931	my $timeout = time + ((delete $arg{timeout}) || 60);	4014	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932		4015
2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4016	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934		4017
2935	if (my $item = $self->{item}{$group}) {	4018	if (my $item = $self->{item}{$group}) {
2936	if ($item->{text} eq $text) {	4019	if ($item->{text} eq $text) {
2937	$item->{count}++;	4020	$item->{count}++;
2938	} else {	4021	} else {
2939	$item->{count} = 1;	4022	$item->{count} = 1;
2940	$item->{text} = $item->{tooltip} = $text;	4023	$item->{text} = $item->{tooltip} = $text;
2941	}	4024	}
2942	$item->{id} = ++$self->{id};	4025	$item->{id} += 0.2;#d#
2943	$item->{timeout} = $timeout;	4026	$item->{timeout} = $timeout;
2944	delete $item->{label};	4027	delete $item->{label};
2945	} else {	4028	} else {
2946	$self->{item}{$group} = {	4029	$self->{item}{$group} = {
2947	id => ++$self->{id},	4030	id => ++$self->{id},
…		…
2953	count => 1,	4036	count => 1,
2954	%arg,	4037	%arg,
2955	};	4038	};
2956	}	4039	}
2957		4040
		4041	$ROOT->on_refresh (reorder => sub {
2958	$self->reorder;	4042	$self->reorder;
		4043	});
2959	}	4044	}
2960		4045
2961	sub reconfigure {	4046	sub reconfigure {
2962	my ($self) = @_;	4047	my ($self) = @_;
2963		4048
…		…
2966		4051
2967	$self->reorder;	4052	$self->reorder;
2968	$self->SUPER::reconfigure;	4053	$self->SUPER::reconfigure;
2969	}	4054	}
2970		4055
		4056	sub destroy {
		4057	my ($self) = @_;
		4058
		4059	$self->{timer}->cancel;
		4060
		4061	$self->SUPER::destroy;
		4062	}
		4063
2971	#############################################################################	4064	#############################################################################
2972		4065
2973	package CFClient::UI::Root;	4066	package CFPlus::UI::Root;
2974		4067
2975	our @ISA = CFClient::UI::Container::;	4068	our @ISA = CFPlus::UI::Container::;
2976		4069
		4070	use List::Util qw(min max);
		4071
2977	use CFClient::OpenGL;	4072	use CFPlus::OpenGL;
2978		4073
2979	sub new {	4074	sub new {
2980	my $class = shift;	4075	my $class = shift;
2981		4076
2982	$class->SUPER::new (	4077	my $self = $class->SUPER::new (
2983	visible => 1,	4078	visible => 1,
2984	@_,	4079	@_,
2985	)	4080	);
2986	}
2987		4081
2988	sub configure {	4082	CFPlus::weaken ($self->{root} = $self);
2989	my ($self, $x, $y, $w, $h) = @_;
2990		4083
2991	$self->{w} = $w;	4084	$self
2992	$self->{h} = $h;
2993	}
2994
2995	sub check_size {
2996	my ($self) = @_;
2997
2998	$self->size_allocate ($self->{w}, $self->{h})
2999	if $self->{w};
3000	}	4085	}
3001		4086
3002	sub size_request {	4087	sub size_request {
3003	my ($self) = @_;	4088	my ($self) = @_;
3004		4089
3005	($self->{w}, $self->{h})	4090	($self->{w}, $self->{h})
3006	}	4091	}
3007		4092
		4093	sub _to_pixel {
		4094	my ($coord, $size, $max) = @_;
		4095
		4096	$coord =
		4097	$coord eq "center" ? ($max - $size) * 0.5
		4098	: $coord eq "max" ? $max
		4099	: $coord;
		4100
		4101	$coord = 0 if $coord < 0;
		4102	$coord = $max - $size if $coord > $max - $size;
		4103
		4104	int $coord + 0.5
		4105	}
		4106
3008	sub size_allocate {	4107	sub invoke_size_allocate {
3009	my ($self, $w, $h) = @_;	4108	my ($self, $w, $h) = @_;
3010		4109
3011	for my $child ($self->children) {	4110	for my $child ($self->children) {
3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4111	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013		4112
3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	4113	$X = $child->{force_x} if exists $child->{force_x};
3015	if exists $child->{req_x};	4114	$Y = $child->{force_y} if exists $child->{force_y};
3016		4115
3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	4116	$X = _to_pixel $X, $W, $self->{w};
3018	if exists $child->{req_y};	4117	$Y = _to_pixel $Y, $H, $self->{h};
3019
3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024		4118
3025	$child->configure ($X, $Y, $W, $H);	4119	$child->configure ($X, $Y, $W, $H);
3026	}	4120	}
		4121
		4122	1
3027	}	4123	}
3028		4124
3029	sub coord2local {	4125	sub coord2local {
3030	my ($self, $x, $y) = @_;	4126	my ($self, $x, $y) = @_;
3031		4127
…		…
3039	}	4135	}
3040		4136
3041	sub update {	4137	sub update {
3042	my ($self) = @_;	4138	my ($self) = @_;
3043		4139
3044	$self->check_size;
3045	$::WANT_REFRESH++;	4140	$::WANT_REFRESH++;
3046	}	4141	}
3047		4142
3048	sub add {	4143	sub add {
3049	my ($self, @children) = @_;	4144	my ($self, @children) = @_;
3050		4145
3051	for my $child (@children) {
3052	$child->{is_toplevel} = 1;	4146	$_->{is_toplevel} = 1
3053		4147	for @children;
3054	# integerise window positions
3055	$child->{x} = int $child->{x};
3056	$child->{y} = int $child->{y};
3057	}
3058		4148
3059	$self->SUPER::add (@children);	4149	$self->SUPER::add (@children);
3060
3061	for (my @widgets = @children; my $w = pop @widgets; ) {
3062	push @widgets, $w->children;
3063	$w->set_visible;
3064	}
3065
3066	}	4150	}
3067		4151
3068	sub remove {	4152	sub remove {
3069	my ($self, @children) = @_;	4153	my ($self, @children) = @_;
3070		4154
3071	$self->SUPER::remove (@children);	4155	$self->SUPER::remove (@children);
		4156
		4157	delete $self->{is_toplevel}
		4158	for @children;
3072		4159
3073	while (@children) {	4160	while (@children) {
3074	my $w = pop @children;	4161	my $w = pop @children;
3075	push @children, $w->children;	4162	push @children, $w->children;
3076	$w->set_invisible;	4163	$w->set_invisible;
…		…
3095	while ($self->{refresh_hook}) {	4182	while ($self->{refresh_hook}) {
3096	$_->()	4183	$_->()
3097	for values %{delete $self->{refresh_hook}};	4184	for values %{delete $self->{refresh_hook}};
3098	}	4185	}
3099		4186
3100	if ($self->{check_size}) {	4187	if ($self->{realloc}) {
		4188	my %queue;
3101	my @queue;	4189	my @queue;
		4190	my $widget;
3102		4191
		4192	outer:
3103	while () {	4193	while () {
3104	if ($self->{check_size}) {	4194	if (my $realloc = delete $self->{realloc}) {
3105	#TODO use array-of-depth approach	4195	for $widget (values %$realloc) {
		4196	$widget->{visible} or next; # do not resize invisible widgets
3106		4197
3107	@queue = sort { $a->{visible} <=> $b->{visible} }	4198	$queue{$widget+0}++ and next; # duplicates are common
3108	@queue, values %{delete $self->{check_size}};	4199
		4200	push @{ $queue[$widget->{visible}] }, $widget;
		4201	}
3109	}	4202	}
3110		4203
		4204	while () {
		4205	@queue or last outer;
		4206
3111	my $widget = pop @queue || last;	4207	$widget = pop @{ $queue[-1] || [] }
3112		4208	and last;
3113	defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116	? @$widget{qw(def_w def_h)}
3117	: $widget->size_request;
3118
3119	if (delete $widget->{force_alloc}
3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122		4209
		4210	pop @queue;
		4211	}
		4212
		4213	delete $queue{$widget+0};
		4214
		4215	my ($w, $h) = $widget->size_request;
		4216
		4217	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4218	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4219
		4220	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4221	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4222
		4223	$w = $widget->{force_w} if exists $widget->{force_w};
		4224	$h = $widget->{force_h} if exists $widget->{force_h};
		4225
		4226	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4227	|| delete $widget->{force_realloc}) {
3123	$widget->{req_w} = $w;	4228	$widget->{req_w} = $w;
3124	$widget->{req_h} = $h;	4229	$widget->{req_h} = $h;
3125		4230
3126	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	4231	$self->{size_alloc}{$widget+0} = $widget;
3127		4232
3128	$widget->{parent}->check_size
3129	if $widget->{parent};	4233	if (my $parent = $widget->{parent}) {
		4234	$self->{realloc}{$parent+0} = $parent
		4235	unless $queue{$parent+0};
		4236
		4237	$parent->{force_size_alloc} = 1;
		4238	$self->{size_alloc}{$parent+0} = $parent;
		4239	}
3130	}	4240	}
		4241
		4242	delete $self->{realloc}{$widget+0};
3131	}	4243	}
3132	}	4244	}
3133		4245
3134	while (my $size_alloc = delete $self->{size_alloc}) {	4246	while (my $size_alloc = delete $self->{size_alloc}) {
3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	4247	my @queue = sort { $b->{visible} <=> $a->{visible} }
3136	values %$size_alloc;	4248	values %$size_alloc;
3137		4249
3138	while () {	4250	while () {
3139	my ($widget, $w, $h) = @{ pop @queue or last };	4251	my $widget = pop @queue || last;
		4252
		4253	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140		4254
3141	$w = 0 if $w < 0;	4255	$w = 0 if $w < 0;
3142	$h = 0 if $h < 0;	4256	$h = 0 if $h < 0;
3143		4257
		4258	$w = max $widget->{min_w}, $w;
		4259	$h = max $widget->{min_h}, $h;
		4260
		4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4263
		4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4266
		4267	$w = int $w + 0.5;
		4268	$h = int $h + 0.5;
		4269
		4270	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4271	$widget->{old_w} = $widget->{w};
		4272	$widget->{old_h} = $widget->{h};
		4273
3144	$widget->{w} = $w;	4274	$widget->{w} = $w;
3145	$widget->{h} = $h;	4275	$widget->{h} = $h;
		4276
3146	$widget->emit (size_allocate => $w, $h);	4277	$widget->emit (size_allocate => $w, $h);
		4278	}
3147	}	4279	}
3148	}	4280	}
3149		4281
3150	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3151	$_->()	4283	$_->()
…		…
3160	glLoadIdentity;	4292	glLoadIdentity;
3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
3163	glLoadIdentity;	4295	glLoadIdentity;
3164		4296
		4297	{
		4298	package CFPlus::UI::Base;
		4299
		4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4301	(0, 0, $self->{w}, $self->{h});
		4302
3165	$self->_draw;	4303	$self->_draw;
		4304	}
3166	}	4305	}
3167		4306
3168	#############################################################################	4307	#############################################################################
3169		4308
3170	package CFClient::UI;	4309	package CFPlus::UI;
3171		4310
3172	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
3173	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3174		4313
3175	1	4314	1
3176		4315

Diff Legend

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