ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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