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

Diff Legend

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