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

Diff Legend

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