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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.390 by root, Sat Jul 21 13:29:46 2007 UTC

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

Diff Legend

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