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

Diff Legend

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