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

Diff Legend

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