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

Diff Legend

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