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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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