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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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