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

Diff Legend

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